annotate lisp/allout.el @ 76474:273b86e5b88a

Add GC_ mark bit cleanup.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 17 Mar 2007 17:37:41 +0000
parents b5b902938a0a
children 9355f9b7bbff edf631bdbb7a ec58e5c426ef
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,
75347
e3694f1cb928 Add 2007 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 74987
diff changeset
4 ;; 2005, 2006, 2007 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
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
327 These bullets are distinguish topics with particular character.
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
328 They are not used by default in the topic creation routines, but
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
329 are offered as options when you modify topic creation with a
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
330 universal argument \(\\[universal-argument]), or during rebulleting \(\\[allout-rebullet-current-heading]).
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
331
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
332 Distinctive bullets are not cycled when topics are shifted or
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
333 otherwise automatically rebulleted, so their marking is
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
334 persistent until deliberately changed. Their significance is
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
335 purely by convention, however. Some conventions suggest
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
336 themselves:
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
337
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
338 `(' - open paren - an aside or incidental point
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
339 `?' - question mark - uncertain or outright question
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
340 `!' - exclamation point/bang - emphatic
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
341 `[' - open square bracket - meta-note, about item instead of item's subject
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
342 `\"' - double quote - a quotation or other citation
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
343 `=' - equal sign - an assignement, equating a name with some connotation
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
344 `^' - carat - relates to something above
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
345
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
346 Some are more elusive, but their rationale may be recognizable:
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
347
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
348 `+' - plus - pending consideration, completion
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
349 `_' - underscore - done, completed
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
350 `&' - ampersand - addendum, furthermore
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
351
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
352 \(Some other non-plain bullets have special meaning to the
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
353 software. By default:
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
354
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
355 `~' marks encryptable topics - see `allout-topic-encryption-bullet'
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
356 `#' marks auto-numbered bullets - see `allout-numbered-bullet'.)
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
357
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
358 See `allout-plain-bullets-string' for the standard, alternating
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
359 bullets.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
360
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
361 You must run `set-allout-regexp' in order for outline mode to
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
362 adopt changes of this value.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
363
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
364 DO NOT include the close-square-bracket, `]', on either of the bullet
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
365 strings."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
366 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
367 :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
368 (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
369 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
370 (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
371
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
372 ;;;_ = 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
373 (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
374 "*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
375
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
376 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
377 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
378 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
379 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
380
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
381 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
382 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
383
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
384 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
385 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
386 \(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
387
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
388 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
389 `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
390
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
391 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
392 `allout-primary-bullet' unaltered.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
393
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
394 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
395 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
396 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
397 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
398 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
399 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
400 `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
401 undesired.]"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
402 :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
403 (const allout-mode-leaders)
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
404 (const comment-start))
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
405 :group 'allout)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
406 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
407 (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
408 '(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
409 (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
410 ;;;_ = 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
411 (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
412 "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
413
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
414 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
415 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
416 `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
417
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
418 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
419 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
420 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
421 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
422
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
423 ;;;_ = 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
424 (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
425 "*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
426
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
427 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
428 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
429 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
430
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
431 Whatever the setting of this variable, both old and new style prefixes
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
432 are always respected by the topic maneuvering functions."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
433 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
434 :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
435 (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
436 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
437 (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
438 (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
439 ;;;_ = 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
440 (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
441 "*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
442
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
443 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
444 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
445 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
446 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
447
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
448 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
449 prefixes:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
450
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
451 * Top level
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
452 .* A topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
453 . + One level 3 subtopic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
454 . . One level 4 subtopic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
455 . . A second 4 subtopic
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
456 . + Another level 3 subtopic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
457 . #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
458 . #2 Another
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
459 . ! 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
460 . #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
461
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
462 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
463 numbered and other distinctive bullets retained):
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
464
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
465 * Top level
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
466 .* A topic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
467 . * One level 3 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
468 . * One level 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
469 . * A second 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
470 . * Another level 3 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
471 . #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
472 . #2 Another
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
473 . ! 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
474 . #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
475
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
476 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
477 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
478 this variable setting.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
479
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
480 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
481 is non-nil."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
482 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
483 :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
484 (make-variable-buffer-local 'allout-stylish-prefixes)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
485 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
486 (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
487 (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
488
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
489 ;;;_ = 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
490 (defcustom allout-numbered-bullet "#"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
491 "*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
492
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
493 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
494 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
495 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
496 disables numbering maintenance."
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)
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
499 (make-variable-buffer-local 'allout-numbered-bullet)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
500 ;;;###autoload
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
501 (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
502 (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
503 'string-or-null-p
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
504 '(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
505 ;;;_ = 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
506 (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
507 "*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
508
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
509 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
510 :type '(choice (const nil) string)
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
511 :group 'allout)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
512 ;;;###autoload
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
513 (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
514 (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
515 'string-or-null-p
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
516 '(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
517 ;;;_ = 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
518 (defcustom allout-presentation-padding 2
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
519 "*Presentation-format white-space padding factor, for greater indent."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
520 :type 'integer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
521 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
522
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 (make-variable-buffer-local 'allout-presentation-padding)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
524 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
525 (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
526
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
527 ;;;_ = 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
528 (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
529 "*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
530 numbers to minimal amount with some context. Otherwise, entire
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
531 numbers are always used."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
532 :type 'boolean
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
533 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
534
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
535 ;;;_ + 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
536 ;;;_ - 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
537 (defcustom allout-number-pages nil
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
538 "*Non-nil turns on page numbering for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
539 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
540 :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
541 ;;;_ - 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
542 (defcustom allout-label-style "\\large\\bf"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
543 "*Font and size of labels for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
544 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
545 :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
546 ;;;_ - 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
547 (defcustom allout-head-line-style "\\large\\sl "
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
548 "*Font and size of entries for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
549 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
550 :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
551 ;;;_ - 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
552 (defcustom allout-body-line-style " "
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
553 "*Font and size of entries for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
554 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
555 :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
556 ;;;_ - 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
557 (defcustom allout-title-style "\\Large\\bf"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
558 "*Font and size of titles for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
559 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
560 :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
561 ;;;_ - allout-title
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
562 (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
563 "*Expression to be evaluated to determine the title for LaTeX
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
564 formatted copy."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
565 :type 'sexp
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
566 :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
567 ;;;_ - 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
568 (defcustom allout-line-skip ".05cm"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
569 "*Space between lines for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
570 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
571 :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
572 ;;;_ - 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
573 (defcustom allout-indent ".3cm"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
574 "*LaTeX formatted depth-indent spacing."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
575 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
576 :group 'allout)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
577
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
578 ;;;_ + Topic encryption
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
579 ;;;_ = allout-encryption group
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
580 (defgroup allout-encryption nil
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
581 "Settings for topic encryption features of allout outliner."
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
582 :group 'allout)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
583 ;;;_ = allout-topic-encryption-bullet
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
584 (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
585 "*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
586 :type '(choice (const nil) string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
587 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
588 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
589 ;;;_ = allout-passphrase-verifier-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
590 (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
591 "*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
592
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
593 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
594 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
595 :type 'boolean
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
596 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
597 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
598 (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
599 ;;;_ = allout-passphrase-hint-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
600 (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
601 "*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
602
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
603 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
604 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
605 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
606
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
607 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
608 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
609 :type '(choice (const always)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
610 (const needed)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
611 (const disabled))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
612 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
613 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
614 (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
615 ;;;_ = allout-encrypt-unencrypted-on-saves
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
616 (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
617 "*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
618
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
619 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
620 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
621
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
622 - 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
623 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
624 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
625 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
626 encrypted.)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
627 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
628 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
629 - 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
630 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
631 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
632 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
633 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
634 - 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
635
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
636 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
637 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
638 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
639 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
640 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
641
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
642 :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
643 (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
644 (const :tag "No" nil))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
645 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
646 :group 'allout-encryption)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
647 (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
648
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
649 ;;;_ + Developer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
650 ;;;_ = allout-developer group
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
651 (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
652 "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
653 :group 'allout)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
654 ;;;_ = 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
655 (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
656 "*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
657
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
658 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
659
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
660 \(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
661 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
662 compilation.)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
663
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
664 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
665 :type 'boolean
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
666 :group 'allout-developer)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
667
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
668 ;;;_ + Miscellaneous customization
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
669
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
670 ;;;_ = allout-command-prefix
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
671 (defcustom allout-command-prefix "\C-c "
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
672 "*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
673
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
674 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
675 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
676 :type 'string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
677 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
678
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
679 ;;;_ = 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
680 ;;; 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
681 ;;; 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
682 (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
683 "*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
684
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
685 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
686 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
687 (setq allout-keybindings-list
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
688 '(
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
689 ; 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
690 ("\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
691 ("\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
692 ("\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
693 ("\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
694 ("\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
695 ("\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
696 ("\C-e" allout-end-of-entry)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
697 ; 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
698 ("\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
699 ("\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
700 ("\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
701 ("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
702 ("\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
703 ("!" allout-show-all)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
704 ("x" allout-toggle-current-subtree-encryption)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
705 ; 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
706 (" " 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
707 ("." 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
708 ("," 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
709 ("'" 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
710 (">" 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
711 ("<" 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
712 ("\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
713 ("*" 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
714 ("#" 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
715 ("\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
716 ("\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
717 ("\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
718 ("\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
719 ("\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
720 ("\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
721 ; 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
722 ;([?\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
723 ("@" 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
724 ("=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
725 ("=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
726 ("=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
727 ("=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
728
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
729 ;;;_ = 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
730 (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
731 "*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
732
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
733 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
734 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
735 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
736 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
737
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
738 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
739 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
740 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
741 `allout-auto-fill'."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
742 :type 'boolean
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
743 :group 'allout)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
744 (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
745
48856
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-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
747 (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
748 "*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
749 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
750 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
751 where auto-fill occurs."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
752 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
753 :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
754 (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
755 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
756 (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
757 (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
758
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
759 ;;;_ = 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
760 (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
761 'text)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
762 "*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
763
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
764 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
765 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
766 the header.
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
767
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
768 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
769 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
770 `force' enables reindent whether or not `comment-start' is set."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
771 :type '(choice (const nil) (const t) (const text) (const force))
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
772 :group 'allout)
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
773
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
774 (make-variable-buffer-local 'allout-reindent-bodies)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
775 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
776 (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
777 '(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
778
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
779 ;;;_ = 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
780 (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
781 "*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
782
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
783 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
784 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
785
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
786 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
787 is nil.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
788
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
789 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
790 For details, see `allout-toggle-current-subtree-encryption's docstring."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
791 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
792 :group 'allout)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
793 (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
794
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
795 ;;;_* CODE - no user customizations below.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
796
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
797 ;;;_ #1 Internal Outline Formatting and Configuration
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
798 ;;;_ : 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
799 ;;;_ = allout-version
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
800 (defvar allout-version "2.2.1"
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
801 "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
802 ;;;_ > 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
803 (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
804 "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
805 (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
806 (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
807 (if here (insert msg))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
808 (message "%s" msg)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
809 msg))
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
810 ;;;_ : 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
811 ;;;_ = allout-mode
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
812 (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
813 (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
814 ;;;_ = allout-layout nil
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
815 (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
816 "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
817
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
818 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
819 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
820 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
821 `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
822
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
823 \*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
824 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
825
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
826 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
827 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
828
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
829 ;;;Local variables:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
830 ;;;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
831 ;;;End:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
832
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
833 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
834 \(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
835 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
836 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
837
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
838 `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
839 `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
840 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
841 (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
842 ;;;###autoload
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
843 (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
844 '(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
845
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
846 ;;;_ : 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
847 ;;;_ = 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
848 (defvar allout-regexp ""
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
849 "*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
850
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
851 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
852 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
853 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
854 (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
855 ;;;_ = 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
856 (defvar allout-bullets-string ""
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
857 "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
858
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
859 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
860 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
861 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
862 (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
863 ;;;_ = 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
864 (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
865 "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
866 (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
867 ;;;_ = allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
868 (defvar allout-depth-specific-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 a particular depth.
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 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
872 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
873 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
874
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
875 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
876 `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
877 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
878 topic prefix to be matched.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
879 (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
880 ;;;_ = allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
881 (defvar allout-depth-one-regexp ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
882 "*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
883
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
884 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
885 `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
886 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
887 topic prefix to be matched.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
888 (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
889 ;;;_ = 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
890 (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
891 "`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
892
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
893 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
894 (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
895 ;;;_ = 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
896 (defvar allout-bob-regexp ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
897 "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
898 (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
899 ;;;_ = 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
900 (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
901 "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
902 (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
903 ;;;_ = 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
904 (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
905 "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
906 (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
907
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
908 ;;;_ = 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
909 (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
910 "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
911
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
912 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
913 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
914 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
915 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
916 ;;;_ 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
917 (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
918 "*Reset the leading string used to identify topic headers."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
919 (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
920 (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
921 (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
922 (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
923 ;;;_ 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
924 (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
925 "*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
926
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
927 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
928 language comments. Returns the leading string."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
929
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
930 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
931 (if (not (stringp header-lead))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
932 (setq header-lead (read-string
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
933 "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
934 (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
935 (allout-reset-header-lead header-lead)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
936 header-lead)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
937 ;;;_ > 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
938 (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
939 "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
940
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
941 Works according to settings of:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
942
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
943 `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
944 `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
945 `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
946 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
947
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
948 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
949 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
950 (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
951 (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
952 (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
953 '(allout-mode-leaders
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
954 comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
955 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
956 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
957 ;; 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
958 t)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
959 (leader
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
960 (cond
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
961 ((not use-leader) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
962 ;; Use the explicitly designated leader:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
963 ((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
964 (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
965 ;; 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
966 (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
967 ;; ... 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
968 (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
969 comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
970 ;; Use comment-start, maybe tripled, and with
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
971 ;; underscore:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
972 (concat
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
973 (if (string= " "
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
974 (substring comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
975 (1- (length comment-start))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
976 ;; 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
977 (substring comment-start 0 -1)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
978 (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
979 ;; ... and append underscore, whichever:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
980 "_")))))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
981 (if (not leader)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
982 nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
983 (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
984 (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
985 ;; 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
986 ;; 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
987 (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
988 allout-header-prefix)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
989 (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
990 '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
991 ;;;_ > 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
992 (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
993 "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
994
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
995 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
996 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
997 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
998 (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
999 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
1000 (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
1001 (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
1002 ;;;_ > 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
1003 (defun set-allout-regexp ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1004 "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
1005
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1006 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
1007 `allout-distinctive-bullets-string'.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1008
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1009 Also refresh various data structures that hinge on the regexp."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1010
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1011 (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
1012 ;; 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
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 (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
1015 '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
1016 'allout-primary-bullet))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1017 cur-string
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1018 cur-len
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1019 cur-char
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1020 index)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1021 (while strings
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1022 (setq index 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1023 (setq cur-len (length (setq cur-string (symbol-value (car strings)))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1024 (while (< index cur-len)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1025 (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
1026 (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
1027 (concat allout-bullets-string
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1028 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1029 ; Single dash would denote a
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1030 ; sequence, repeated denotes
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1031 ; a dash:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1032 ((eq cur-char ?-) "--")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1033 ; literal close-square-bracket
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1034 ; doesn't work right in the
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1035 ; expr, exclude it:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1036 ((eq cur-char ?\]) "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1037 (t (regexp-quote (char-to-string cur-char))))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1038 (setq index (1+ index)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1039 (setq strings (cdr strings)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1040 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1041 ;; 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
1042 (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
1043 (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
1044
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1045 (let (new-part old-part)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1046 (setq new-part (concat "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1047 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1048 "[ \t]*"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1049 ;; 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
1050 "[" allout-bullets-string "]"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1051 "\\)")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1052 old-part (concat "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1053 (regexp-quote allout-primary-bullet)
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 (regexp-quote allout-header-prefix)
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 "+"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1058 " ?[^" allout-primary-bullet "]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1059 allout-regexp (concat new-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1060 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1061 old-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1062 "\\|\^l")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1063
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1064 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
1065 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1066 "\n" old-part)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1067
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1068 allout-bob-regexp (concat "\\`" new-part
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-part))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1071
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1072 (setq allout-depth-specific-regexp
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 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1075
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1076 ;; new-style spacers-then-bullet string:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1077 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1078 (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
1079 " \\{%s\\}"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1080 "[" (allout-format-quote allout-bullets-string) "]"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1081 "\\)"
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 ;; 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
1084 (if (< 0 allout-header-subtraction)
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 (concat "\\|\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1087 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1088 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1089 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1090 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1091 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1092 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1093 "\\{%s\\}"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1094 ;; disqualify greater depths:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1095 "[^"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1096 (allout-format-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1097 "]\\)"
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 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1100 ))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1101 (setq allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1102 (concat "\\(^\\|\\`\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1103 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1104
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1105 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1106 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1107 ;; 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
1108 ;; intervening whitespace:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1109 " *"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1110 (concat "[^ " allout-bullets-string "]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1111 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1112 (if (< 0 allout-header-subtraction)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1113 ;; 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
1114 ;; 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
1115 ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1116 (concat "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1117 (regexp-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1118 ;; disqualify deeper primary-bullet sequences:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1119 "[^" allout-primary-bullet "]"))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1120 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1121 ))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1122 ;;;_ : 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
1123 ;;;_ = 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
1124 (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
1125 ;;;_ > 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
1126 (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
1127 "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
1128
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1129 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
1130 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
1131 (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
1132 (pref (list allout-command-prefix)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1133 (mapcar (function
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1134 (lambda (cell)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1135 (let ((add-pref (null (cdr (cdr cell))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1136 (key-suff (list (car cell))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1137 (apply 'define-key
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1138 (list map
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1139 (apply 'concat (if add-pref
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1140 (append pref key-suff)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1141 key-suff))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1142 (car (cdr cell)))))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1143 keymap-list)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1144 map))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1145 ;;;_ : Menu bar
54952
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1146 (defvar allout-mode-exposure-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1147 (defvar allout-mode-editing-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1148 (defvar allout-mode-navigation-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1149 (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
1150 (defun produce-allout-mode-menubar-entries ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1151 (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
1152 (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
1153 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1154 "Allout outline exposure menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1155 '("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
1156 ["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
1157 ["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
1158 ["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
1159 ["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
1160 ["Hide Leaves" allout-hide-current-leaves t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1161 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1162 ["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
1163 (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
1164 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1165 "Allout outline editing menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1166 '("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
1167 ["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
1168 ["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
1169 ["Open Supertopic" allout-open-supertopic t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1170 "----"
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 ["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
1172 ["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
1173 ["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
1174 ["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
1175 ["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
1176 "----"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1177 ["Toggle Topic Encryption"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1178 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
1179 (> (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
1180 (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
1181 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1182 "Allout outline navigation menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1183 '("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
1184 ["Next Visible Heading" allout-next-visible-heading t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1185 ["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
1186 allout-previous-visible-heading t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1187 "----"
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 ["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
1189 ["Forward Current Level" allout-forward-current-level t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1190 ["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
1191 allout-backward-current-level t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1192 "----"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1193 ["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
1194 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
1195 ["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
1196 ["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
1197 (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
1198 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1199 "Allout outlines miscellaneous bindings."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1200 '("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
1201 ["Version" allout-version t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1202 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1203 ["Duplicate Exposed" allout-copy-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1204 ["Duplicate Exposed, numbered"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
1205 allout-flatten-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1206 ["Duplicate Exposed, indented"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
1207 allout-indented-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1208 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1209 ["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
1210 ["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
1211 ;;;_ : 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
1212 ;;;_ = 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
1213 (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
1214 "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
1215
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1216 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
1217 (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
1218 ;;;_ > 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
1219 (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
1220 "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
1221
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1222 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
1223
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1224 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
1225 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
1226 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
1227
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1228 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
1229 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
1230 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
1231 as described further below.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1232
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1233 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
1234 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
1235 existing value.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1236
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1237 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
1238 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
1239 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
1240
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1241 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
1242 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
1243
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1244 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
1245 (while pairs
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1246 (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
1247 (name (car pair))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1248 (value (cadr pair))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1249 (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
1250 (caddr pair)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1251 prior-value)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1252 (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
1253 (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
1254 name (type-of name)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1255 (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
1256 (symbol-value name)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1257 (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
1258 (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
1259 ;; 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
1260 (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
1261 ;; 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
1262 (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
1263 ;; 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
1264 ;; 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
1265 (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
1266 (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
1267 (if qualifier
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1268 (cond ((eq qualifier 'extend)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1269 (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
1270 (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
1271 (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
1272 ((eq qualifier 'append)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1273 (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
1274 (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
1275 (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
1276 (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
1277 qualifier)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1278 (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
1279 ;;;_ > allout-do-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1280 (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
1281 "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
1282
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1283 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
1284 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
1285
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1286 (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
1287 (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
1288 (name (car pair))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1289 (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
1290 (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
1291 ;; 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
1292 (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
1293 ;; 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
1294 (set name (car value-cell))))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1295 ;;;_ : 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
1296 ;;;_ > allout-unprotected (expr)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1297 (defmacro allout-unprotected (expr)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1298 "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
1299 `(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
1300 (inhibit-field-text-motion t))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1301 ,expr))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1302 ;;;_ = allout-mode-hook
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1303 (defvar allout-mode-hook nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1304 "*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
1305 ;;;_ = 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
1306 (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
1307 "*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
1308 ;;;_ = allout-exposure-category
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1309 (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
1310 "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
1311 ;;;_ x allout-view-change-hook
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1312 (defvar allout-view-change-hook nil
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1313 "*(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
1314
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1315 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
1316 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
1317 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
1318 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
1319 ;;;_ = allout-exposure-change-hook
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
1320 (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
1321 "*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
1322
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1323 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
1324
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1325 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
1326
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1327 - 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
1328 - 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
1329 - 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
1330
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1331 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
1332
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1333 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
1334 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
1335 ;;;_ = allout-structure-added-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-added-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 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
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 should 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 - 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
1342 - 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
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 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
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-deleted-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-deleted-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 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
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 must 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 - 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
1355 - 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
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 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
1358 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
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.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1361 ;;;_ = allout-structure-shifted-hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1362 (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
1363 "*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
1364
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1365 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
1366
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1367 - 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
1368 - 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
1369
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1370 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
1371 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
1372
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1373 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
1374 ;;;_ = allout-outside-normal-auto-fill-function
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1375 (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
1376 "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
1377
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1378 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
1379 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
1380 (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
1381 ;;;_ = 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
1382 (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
1383 "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
1384 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
1385 to track repeats.")
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1386 ;;;_ = allout-passphrase-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1387 (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
1388 "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
1389 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
1390
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1391 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
1392 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
1393 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
1394 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
1395 search attacks.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1396
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1397 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
1398 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
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-verifier-string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
1401 ;;;###autoload
70225
81a284d45346 (allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70002
diff changeset
1402 (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
1403 ;;;_ = allout-passphrase-hint-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1404 (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
1405 "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
1406
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1407 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
1408 the reminder is deployed.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1409
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
1410 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
1411 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
1412 `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
1413 (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
1414 (setq-default allout-passphrase-hint-string "")
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
1415 ;;;###autoload
70225
81a284d45346 (allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70002
diff changeset
1416 (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
1417 ;;;_ = allout-after-save-decrypt
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1418 (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
1419 "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
1420
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1421 - 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
1422 - 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
1423
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1424 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
1425 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
1426 (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
1427 ;;;_ = 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
1428 (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
1429 "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
1430
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1431 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
1432 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
1433 prior to encryption.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1434
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1435 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
1436
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1437 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
1438 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
1439 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
1440 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
1441 (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
1442 ;;;_ = 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
1443 (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
1444 "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
1445
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1446 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
1447 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
1448 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
1449
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1450 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
1451
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1452 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
1453 `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
1454 is raised.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1455
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1456 (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
1457 ;;;_ = 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
1458 (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
1459 "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
1460
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1461 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
1462 (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
1463 ;;;_ > allout-mode-p ()
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1464 ;; 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
1465 ;; 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
1466 (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
1467 "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
1468 'allout-mode)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1469 ;;;_ > 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
1470 (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
1471 "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
1472
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1473 (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
1474 (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
1475 (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
1476 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1477 (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
1478 'except-current)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1479 (point-marker))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1480 (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
1481 (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
1482 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1483 (message "auto-encrypting pending topics")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1484 (sit-for 0)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1485 (condition-case failure
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1486 (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
1487 (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
1488 (error (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1489 (message
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1490 "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
1491 failure)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1492 (sit-for 2))))))
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 nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1495 ;;;_ > 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
1496 (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
1497 "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
1498
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1499 (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
1500 ;; 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
1501 (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
1502 (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
1503 ;;;_ > allout-after-saves-handler ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1504 (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
1505 "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
1506
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1507 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
1508 the save.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1509
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1510 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
1511 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
1512 (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
1513 (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
1514 allout-after-save-decrypt))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1515 t
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1516 (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
1517 (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
1518 (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
1519 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1520 (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
1521 (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
1522 (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
1523 )
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1524 ;;;_ = allout-inhibit-aberrance-doublecheck nil
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1525 ;; 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
1526 ;; 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
1527 ;; 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
1528 ;; 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
1529 ;; 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
1530 ;; almost never be needed, however.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1531 (defvar allout-inhibit-aberrance-doublecheck nil
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1532 "Internal state, for momentarily inhibits aberrance doublecheck.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1533
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1534 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
1535 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
1536
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1537 ;;;_ #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
1538 ;;;_ = 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
1539 (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
1540 "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
1541 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
1542 (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
1543 ;;;_ > 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
1544 (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
1545 "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
1546
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1547 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
1548
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1549 - nil (or no argument) deactivate auto-activation/layout;
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1550 - `activate', enable auto-activation only;
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1551 - `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
1552 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
1553 - `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
1554 - 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
1555 any confirmation check.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1556
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1557 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
1558 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
1559 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
1560 `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
1561
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1562 `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
1563 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
1564 setting.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1565
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1566 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
1567 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
1568
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1569 \(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
1570 \(allout-init t)"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1571
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1572 (interactive)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1573 (if (interactive-p)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1574 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1575 (setq mode
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1576 (completing-read
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1577 (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
1578 "(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
1579 '(("nil")("full")("activate")("deactivate")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1580 ("ask") ("report") (""))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1581 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1582 t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1583 (if (string= mode "")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1584 (setq mode 'report)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1585 (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
1586 (let
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1587 ;; 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
1588 ((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
1589 (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
1590 'find-file-hook
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1591 '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
1592 (curr-mode 'allout-auto-activation))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1593
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1594 (cond ((not mode)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1595 (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
1596 (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
1597 (if (interactive-p)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1598 (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
1599 ((eq mode 'report)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1600 (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
1601 (allout-init nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1602 ;; 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
1603 (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
1604 (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
1605 (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
1606 (cond ((eq mode 'activate)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1607 (message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1608 "Outline mode auto-activation enabled.")
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1609 'activate)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1610 ((eq mode 'report)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1611 ;; 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
1612 (allout-init mode))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1613 ((eq mode 'ask)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1614 (message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1615 (concat "Outline mode auto-activation and "
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1616 "-layout (upon confirmation) enabled."))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1617 'ask)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1618 ((message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1619 "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
1620 '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
1621 ;;;_ > 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
1622 (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
1623 "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
1624 (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
1625 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
1626 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
1627 allout-mode-misc-menu))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1628 cur)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1629 (while menus
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1630 (setq cur (car menus)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1631 menus (cdr menus))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1632 (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
1633 ;;;_ > allout-overlay-preparations
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1634 (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
1635 "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
1636 (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
1637 (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
1638 (put 'allout-exposure-category 'evaporate t)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1639 ;; 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
1640 ;; 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
1641 ;; 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
1642 ;; 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
1643 ;; 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
1644 ;; 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
1645 (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
1646 'allout-isearch-end-handler)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1647 (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
1648 (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
1649 (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
1650 '(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
1651 (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
1652 '(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
1653 ;;;_ > allout-mode (&optional toggle)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1654 ;;;_ : Defun:
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1655 ;;;###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
1656 (defun allout-mode (&optional toggle)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1657 ;;;_ . Doc string:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1658 "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
1659 \\<allout-mode-map>
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1660
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1661 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
1662 symbol. Allout outline mode always runs as a minor mode.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1663
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
1664 Allout outline mode provides extensive outline oriented formatting and
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1665 manipulation. It enables structural editing of outlines, as well as
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1666 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
1667 accommodating syntax-sensitive text like programming languages. (For
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1668 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
1669 outline.)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1670
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1671 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
1672
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1673 - 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
1674 repositioning, promotion/demotion, cut, and paste
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1675 - 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
1676 - 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
1677 - easy topic encryption and decryption
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1678 - \"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
1679 - 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
1680 - independent extensibility, using comprehensive exposure and authoring hooks
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1681
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1682 and many other features.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1683
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1684 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
1685 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
1686 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
1687 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
1688 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
1689
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1690 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
1691 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
1692 `\\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
1693 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
1694 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
1695 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
1696 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
1697 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
1698
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1699 Exposure Control:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1700 ----------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1701 \\[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
1702 \\[allout-show-children] `allout-show-children'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1703 \\[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
1704 \\[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
1705 \\[allout-show-all] `allout-show-all'
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 Navigation:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1708 ----------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1709 \\[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
1710 \\[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
1711 \\[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
1712 \\[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
1713 \\[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
1714 \\[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
1715 \\[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
1716 \\[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
1717 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
1718 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
1719
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1720
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1721 Topic Header Production:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1722 -----------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1723 \\[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
1724 \\[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
1725 \\[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
1726
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1727 Topic Level and Prefix Adjustment:
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-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
1730 \\[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
1731 \\[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
1732 current topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1733 \\[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
1734 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
1735 are alternated according to nesting depth.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1736 \\[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
1737 the offspring are not affected.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1738 With repeat count, revoke numbering.
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 Topic-oriented Killing and Yanking:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1741 ----------------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1742 \\[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
1743 \\[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
1744 \\[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
1745 \\[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
1746 \\[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
1747 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
1748 heading (ie, prefix sans text).
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1749 \\[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
1750
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1751 Topic-oriented Encryption:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1752 -------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1753 \\[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
1754 Encrypt/Decrypt topic content
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1755
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1756 Misc commands:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1757 -------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1758 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
1759 and establish a default file-var setting
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1760 for `allout-layout'.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1761 \\[allout-mark-topic] `allout-mark-topic'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1762 \\[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
1763 Duplicate outline, sans concealed text, to
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1764 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
1765 of current buffer - \"*BUFFERNAME exposed*\".
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1766 \\[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
1767 Like above 'copy-exposed', but convert topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1768 prefixes to section.subsection... numeric
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1769 format.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1770 \\[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
1771 auto-activation.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1772
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1773 Topic Encryption
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1774
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1775 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
1776 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
1777 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
1778 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
1779
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1780 Topics pending encryption are, by default, automatically
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1781 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
1782 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
1783 automatically decrypted for continued editing.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1784
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1785 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
1786 preventing accidents like neglected encryption before saves,
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1787 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
1788 pitfalls.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1789
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1790 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
1791 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
1792 for details.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1793
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1794 HOT-SPOT Operation
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1795
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1796 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
1797 navigation and exposure control.
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1798
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1799 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
1800 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
1801 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
1802 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
1803 \(\\[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
1804
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1805 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
1806 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
1807 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
1808 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
1809 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
1810
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1811 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
1812 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
1813 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
1814 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
1815 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
1816 \(\\[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
1817 at the beginning of the current entry.
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 Extending Allout
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1820
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1821 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
1822 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
1823 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
1824
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1825 `allout-mode-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1826 `allout-mode-deactivate-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1827 `allout-exposure-change-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1828 `allout-structure-added-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1829 `allout-structure-deleted-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1830 `allout-structure-shifted-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1831
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1832 Terminology
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1833
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1834 Topic hierarchy constituents - TOPICS and SUBTOPICS:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1835
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1836 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
1837 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
1838 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
1839 CURRENT ITEM:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1840 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
1841 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
1842 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
1843 called the:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1844 LEVEL: The same as DEPTH.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1845
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1846 ANCESTORS:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1847 Those ITEMs whose TOPICs contain an ITEM.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1848 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
1849 of the ITEM.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1850 OFFSPRING:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1851 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
1852 SUBTOPIC:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1853 An OFFSPRING of its ANCESTOR TOPICs.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1854 CHILD:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1855 An immediate SUBTOPIC of its PARENT.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1856 SIBLINGS:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1857 TOPICs having the same PARENT and DEPTH.
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1858
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1859 Topic text constituents:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1860
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1861 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
1862 text.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1863 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
1864 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
1865 BODY: Same as ENTRY.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1866 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
1867 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
1868 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
1869 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
1870 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
1871 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
1872 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
1873 the PREFIX.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1874
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1875 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
1876 of the ITEM.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1877 PREFIX-LEAD:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1878 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
1879 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
1880 `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
1881
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1882 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
1883 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
1884 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
1885 (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
1886 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
1887 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
1888 docstring for more detail.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1889 PREFIX-PADDING:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1890 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
1891 bullet, determining the ITEM's DEPTH.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1892 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
1893 the characters listed on `allout-plain-bullets-string' or
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1894 `allout-distinctive-bullets-string'. When creating a TOPIC,
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1895 plain BULLETs are by default used, according to the DEPTH of the
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1896 TOPIC. Choice among the distinctive BULLETs is offered when you
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1897 provide a universal argugment \(\\[universal-argument]) to the
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1898 TOPIC creation command, or when explictly rebulleting a TOPIC. The
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1899 significance of the various distinctive bullets is purely by
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1900 convention. See the documentation for the above bullet strings for
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1901 more details.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1902 EXPOSURE:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1903 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
1904 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
1905 CONCEALED:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1906 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
1907 text is represented by \"...\" ellipses.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1908
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1909 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
1910 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
1911 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
1912 ;;;_ . Code
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1913 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1914
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1915 (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
1916 (allout-mode-p)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1917 ; Massage universal-arg `toggle' val:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1918 (toggle (and toggle
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1919 (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
1920 toggle)))
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
1921 ; 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
1922 (explicit-activation (and toggle
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1923 (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
1924 (and (wholenump toggle)
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1925 (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
1926 ;; 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
1927 (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
1928 (car command-history)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1929 (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
1930 'write-file-functions)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1931 ((boundp 'write-file-hooks)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1932 'write-file-hooks)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1933 (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
1934 do-layout
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1935 )
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1936
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1937 ; 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
1938 (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
1939
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1940 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1941
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1942 ;; 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
1943 ;; 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
1944 ;; 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
1945 ;; 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
1946 ;; skip everything.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1947 ((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
1948 ; 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
1949 active ; Already activated.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1950 (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
1951 (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
1952 emacs-version)); 19.19.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1953 t)
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1954
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1955 ;; Deactivation:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1956 ((and (not explicit-activation)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1957 (or active toggle))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1958 ; Activation not explicitly
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1959 ; requested, and either in
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1960 ; active state or *de*activation
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1961 ; 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
1962 (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
1963
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1964 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1965
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1966 (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
1967 (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
1968 (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
1969 (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
1970 (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
1971 (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
1972 (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
1973
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1974 (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
1975 '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
1976
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1977 (setq allout-mode nil)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1978 (run-hooks 'allout-mode-deactivate-hook))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1979
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1980 ;; Activation:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1981 ((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
1982 (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
1983 (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
1984 ;; 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
1985 (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
1986
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1987 (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
1988
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1989 (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
1990 (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
1991
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1992 (set-allout-regexp)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1993 (allout-add-resumptions
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1994 '(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
1995 allout-line-boundary-regexp
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1996 extend)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1997 '(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
1998 allout-bob-regexp
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1999 extend))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2000
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2001 ;; 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
2002 (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
2003 (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
2004
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2005 ;; 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
2006 (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
2007 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
2008 (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
2009 (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
2010 minor-mode-map-alist)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2011
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2012 (add-to-invisibility-spec '(allout . t))
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
2013
71893
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 '(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
2015 (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
2016 (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
2017 (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
2018 nil t)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2019 (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
2020 (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
2021 nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2022 (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
2023 nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2024
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2025 ;; 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
2026 ;; 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
2027 ;; 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
2028 ;; etc.)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2029 (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
2030 ;; 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
2031 (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
2032 (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
2033 auto-fill-function)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2034 ;; 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
2035 ;; filling is active:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2036 (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
2037 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
2038 '(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
2039 ;; 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
2040 (list 'paragraph-start
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2041 (concat paragraph-start "\\|^\\("
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2042 allout-regexp "\\)"))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2043 (list 'paragraph-separate
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2044 (concat paragraph-separate "\\|^\\("
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2045 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
2046 (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
2047 (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
2048 (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
2049
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2050 (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
2051
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2052 (if allout-layout
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2053 (setq do-layout t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2054
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2055 (setq allout-mode t)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2056 (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
2057
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2058 ;; Reactivation:
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
2059 ((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
2060 (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
2061 ) ;; 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
2062
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2063 ;; 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
2064 (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
2065 allout-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2066 allout-default-layout)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2067 (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
2068 allout-auto-activation
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2069 use-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2070 (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
2071 (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
2072 (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
2073 (buffer-name)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2074 use-layout))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2075 t
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2076 (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
2077 nil)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2078 t)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2079 (save-excursion
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2080 (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
2081 (goto-char 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2082 (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
2083 (condition-case err
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2084 (progn
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2085 (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
2086 (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
2087 ;; 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
2088 ;; 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
2089 (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
2090 (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
2091 allout-mode
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2092 ) ; let*
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2093 ) ; defun
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2094
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2095 (defun allout-setup-mode-map ()
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2096 "Establish allout-mode bindings."
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2097 (setq-default allout-mode-map
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2098 (produce-allout-mode-map allout-keybindings-list))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2099 (setq allout-mode-map
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2100 (produce-allout-mode-map allout-keybindings-list))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2101 (substitute-key-definition 'beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2102 'allout-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2103 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2104 (substitute-key-definition 'move-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2105 'allout-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2106 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2107 (substitute-key-definition 'end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2108 'allout-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2109 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2110 (substitute-key-definition 'move-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2111 'allout-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2112 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2113 (fset 'allout-mode-map allout-mode-map))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2114
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2115 ;; 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
2116 ;; been invoked:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2117 (allout-setup-mode-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2118
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2119 ;;;_ > allout-minor-mode
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2120 (defalias 'allout-minor-mode 'allout-mode)
68956
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2121
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2122 ;;;_ - Position Assessment
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2123 ;;;_ > allout-hidden-p (&optional pos)
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2124 (defsubst allout-hidden-p (&optional pos)
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2125 "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
2126 (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
2127
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2128 ;;;_ > 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
2129 ;;; &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2130 (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
2131 &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2132 "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
2133 (if after
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2134 (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
2135 ;;;_ > 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
2136 ;;; &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2137 (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
2138 &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2139 "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
2140
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2141 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
2142 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
2143 reclosing the opened text.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2144
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2145 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
2146 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
2147
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2148 (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
2149 (let ((start (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2150 (ol-start (overlay-start ol))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2151 (ol-end (overlay-end ol))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2152 first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2153 (goto-char beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2154 (while (< (point) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2155 (when (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2156 (allout-show-to-offshoot)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2157 (if (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2158 (save-excursion (forward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2159 (allout-show-to-offshoot)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2160 (when (not first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2161 (setq first (point))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2162 (goto-char (if (featurep 'xemacs)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2163 (next-property-change (1+ (point)) nil end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2164 (next-char-property-change (1+ (point)) end))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2165 (when first
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2166 (goto-char first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2167 (condition-case nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2168 (if (not
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2169 (yes-or-no-p
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2170 (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
2171 (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
2172 " \\[keyboard-quit] also reconceals) "))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2173 (progn (goto-char start)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2174 (error "Concealed-text change refused.")))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2175 (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
2176 (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
2177 (error "Concealed-text change abandoned, text reconcealed."))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2178 (goto-char start))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2179 ;;;_ > allout-before-change-handler (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2180 (defun allout-before-change-handler (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2181 "Protect against changes to invisible text.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2182
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
2183 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
2184
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2185 (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
2186 (allout-show-to-offshoot))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2187
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2188 ;; 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
2189 ;; 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
2190 (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
2191 ;; 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
2192 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2193 (got-char beg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2194 (let ((overlay (allout-get-invisibility-overlay)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2195 (allout-overlay-interior-modification-handler
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2196 overlay nil beg end nil)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2197 ;;;_ > allout-isearch-end-handler (&optional overlay)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2198 (defun allout-isearch-end-handler (&optional overlay)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2199 "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
2200
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2201 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
2202 `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
2203 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
2204
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2205 (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
2206 (allout-show-to-offshoot)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2207
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2208 ;;;_ #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
2209 ;;; 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
2210 ;;; 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
2211 ;;; `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
2212 ;;; 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
2213 ;;; 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
2214 ;;; 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
2215 ;;; 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
2216 ;;;_ = 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
2217 (defvar allout-recent-prefix-beginning 0
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2218 "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
2219 (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
2220 ;;;_ = 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
2221 (defvar allout-recent-prefix-end 0
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2222 "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
2223 (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
2224 ;;;_ = allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2225 (defvar allout-recent-depth 0
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2226 "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
2227 (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
2228 ;;;_ = 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
2229 (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
2230 "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
2231 (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
2232 ;;;_ > allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2233 (defsubst allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2234 "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
2235
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2236 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
2237 (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
2238 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
2239 (match-beginning 2))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2240 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
2241 allout-recent-prefix-beginning
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2242 allout-header-subtraction)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2243 allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2244 ;;;_ > nullify-allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2245 (defsubst nullify-allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2246 "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
2247 (setq allout-recent-prefix-end (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2248 allout-recent-prefix-beginning (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2249 allout-recent-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2250 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
2251 ;;;_ > allout-recent-depth ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2252 (defsubst allout-recent-depth ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2253 "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
2254
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2255 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
2256 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
2257 `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
2258 to return the current depth."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2259
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2260 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
2261 ;;;_ > allout-recent-prefix ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2262 (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
2263 "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
2264
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2265 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
2266 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
2267 `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
2268 to return the current prefix."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2269 (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
2270 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
2271 ;;;_ > 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
2272 (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
2273 "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
2274
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2275 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
2276 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
2277 `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
2278 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
2279 '(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
2280 allout-recent-prefix-end))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2281
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2282 ;;;_ #4 Navigation
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2283
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2284 ;;;_ - Position Assessment
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2285 ;;;_ : Location Predicates
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2286 ;;;_ > allout-do-doublecheck ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2287 (defsubst allout-do-doublecheck ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2288 "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
2289 (and
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2290 ;; 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
2291 ;; 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
2292 (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
2293 ;; 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
2294 (<= 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
2295 ;;;_ > allout-aberrant-container-p ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2296 (defun allout-aberrant-container-p ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2297 "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
2298
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2299 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
2300 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
2301
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2302 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
2303 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
2304
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2305 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
2306 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
2307 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
2308
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2309 ;; 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
2310 ;; 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
2311 ;; 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
2312 ;; 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
2313 ;; 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
2314 ;; 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
2315 ;; 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
2316 ;; actually connected with their prospective context.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2317
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2318 (let ((depth (allout-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2319 (start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2320 done aberrant)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2321 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2322 (while (and (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2323 (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
2324 (allout-prefix-data)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2325 (goto-char allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2326 (cond
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2327 ;; sibling - continue:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2328 ((eq allout-recent-depth depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2329 ;; first offspring is excessive - aberrant:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2330 ((> allout-recent-depth (1+ depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2331 (setq done t aberrant t))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2332 ;; 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
2333 (t (setq done t)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2334 (if aberrant
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2335 aberrant
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2336 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2337 ;; recalibrate allout-recent-*
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2338 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2339 nil)))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2340 ;;;_ > 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
2341 (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
2342 "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
2343
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2344 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
2345 (save-excursion
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2346 (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
2347 (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
2348 (allout-prefix-data)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2349 (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
2350 (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
2351 ;;;_ > allout-on-heading-p ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2352 (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
2353 ;;;_ > 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
2354 (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
2355 "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
2356 (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
2357 (beginning-of-line))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2358 (looking-at allout-regexp))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2359 (= (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
2360 ;;;_ : 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
2361 ;;;_ > allout-depth ()
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2362 (defun allout-depth ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2363 "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
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
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2367 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
2368 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2369 (let ((start-point (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2370 (if (and (allout-goto-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2371 (not (< start-point (point))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2372 allout-recent-depth
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2373 (progn
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2374 ;; Oops, no prefix, nullify it:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2375 (nullify-allout-prefix-data)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2376 ;; ... and return 0:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2377 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
2378 ;;;_ > allout-current-depth ()
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2379 (defun allout-current-depth ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2380 "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
2381
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2382 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
2383 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2384 (if (allout-back-to-current-heading)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2385 (max 1
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2386 (- allout-recent-prefix-end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2387 allout-recent-prefix-beginning
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2388 allout-header-subtraction))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2389 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
2390 ;;;_ > 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
2391 (defun allout-get-current-prefix ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2392 "Topic prefix of the current topic."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2393 (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
2394 (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
2395 (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
2396 ;;;_ > 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
2397 (defun allout-get-bullet ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2398 "Return bullet of containing topic (visible or not)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2399 (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
2400 (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
2401 (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
2402 ;;;_ > 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
2403 (defun allout-current-bullet ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2404 "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
2405 (condition-case nil
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2406 (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
2407 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2408 (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
2409 allout-recent-prefix-end))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2410 ;; 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
2411 (args-out-of-range nil))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2412 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2413 ;;;_ > 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
2414 (defun allout-get-prefix-bullet (prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2415 "Return the bullet of the header prefix string PREFIX."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2416 ;; 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
2417 ;; 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
2418 (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
2419 (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
2420 ;;;_ > 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
2421 (defun allout-sibling-index (&optional depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2422 "Item number of this prospective topic among its siblings.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2423
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2424 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
2425 opening a new level, and return 0.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2426
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2427 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
2428
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2429 (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2430 (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
2431 ((or (null depth) (= depth (allout-depth)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2432 (let ((index 1))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2433 (while (allout-previous-sibling allout-recent-depth nil)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2434 (setq index (1+ index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2435 index))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2436 ((< 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
2437 (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
2438 (allout-sibling-index))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2439 (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
2440 ;;;_ > 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
2441 (defun allout-topic-flat-index ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2442 "Return a list indicating point's numeric section.subsect.subsubsect...
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2443 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
2444 (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
2445 (next-index (allout-sibling-index depth))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2446 (rev-sibls nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2447 (while (> next-index 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2448 (setq rev-sibls (cons next-index rev-sibls))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2449 (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
2450 (setq next-index (allout-sibling-index depth)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2451 rev-sibls)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2452 )
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2453
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2454 ;;;_ - Navigation routines
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2455 ;;;_ > allout-beginning-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2456 (defun allout-beginning-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2457 "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
2458
71915
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
2459 ;; 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
2460 ;; 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
2461 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2462 (move-beginning-of-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2463 (beginning-of-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2464 (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
2465 (beginning-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2466 (if (or (allout-hidden-p) (not (bolp)))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2467 (forward-char -1)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2468 ;;;_ > allout-end-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2469 (defun allout-end-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2470 "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
2471 ;; 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
2472 ;; `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
2473 ;; `move-beginning-of-line'.
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2474 (let ((inhibit-field-text-motion t))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2475 (end-of-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2476 (while (allout-hidden-p)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2477 (end-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2478 (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
2479 ;;;_ > allout-beginning-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2480 (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
2481 "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
2482
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2483 (interactive)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2484
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2485 (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
2486 (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
2487 (move-beginning-of-line 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2488 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2489 (let ((beginning-of-body
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2490 (save-excursion
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2491 (while (and (allout-do-doublecheck)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2492 (allout-aberrant-container-p)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2493 (allout-previous-visible-heading 1)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2494 (allout-beginning-of-current-entry)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2495 (point))))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2496 (cond ((= (current-column) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2497 (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
2498 ((< (point) beginning-of-body)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2499 (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
2500 ((= (point) beginning-of-body)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2501 (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
2502 (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
2503 (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
2504 ;; 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
2505 (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
2506 ;;;_ > allout-end-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2507 (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
2508 "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
2509
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2510 (interactive)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2511
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2512 (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
2513 (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
2514 (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
2515 (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
2516 (allout-end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2517 (point))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2518 (cond ((not (eolp))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2519 (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
2520 ((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
2521 (forward-char -1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2522 (allout-hidden-p)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2523 (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
2524 (allout-show-current-entry)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2525 (allout-show-children)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2526 (allout-end-of-entry))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2527 ((>= (point) end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2528 (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
2529 (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
2530 (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
2531 ;;;_ > 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
2532 (defsubst allout-next-heading ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2533 "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
2534
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2535 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
2536
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2537 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
2538 (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
2539 (forward-char 1))
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 (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
2542 (allout-prefix-data)
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2543 (and (allout-do-doublecheck)
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2544 ;; 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
2545 ;; 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
2546 (allout-aberrant-container-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2547 (goto-char allout-recent-prefix-beginning)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2548 ;;;_ > 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
2549 (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
2550 "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
2551 ;; 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
2552 ;; and usable by allout-mode.
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2553 (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
2554 ;;;_ > allout-previous-heading ()
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2555 (defun allout-previous-heading ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2556 "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
2557
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2558 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
2559
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2560 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
2561
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2562 (if (bobp)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2563 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2564 (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
2565 ;; 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
2566 (allout-goto-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2567 (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
2568 (looking-at allout-bob-regexp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2569 (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
2570 (if (and (allout-do-doublecheck)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2571 (allout-aberrant-container-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2572 (or (allout-previous-heading)
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2573 (and (goto-char start-point)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2574 ;; recalibrate allout-recent-*:
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2575 (allout-depth)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2576 nil))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2577 (point))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2578 ;;;_ > allout-get-invisibility-overlay ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2579 (defun allout-get-invisibility-overlay ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2580 "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
2581 (let ((overlays (overlays-at (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2582 got)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2583 (while (and overlays (not got))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2584 (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
2585 (setq got (car overlays))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2586 (pop overlays)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2587 got))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2588 ;;;_ > allout-back-to-visible-text ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2589 (defun allout-back-to-visible-text ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2590 "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
2591 (if (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2592 (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
2593 (point))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2594
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2595 ;;;_ - Subtree Charting
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2596 ;;;_ " 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
2597 ;;; 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
2598 ;;;
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2599 ;;; 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
2600 ;;; 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
2601
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2602 ;;;_ > 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
2603 (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
2604 "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
2605
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2606 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
2607 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
2608
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2609 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
2610 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
2611
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2612 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
2613
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2614 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
2615
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2616 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
2617 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
2618 for their elaborate manipulations.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2619
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2620 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
2621 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
2622 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
2623 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
2624 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
2625 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
2626
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2627 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
2628 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
2629 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
2630
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2631 (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
2632 chart curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2633
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2634 (if original ; Just starting?
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2635 ; Register initial settings and
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2636 ; 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
2637 (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
2638 (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
2639 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2640 (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
2641 (allout-next-heading))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2642
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2643 ;; 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
2644 ;; 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
2645 ;; the typically quite constrained Emacs max-lisp-eval-depth.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2646 ;;
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2647 ;; 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
2648 ;; operation rather than recursing for lower levels. Bah.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2649
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2650 (while (and (not (eobp))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2651 ; Still within original topic?
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2652 (< 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
2653 (cond ((= prev-depth curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2654 ;; 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
2655 (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
2656 (if (and levels (<= levels 1))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2657 ;; 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
2658 (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
2659 ;; 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
2660 ;; 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
2661 (while (and (<= curr-depth
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2662 allout-recent-depth)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2663 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2664 (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
2665 (allout-next-heading)))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2666 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2667 (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
2668 (allout-next-heading))))
7416
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 ((and (< prev-depth curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2671 (or (not levels)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2672 (> levels 0)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2673 ;; 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
2674 (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
2675 (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
2676 (1- levels))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2677 visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2678 orig-depth
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2679 curr-depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2680 chart))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2681 ;; ... then continue with this one.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2682 )
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2683
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2684 ;; ... 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
2685
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2686 )))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2687
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2688 (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
2689 ; the original level. Position
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2690 ; to the end of it:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2691 (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
2692 (and (= (preceding-char) ?\n)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2693 (= (aref (buffer-substring (max 1 (- (point) 3))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2694 (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2695 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2696 ?\n)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2697 (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
2698 (setq allout-recent-end-of-subtree (point))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2699
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2700 chart ; (nreverse chart) not necessary,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2701 ; and maybe not preferable.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2702 ))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2703 ;;;_ > 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
2704 (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
2705 "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
2706 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
2707 for an explanation of charts."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2708 (save-excursion
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2709 (when (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2710 (let ((chart (list (point))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2711 (while (allout-next-sibling)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2712 (setq chart (cons (point) chart)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2713 (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
2714 ;;;_ > 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
2715 (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
2716
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2717 "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
2718
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2719 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
2720
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2721 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
2722 start point."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2723
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2724 (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
2725 (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
2726 chart)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2727 (setq here (car chart))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2728 (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
2729 (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
2730 depth
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2731 (1- depth)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2732 ;; 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
2733 ;; more depth to go:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2734 (if further (setq result (append further result)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2735 (setq chart (cdr chart)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2736 (goto-char here)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2737 (if (allout-hidden-p)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2738 (setq result (cons here result)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2739 (setq chart (cdr chart))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2740 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
2741 ;;;_ 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
2742 ;; (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
2743 ;; "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
2744
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2745 ;; 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
2746
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2747 ;; 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
2748 ;; 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
2749 ;; 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
2750 ;; 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
2751 ;; 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
2752 ;; 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
2753
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2754 ;; 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
2755 ;; 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
2756 ;; exposed reside.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2757
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2758 ;; - 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
2759 ;; 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
2760 ;; 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
2761 ;; - 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
2762 ;; opened.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2763 ;; - 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
2764 ;; 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
2765 ;; exposure:"
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2766 ;; (while spec
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2767 ;; (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
2768 ;; )
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2769 ;; )
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2770 ;; (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
2771 ;; )
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2772
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2773 ;;;_ - 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
2774 ;;;_ > 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
2775 (defun allout-goto-prefix ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2776 "Put point at beginning of immediately containing outline topic.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2777
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2778 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
2779
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2780 Not sensitive to topic visibility.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2781
46161
29f1f32aee5b (outline-goto-prefix): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 44182
diff changeset
2782 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
2783
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2784 (let (done)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2785 (while (and (not done)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2786 (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
2787 (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
2788 (if (looking-at allout-regexp)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2789 (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
2790 (forward-char -1)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2791 (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
2792 (cond ((looking-at allout-regexp)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2793 (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
2794 ((allout-next-heading))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2795 (done))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2796 done)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2797 ;;;_ > allout-goto-prefix-doublechecked ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2798 (defun allout-goto-prefix-doublechecked ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2799 "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
2800
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2801 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
2802 `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
2803 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
2804 `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
2805 (if (allout-goto-prefix)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2806 (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
2807 (allout-aberrant-container-p))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2808 (allout-previous-heading)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2809 (point))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2810
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2811 ;;;_ > 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
2812 (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
2813 "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
2814
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2815 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
2816 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
2817
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2818 (if (not (allout-goto-prefix-doublechecked))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2819 nil
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2820 (goto-char allout-recent-prefix-end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2821 (if ignore-decorations
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2822 t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2823 (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
2824 (if (and (not (eolp)) (looking-at "\\s-")) (forward-char 1)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2825 ;; 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
2826 (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
2827 ;;;_ > 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
2828 (defun allout-current-bullet-pos ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2829 "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
2830
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2831 (if (not (allout-current-depth))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2832 nil
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2833 (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
2834 ;;;_ > 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
2835 (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
2836 "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
2837
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2838 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
2839
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2840 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
2841 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
2842
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2843 (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
2844 (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
2845 (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
2846 (if (<= (point) bol-point)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2847 (if (interactive-p)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2848 (allout-end-of-prefix)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2849 (point))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2850 (goto-char (point-min))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2851 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
2852 ;;;_ > 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
2853 (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
2854 ;;;_ > allout-pre-next-prefix ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2855 (defun allout-pre-next-prefix ()
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2856 "Skip forward to just before the next heading line.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2857
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2858 Returns that character position."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2859
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2860 (if (allout-next-heading)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2861 (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
2862 ;;;_ > 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
2863 (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
2864 "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
2865
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2866 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
2867 visible topic.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2868
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2869 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
2870 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
2871 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
2872
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2873 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
2874 (interactive "P")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2875 (if current
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2876 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2877 (allout-goto-prefix-doublechecked))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2878 (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
2879 (allout-next-heading)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2880 (while (and (not (eobp))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2881 (> 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
2882 (allout-next-heading))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2883 (if (eobp)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2884 (allout-end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2885 (forward-char -1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2886 (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
2887 (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
2888 (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
2889 ;;;_ > 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
2890 (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
2891
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2892 "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
2893
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2894 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
2895 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
2896 excluded as delimiting whitespace between topics.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2897
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2898 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
2899 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2900 (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
2901 ;;;_ > 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
2902 (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
2903 "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
2904
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2905 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
2906 \(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
2907 (interactive)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2908 (let ((start-point (point)))
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2909 (move-beginning-of-line 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2910 (if (< 0 (allout-current-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2911 (goto-char allout-recent-prefix-end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2912 (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
2913 (allout-end-of-prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2914 (if (and (interactive-p)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2915 (= (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
2916 (goto-char (allout-current-bullet-pos)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2917 ;;;_ > allout-end-of-entry (&optional inclusive)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2918 (defun allout-end-of-entry (&optional inclusive)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2919 "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
2920
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2921 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
2922 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
2923 collapsed."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2924 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2925 (allout-pre-next-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2926 (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
2927 (forward-char -1))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2928 (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
2929 ;;;_ > 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
2930 (defun allout-end-of-current-heading ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2931 (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
2932 (allout-beginning-of-current-entry)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2933 (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
2934 (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
2935 (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
2936 ;;;_ > allout-get-body-text ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2937 (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
2938 "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
2939 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2940 (allout-end-of-prefix)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2941 (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
2942 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2943 (backward-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2944 (let ((pre-body (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2945 (if (not pre-body)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2946 nil
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2947 (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
2948 (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
2949 (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
2950 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2951 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2952 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2953 )
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2954
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2955 ;;;_ - 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
2956 ;;;_ > 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
2957 (defun allout-ascend-to-depth (depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2958 "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
2959 (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
2960 (let (last-ascended)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2961 (while (and (< depth allout-recent-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2962 (setq last-ascended (allout-ascend))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2963 (goto-char allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2964 (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
2965 (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
2966 ;;;_ > allout-ascend ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2967 (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
2968 "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
2969
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2970 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
2971 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
2972 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
2973 (if dont-move-if-unsuccessful
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2974 (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
2975 (prog1
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2976 (if (allout-beginning-of-level)
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
2977 (let ((bolevel (point))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
2978 (bolevel-depth allout-recent-depth))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
2979 (allout-previous-heading)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2980 (cond ((< allout-recent-depth bolevel-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2981 allout-recent-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2982 ((= allout-recent-depth bolevel-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2983 (if dont-move-if-unsuccessful
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2984 (goto-char dont-move-if-unsuccessful))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2985 (allout-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2986 nil)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2987 (t
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2988 ;; 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
2989 (goto-char bolevel)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2990 (allout-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2991 nil))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2992 (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
2993 ;;;_ > 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
2994 (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
2995 "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
2996
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2997 Returning depth if successful, nil if not."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2998 (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
2999 (start-depth (allout-depth)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3000 (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
3001 (and (> (allout-depth) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3002 (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
3003 (allout-next-heading) ; ... go further
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3004 (< 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
3005 (if (and (> (allout-depth) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3006 (= allout-recent-depth depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3007 depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3008 (goto-char start-point)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3009 nil))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3010 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3011 ;;;_ > allout-up-current-level (arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3012 (defun allout-up-current-level (arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3013 "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
3014 (interactive "p")
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3015 (let ((start-point (point)))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3016 (allout-back-to-current-heading)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3017 (if (not (allout-ascend))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3018 (progn (goto-char start-point)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3019 (error "Can't ascend past outermost level"))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3020 (if (interactive-p) (allout-end-of-prefix))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3021 allout-recent-prefix-beginning)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3022
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3023 ;;;_ - 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
3024 ;;;_ > 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
3025 (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
3026 "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
3027
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3028 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
3029
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3030 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
3031
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3032 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
3033
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3034 (if (if backward (bobp) (eobp))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3035 nil
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3036 (let ((target-depth (or depth (allout-depth)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3037 (start-point (point))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3038 (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
3039 (count 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3040 leaping
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3041 last-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3042 (while (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3043 ;; 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
3044 (not leaping)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3045 ;; not at limit:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3046 (not (if backward (bobp) (eobp)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3047 ;; still traversable:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3048 (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
3049 ;; we're below the target depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3050 (> (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
3051 (setq count (1+ count))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3052 (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
3053 (setq leaping t)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3054 (cond (leaping
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3055 (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
3056 (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3057 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3058 (if depth (allout-depth) target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3059 nil)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3060 ((and (not (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3061 (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
3062 (= 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
3063 (not (= start-prefix-beginning
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3064 allout-recent-prefix-beginning)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3065 allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3066 (t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3067 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3068 (if depth (allout-depth) target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3069 nil)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3070 ;;;_ > 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
3071 (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
3072 "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
3073
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3074 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
3075
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3076 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
3077
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3078 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
3079
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3080 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
3081
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3082 - 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
3083 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
3084 - 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
3085 some extra navigation
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3086 - 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
3087
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3088 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
3089 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
3090 `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
3091 situation."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3092
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3093 (if (if backward (bobp) (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3094 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3095 (let* ((start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3096 (target-depth (or depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3097 (search-whitespace-regexp nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3098 (depth-biased (- target-depth 2))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3099 (expression (if (<= target-depth 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3100 allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3101 (format allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3102 depth-biased depth-biased)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3103 found
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3104 done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3105 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3106 (setq found (if backward
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3107 (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
3108 (forward-char 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3109 (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
3110 (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
3111 (setq found nil))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3112 (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
3113 (if (not found)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3114 (progn (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3115 nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3116 ;; 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
3117 ;; 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
3118 ;; 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
3119 ;; 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
3120 (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
3121 (if (< allout-recent-depth target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3122 ;; 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
3123 (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3124 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3125 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3126 nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3127 (goto-char found)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3128 ;; locate cursor and set allout-recent-*:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3129 (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
3130 ;;;_ > 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
3131 (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
3132 "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
3133
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3134 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
3135
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3136 Optional BACKWARD reverses direction.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3137
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3138 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
3139 (allout-next-sibling depth (not backward))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3140 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3141 ;;;_ > 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
3142 (defun allout-snug-back ()
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
3143 "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
3144
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3145 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
3146 (if (or (bobp) (eobp))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3147 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3148 (forward-char -1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3149 (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
3150 nil
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3151 (forward-char -1))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3152 (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
3153 ;;;_ > 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
3154 (defun allout-beginning-of-level ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3155 "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
3156 (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
3157 ;;;_ > 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
3158 (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
3159 "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
3160
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3161 (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
3162 (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
3163 (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
3164 (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
3165 ;;;_ > 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
3166 (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
3167 "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
3168
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3169 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
3170
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3171 (interactive "p")
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3172 (let* ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3173 (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
3174 (step (if backward -1 1))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3175 prev got)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3176
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3177 (while (> arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3178 (while (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3179 ;; Boundary condition:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3180 (not (if backward (bobp)(eobp)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3181 ;; 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
3182 (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
3183 (error nil))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3184 (allout-beginning-of-current-line))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3185 ;; Deal with apparent header line:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3186 (if (not (looking-at allout-regexp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3187 ;; not a header line, keep looking:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3188 t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3189 (allout-prefix-data)
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3190 (if (and (allout-do-doublecheck)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3191 (allout-aberrant-container-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3192 ;; skip this aberrant prospective header line:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3193 t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3194 ;; this prospective headerline qualifies - register:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3195 (setq got allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3196 ;; and break the loop:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3197 nil))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3198 ;; 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
3199 (if got (setq prev got))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3200 (setq arg (1- arg)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3201 (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
3202 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3203 (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
3204 (goto-char prev)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3205 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3206 ((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
3207 ;;;_ > 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
3208 (defun allout-previous-visible-heading (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3209 "Move to the previous heading line.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3210
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3211 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
3212 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
3213 matches)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3214 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3215 (prog1 (allout-next-visible-heading (- arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3216 (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
3217 ;;;_ > 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
3218 (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
3219 "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
3220
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3221 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
3222
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3223 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
3224 (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
3225 (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
3226 (start-arg arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3227 (backward (> 0 arg)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3228 (if (= 0 start-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3229 (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
3230 (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
3231 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3232 (while (and (not (zerop arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3233 (if backward
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3234 (allout-previous-sibling)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3235 (allout-next-sibling)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3236 (setq arg (1- arg)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3237 (if (not (interactive-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3238 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3239 (allout-end-of-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3240 (if (not (zerop arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3241 (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
3242 (if backward "first" "last")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3243 allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3244 (- (abs start-arg) arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3245 (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
3246 ;;;_ > 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
3247 (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
3248 "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
3249 (interactive "p")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3250 (if (interactive-p)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3251 (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
3252 (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
3253 (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
3254
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3255 ;;;_ #5 Alteration
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3256
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3257 ;;;_ - 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
3258 ;;;_ = 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
3259 (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
3260 "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
3261
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3262 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
3263 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
3264 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
3265 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
3266 `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
3267 (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
3268 ;;;_ = allout-command-counter
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3269 (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
3270 "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
3271
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3272 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
3273 coordinating with allout activity.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3274 (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
3275 ;;;_ > 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
3276 (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
3277 "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
3278
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3279 - 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
3280 outline commands.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3281
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3282 - 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
3283
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3284 ; 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
3285 (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
3286 nil
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3287
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3288 (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
3289 allout-after-save-decrypt)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3290 (allout-after-saves-handler))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3291
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3292 ;; 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
3293 (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
3294 (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
3295 (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
3296 (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
3297 ))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3298 ;;;_ > 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
3299 (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
3300 "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
3301
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3302 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
3303 topic bullet character.
49962
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3304
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3305 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
3306 reinterpreted as the corresponding control-character in the
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3307 `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
3308 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
3309 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
3310
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3311 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
3312 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
3313 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
3314 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
3315 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
3316
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3317 (if (not (allout-mode-p))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3318 nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3319 ;; Increment allout-command-counter
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3320 (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
3321 ;; Do hot-spot navigation.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3322 (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
3323 (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
3324 (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
3325 ;;;_ > 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
3326 (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
3327 "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
3328
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3329 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
3330 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
3331 this-command accordingly.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3332
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3333 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
3334 (interactive)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3335 (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
3336 (char-to-string last-command-char)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3337 (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
3338 ;; 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
3339 ((and (fboundp 'characterp)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3340 (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
3341 (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
3342 (t 0)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3343 mapped-binding)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3344
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3345 (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
3346 nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3347
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3348 (if (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3349 ;; exclude control chars and escape:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3350 (<= 33 key-num)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3351 (setq mapped-binding
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3352 (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
3353 ;; translate literal membership on list:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3354 (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
3355 ;; 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
3356 (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
3357 (char-to-string
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3358 (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
3359 (>= 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
3360 (- key-num 96) key-num)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3361 t))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3362 ;; 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
3363 (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
3364 ;; 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
3365 (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
3366
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3367 (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
3368 (setq mapped-binding
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3369 (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
3370
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3371 (if mapped-binding
71915
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
3372 (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
3373
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3374 ;;;_ > 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
3375 (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
3376 "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
3377
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3378 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
3379 (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
3380 (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
3381 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
3382 (allout-mode t)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3383
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3384 ;;;_ - 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
3385 ;;;_ > 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
3386 (defun allout-solicit-alternate-bullet (depth &optional current-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3387
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3388 "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
3389
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3390 Offer one suitable for current depth DEPTH as default."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3391
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3392 (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
3393 (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
3394 (sans-escapes (regexp-sans-escapes allout-bullets-string))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3395 choice)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3396 (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
3397 (goto-char (allout-current-bullet-pos))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3398 (setq choice (solicit-char-in-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3399 (format "Select bullet: %s ('%s' default): "
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3400 sans-escapes
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3401 (substring-no-properties default-bullet))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3402 sans-escapes
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3403 t)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3404 (message "")
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3405 (if (string= choice "") default-bullet choice))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3406 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3407 ;;;_ > 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
3408 (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
3409 "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
3410 (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
3411 ;;;_ > 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
3412 (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
3413 "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
3414 (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
3415 (string= allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3416 (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
3417 (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
3418 (allout-get-bullet)))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3419 ;;;_ > 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
3420 (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
3421 "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
3422 (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
3423 (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
3424 (if prefix
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3425 (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
3426 (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
3427 ;;;_ > 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
3428 (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
3429 "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
3430 ;; 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
3431 (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
3432 (char-to-string (aref allout-plain-bullets-string
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3433 (% (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
3434 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
3435 allout-primary-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3436 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3437
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3438 ;;;_ - 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
3439 ;;;_ > 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
3440 (defun allout-make-topic-prefix (&optional prior-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3441 new
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3442 depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3443 solicit
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3444 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3445 index)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3446 ;; 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
3447 ;; 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
3448 ;; changing level of current topic.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3449 ;; Solicit dominates specified bullet-char.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3450 ;;;_ . Doc string:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3451 "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
3452
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3453 All the arguments are optional.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3454
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3455 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
3456 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
3457 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
3458 for instance.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3459
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3460 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
3461 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
3462 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
3463 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
3464 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
3465 bullet or previous sibling.
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 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
3468 the current topics' depth.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3469
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3470 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
3471 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
3472 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
3473 distinction or depth) is offered. (This overrides other options,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3474 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
3475 context-specific bullet is used.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3476
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3477 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
3478 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
3479 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
3480 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
3481
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3482 \(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
3483
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3484 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
3485 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
3486 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
3487 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
3488 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
3489 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
3490 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
3491 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
3492 index for each successive sibling)."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3493 ;;;_ . Code:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3494 ;; The options are ordered in likely frequence of use, most common
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3495 ;; highest, least lowest. Ie, more likely to be doing prefix
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3496 ;; adjustments than soliciting, and yet more than numbering.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3497 ;; Current prefix is least dominant, but most likely to be commonly
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3498 ;; specified...
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3499
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3500 (let* (body
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3501 numbering
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3502 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
3503 (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
3504 (header-lead allout-header-prefix)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3505 (bullet-char
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 ;; Getting value for bullet char is practically the whole job:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3508
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3509 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3510 ; 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
3511 ((<= depth 1) (setq header-lead "") allout-primary-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3512 ; 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
3513 (allout-old-style-prefixes
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3514 ;; Cheat - make body the whole thing, null out header-lead and
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3515 ;; bullet-char:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3516 (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
3517 (string-to-char allout-primary-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3518 (setq header-lead "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3519 "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3520
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3521 ;; (Neither level 1 nor old-style, so we're space padding.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3522 ;; 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
3523
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3524 ;; Solicitation overrides numbering and other cases:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3525 ((progn (setq body (make-string (- depth 2) ?\ ))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3526 ;; The actual condition:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3527 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
3528 (let* ((got (allout-solicit-alternate-bullet depth solicit)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3529 ;; 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
3530 (setq numbering (and allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3531 (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
3532 (string= got allout-numbered-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3533 ;; Now return what we got, regardless:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3534 got))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3535
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3536 ;; 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
3537 ((and allout-numbered-bullet number-control)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3538 (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
3539 allout-numbered-bullet
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3540 (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
3541 (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
3542 prior-bullet)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3543 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
3544 (allout-bullet-for-depth depth))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3545
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3546 ;;; Neither soliciting nor controlled numbering ;;;
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3547 ;;; (may be controlled denumbering, tho) ;;;
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3548
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3549 ;; Check wrt previous sibling:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3550 ((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
3551 (<= 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
3552 allout-numbered-bullet ; ... & numbering enabled
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3553 (not denumbering)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3554 (let ((sibling-bullet
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3555 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3556 ;; 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
3557 (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
3558 (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
3559 (allout-get-bullet))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3560 (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
3561 (string= allout-numbered-bullet sibling-bullet))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3562 (setq numbering sibling-bullet)))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3563
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3564 ;; Distinctive prior bullet?
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3565 ((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
3566 (allout-distinctive-bullet prior-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3567 ;; 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
3568 (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
3569 (string= prior-bullet allout-numbered-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3570 ;; or numbered, and not denumbering:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3571 (setq numbering (not denumbering)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3572 ;; Here 'tis:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3573 prior-bullet))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3574
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3575 ;; 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
3576 ((allout-bullet-for-depth depth)))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3577
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3578 (concat header-lead
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3579 body
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3580 bullet-char
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3581 (if numbering
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3582 (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
3583 (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
3584 ((allout-sibling-index))))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3585 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3586 )
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3587 ;;;_ > 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
3588 (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
3589 "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
3590
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3591 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
3592 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
3593 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
3594
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3595 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
3596 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
3597 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
3598 case.)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3599
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3600 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
3601
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3602 Nuances:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3603
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3604 - 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
3605 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
3606
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3607 - 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
3608 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
3609 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
3610 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
3611 deliberately dividing topic bodies.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3612
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3613 - 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
3614 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
3615 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
3616 single-spacing is used.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3617
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3618 - 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
3619 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
3620 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
3621 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
3622 from there."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3623
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3624 (allout-beginning-of-current-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3625 (let* ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3626 (depth (+ (allout-current-depth) relative-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3627 (opening-on-blank (if (looking-at "^\$")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3628 (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
3629 ;; 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
3630 opening-numbered
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3631 ref-depth
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3632 ref-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3633 (ref-topic (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3634 (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
3635 (allout-ascend-to-depth depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3636 ((>= 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
3637 (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
3638 (setq ref-depth allout-recent-depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3639 (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
3640 (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
3641 (allout-recent-bullet)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3642 ""))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3643 (setq opening-numbered
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3644 (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
3645 (and allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3646 (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
3647 (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
3648 (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
3649 allout-numbered-bullet))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3650 (point)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3651 dbl-space
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3652 doing-beginning
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3653 start end)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3654
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3655 (if (not opening-on-blank)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3656 ; Positioning and vertical
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3657 ; padding - only if not
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3658 ; opening-on-blank:
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3659 (progn
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3660 (goto-char ref-topic)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3661 (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
3662 (or (and (<= relative-depth 0) ; not descending;
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3663 (save-excursion
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
3664 ;; 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
3665 (or (> 0 (forward-line -1))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3666 (looking-at "^\\s-*$")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3667 (bobp)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3668 (save-excursion
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3669 ;; 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
3670 (allout-end-of-current-subtree)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3671 (looking-at "\n\n")))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3672 (and (= ref-depth 1)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3673 (or before
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3674 (= depth 1)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3675 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3676 ;; Don't already have following
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3677 ;; vertical padding:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3678 (not (allout-pre-next-prefix)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3679
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3680 ;; 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
3681 ;; going outwards:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3682 (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
3683 (progn (allout-back-to-current-heading)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3684 (setq doing-beginning (bobp))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3685 (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
3686 (allout-previous-heading)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3687 (if (and before (bobp))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3688 (open-line 1)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3689
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3690 (if (<= relative-depth 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3691 ;; Not going inwards, don't snug up:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3692 (if doing-beginning
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3693 (if (not dbl-space)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3694 (open-line 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3695 (open-line 2))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3696 (if before
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3697 (progn (end-of-line)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3698 (allout-pre-next-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3699 (while (and (= ?\n (following-char))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3700 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3701 (forward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3702 (allout-hidden-p)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3703 (forward-char 1))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3704 (if (not (looking-at "^$"))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3705 (open-line 1)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3706 (allout-end-of-current-subtree)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3707 (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
3708 ;; 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
3709 ;; double-spaced, otherwise snug up.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3710 (allout-end-of-entry)
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
3711 (if (eobp)
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
3712 (newline 1)
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
3713 (line-move 1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3714 (allout-beginning-of-current-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3715 (backward-char 1)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3716 (if (bolp)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3717 ;; Blank lines between current header body and next
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3718 ;; header - get to last substantive (non-white-space)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3719 ;; line in body:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3720 (progn (setq dbl-space t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3721 (re-search-backward "[^ \t\n]" nil t)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3722 (if (looking-at "\n\n")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3723 (setq dbl-space t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3724 (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
3725 (allout-next-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3726 (when (> allout-recent-depth ref-depth)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3727 ;; This is an offspring.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3728 (forward-line -1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3729 (looking-at "^\\s-*$")))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3730 (progn (forward-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3731 (open-line 1)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3732 (forward-line 1)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3733 (allout-end-of-current-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3734
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3735 ;;(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
3736 (if (not (bobp))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3737 ;; 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
3738 ;; 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
3739 (progn (if (and (not (> depth ref-depth))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3740 (not before))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3741 (open-line 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3742 (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
3743 (newline 1)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3744 (if dbl-space
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3745 (open-line 1)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3746 (if (not before)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3747 (newline 1)))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3748 (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
3749 (newline 1))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3750 (if (and (not (eobp))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3751 (or (not (bolp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3752 (and (not (bobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3753 ;; bolp doesnt detect concealed
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3754 ;; trailing newlines, compensate:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3755 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3756 (forward-char -1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3757 (allout-hidden-p)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3758 (forward-char 1))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3759 ))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3760 (setq start (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3761 (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
3762 " "))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3763 (setq end (1+ (point)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3764
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3765 (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
3766 depth nil nil t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3767 (if (> relative-depth 0)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3768 (save-excursion (goto-char ref-topic)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3769 (allout-show-children)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3770 (end-of-line)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3771
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3772 (run-hook-with-args 'allout-structure-added-hook start end)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3773 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3774 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3775 ;;;_ > 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
3776 (defun allout-open-subtopic (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3777 "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
3778
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3779 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
3780 prior to the current one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3781 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3782 (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
3783 ;;;_ > 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
3784 (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
3785 "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
3786
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3787 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
3788
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3789 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
3790 one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3791 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3792 (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
3793 ;;;_ > 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
3794 (defun allout-open-supertopic (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3795 "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
3796
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3797 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
3798 topic prior to the current one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3799
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3800 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3801 (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
3802
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3803 ;;;_ - Outline Alteration
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3804 ;;;_ : 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
3805 ;;;_ = 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
3806 (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
3807 "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
3808 ;;;_ > 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
3809 (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
3810 "`allout-mode' autofill function.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3811
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3812 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
3813 `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
3814
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3815 (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
3816 (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
3817 ;; 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
3818 (save-excursion
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3819 (beginning-of-line)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3820 (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
3821 ;; ... 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
3822 ;; 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
3823 (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
3824 (current-column))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3825 ?\ )))))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3826 (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
3827 auto-fill-function
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3828 'do-auto-fill)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3829 (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
3830 (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
3831 ;;;_ > 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
3832 (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
3833 "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
3834
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3835 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
3836 be accommodated.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3837
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3838 Note that refill of indented paragraphs is not done."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3839
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3840 (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
3841 (allout-end-of-prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3842 (let* ((new-margin (current-column))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3843 excess old-indent-begin old-indent-end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3844 ;; 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
3845 ;; *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
3846 ;; 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
3847 (old-margin (+ old-depth (- new-margin new-depth))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3848
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3849 ;; 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
3850 (allout-unprotected
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3851 (save-match-data
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3852 (while
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3853 (and (re-search-forward "\n\\(\\s-*\\)"
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3854 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3855 t)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3856 ;; Register the indent data, before we reset the
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3857 ;; 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
3858 (setq old-indent-begin (match-beginning 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3859 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
3860 (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
3861 (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
3862 old-margin)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3863 ;; 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
3864 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3865 ;; 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
3866 ;; reindent it, preserving its existing indentation
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3867 ;; beyond the old margin:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3868 (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
3869 (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
3870 ;;;_ > 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
3871 (defun allout-rebullet-current-heading (arg)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3872 "Solicit new bullet for current visible heading."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3873 (interactive "p")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3874 (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
3875 (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
3876 from to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3877 (backwards (if (< arg 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3878 (setq arg (* arg -1)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3879 (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
3880 (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
3881 (allout-end-of-prefix)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3882 (setq from allout-recent-prefix-beginning
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3883 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
3884 (allout-rebullet-heading t ;;; solicit
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3885 nil ;;; depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3886 nil ;;; number-control
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3887 nil ;;; index
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3888 t) ;;; do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3889 (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
3890 from to t))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3891 (setq arg (1- arg))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3892 (if (<= arg 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3893 nil
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3894 (setq initial-col nil) ; Override positioning back to init col
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3895 (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
3896 (allout-next-visible-heading 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3897 (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
3898 (allout-next-visible-heading -1))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3899 (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
3900 (cond (on-bullet (goto-char (allout-current-bullet-pos)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3901 (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
3902 ;;;_ > 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
3903 (defun allout-rebullet-heading (&optional solicit
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3904 new-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3905 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3906 index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3907 do-successors)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3908
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3909 "Adjust bullet of current topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3910
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3911 All args are optional.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3912
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3913 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
3914 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
3915 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
3916 distinction or depth) is offered. If non-nil, then the
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3917 context-specific bullet is just used.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3918
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3919 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
3920 of the topic's current depth.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3921
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3922 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
3923 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
3924 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
3925 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
3926 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
3927
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3928 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
3929 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
3930 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
3931 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
3932 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
3933 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
3934 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
3935
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3936 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
3937 siblings.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3938
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3939 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
3940 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
3941 this function."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3942
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3943 (let* ((current-depth (allout-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3944 (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
3945 (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
3946 (me allout-recent-prefix-end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3947 (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
3948 (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
3949 (new-prefix (allout-make-topic-prefix current-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3950 nil
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3951 new-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3952 solicit
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3953 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3954 index)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3955
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3956 ;; Is new one is identical to old?
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3957 (if (and (= current-depth new-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3958 (string= current-bullet
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3959 (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
3960 ;; Nothing to do:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3961 t
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3962
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3963 ;; New prefix probably different from old:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3964 ; 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
3965 (allout-unprotected (delete-region mb me))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3966 (goto-char mb)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3967 ; Dispense with number if
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3968 ; 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
3969 (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
3970 (string= allout-numbered-bullet current-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3971 (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
3972 (allout-unprotected
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3973 (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
3974
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3975 ;; 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
3976 (if has-annotation
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3977 (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
3978 new-prefix))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3979
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3980 ; 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
3981 (allout-unprotected (insert new-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3982
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3983 ;; 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
3984 (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
3985 (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
3986 (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
3987 (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
3988
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3989 ;; 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
3990 ;; caller elected for it:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3991 (if do-successors
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3992 (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
3993 (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
3994 (setq index
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3995 (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
3996 ((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
3997 (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
3998 (allout-rebullet-heading nil ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3999 new-depth ;;; new-depth
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4000 number-control;;; number-control
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4001 index ;;; index
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4002 nil))))) ;;;(dont!)do-successors
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4003 ) ; (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
4004 ) ; let* ((current-depth (allout-depth))...)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4005 ) ; 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
4006 ;;;_ > allout-rebullet-topic (arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4007 (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
4008 "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
4009
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4010 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
4011
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4012 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
4013 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
4014 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
4015 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
4016 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
4017
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4018 With repeat count, shift topic depth by that amount."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4019 (interactive "P")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4020 (let ((start-col (current-column)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4021 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4022 ;; Normalize arg:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4023 (cond ((null arg) (setq arg 0))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4024 ((listp arg) (setq arg (car arg))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4025 ;; 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
4026 (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
4027 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4028 (if (<= (+ allout-recent-depth arg) 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4029 (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
4030 (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
4031 (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
4032 (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
4033 ;;;_ > 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
4034 (defun allout-rebullet-topic-grunt (&optional relative-depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4035 starting-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4036 starting-point
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4037 index
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4038 do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4039 sans-offspring)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4040 "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
4041 \(visible or not).
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4042
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4043 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
4044
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4045 All arguments are optional.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4046
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4047 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
4048 topic that amount.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4049
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4050 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
4051 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
4052
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4053 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
4054 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
4055 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
4056 \"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
4057 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
4058
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4059 ;; 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
4060 ;; need simplification with refactoring.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4061
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4062 (if (and sans-offspring
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4063 relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4064 (< relative-depth 0))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4065 (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
4066 " would cause containment discontinuity.")))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4067
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4068 (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
4069 (new-depth (allout-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4070 (starting-depth (or starting-depth new-depth))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4071 (on-starting-call (null starting-point))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4072 (index (or index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4073 ;; Leave index null on starting call, so rebullet-heading
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4074 ;; calculates it at what might be new depth:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4075 (and (or (zerop relative-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4076 (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
4077 (allout-sibling-index))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4078 (starting-index index)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4079 (moving-outwards (< 0 relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4080 (starting-point (or starting-point (point)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4081 (local-point (point)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4082
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4083 ;; Sanity check for excessive promotion done only on starting call:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4084 (and on-starting-call
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4085 moving-outwards
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4086 (> 0 (+ starting-depth relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4087 (error "Attempt to shift topic out beyond level 1"))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4088
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4089 (cond ((= starting-depth new-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4090 ;; 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
4091
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4092 ;; 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
4093 ;; 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
4094 ;; 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
4095 (if (>= relative-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4096 (allout-rebullet-heading nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4097 (+ starting-depth relative-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4098 nil ;;; number
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4099 index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4100 nil)) ;;; do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4101 (when (not sans-offspring)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4102 ;; ... 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
4103 (setq index 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4104 (allout-next-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4105 (while (and (not (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4106 (< starting-depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4107 (setq index (1+ index))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4108 (allout-rebullet-topic-grunt relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4109 (1+ starting-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4110 starting-point
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4111 index)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4112 (when (< relative-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4113 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4114 (goto-char local-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4115 (allout-rebullet-heading nil ;;; solicit
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4116 (+ starting-depth relative-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4117 nil ;;; number
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4118 starting-index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4119 nil)))) ;;; do-successors
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4120
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4121 ((< starting-depth new-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4122 ;; Rare case - subtopic more than one level deeper than parent.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4123 ;; 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
4124 (allout-rebullet-topic-grunt relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4125 new-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4126 starting-point
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4127 index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4128 sans-offspring)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4129
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4130 (if on-starting-call
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4131 (progn
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4132 ;; Rectify numbering of former siblings of the adjusted topic,
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4133 ;; if topic has changed depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4134 (if (or do-successors
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4135 (and (not (zerop relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4136 (or (= allout-recent-depth starting-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4137 (= allout-recent-depth (+ starting-depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4138 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
4139 (allout-rebullet-heading nil nil nil nil t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4140 ;; Now rectify numbering of new siblings of the adjusted topic,
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4141 ;; if depth has been changed:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4142 (progn (goto-char starting-point)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4143 (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
4144 (allout-rebullet-heading nil nil nil nil t)))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4145 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4146 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4147 ;;;_ > 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
4148 (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
4149 "Renumber siblings at current depth.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4150
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4151 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
4152
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4153 Returns final depth."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4154
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4155 ;; 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
4156 ;; 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
4157
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4158 (let ((ascender (allout-depth))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4159 was-eobp)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4160 (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
4161 (allout-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4162 (>= allout-recent-depth depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4163 (>= ascender depth))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4164 ; Skip over all topics at
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4165 ; lesser depths, which can not
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4166 ; have been disturbed:
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4167 (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
4168 (> 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
4169 (allout-next-heading))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4170 ; Prime ascender for ascension:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4171 (setq ascender (1- allout-recent-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4172 (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
4173 (allout-rebullet-heading nil ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4174 nil ;;; depth
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4175 nil ;;; number-control
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4176 nil ;;; index
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4177 t)) ;;; do-successors
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4178 (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
4179 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
4180 ;;;_ > 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
4181 (defun allout-number-siblings (&optional denumber)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4182 "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
4183
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4184 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
4185 topic and its siblings.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4186
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4187 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
4188 rebulleting each topic at this level."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4189
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4190 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4191
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4192 (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
4193 (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
4194 (allout-beginning-of-level)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4195 (let ((depth allout-recent-depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4196 (index (if (not denumber) 1))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4197 (use-bullet (equal '(16) denumber))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4198 (more t))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4199 (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
4200 (allout-rebullet-heading use-bullet ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4201 depth ;;; depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4202 t ;;; number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4203 index ;;; index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4204 nil) ;;; do-successors
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4205 (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
4206 (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
4207 ;;;_ > 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
4208 (defun allout-shift-in (arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4209 "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
4210
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4211 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
4212 `allout-shift-out', instead.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4213
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4214 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
4215 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
4216 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
4217
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4218 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
4219 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
4220 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
4221 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
4222 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
4223
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4224 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4225 (if (< arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4226 (allout-shift-out (* arg -1))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4227 ;; refuse to create a containment discontinuity:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4228 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4229 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4230 (if (not (bobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4231 (let* ((current-depth allout-recent-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4232 (start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4233 (predecessor-depth (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4234 (forward-char -1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4235 (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4236 (if (< (point) start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4237 allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4238 0))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4239 (if (and (> predecessor-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4240 (> (1+ current-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4241 (1+ predecessor-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4242 (error (concat "Disallowed shift deeper than"
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4243 " containing topic's children."))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4244 (allout-back-to-current-heading)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4245 (if (< allout-recent-depth (1+ current-depth))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4246 (allout-show-children))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4247 (let ((where (point)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4248 (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
4249 (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
4250 ;;;_ > 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
4251 (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
4252 "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
4253 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
4254
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4255 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
4256 `allout-shift-in', instead.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4257
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4258 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
4259 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
4260 the item.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4261
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4262 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
4263 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
4264 subtopics into siblings of the item."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4265 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4266 (if (< arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4267 (allout-shift-in (* arg -1))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4268 ;; Get proper exposure in this area:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4269 (save-excursion (if (allout-ascend)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4270 (allout-show-children)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4271 ;; 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
4272 ;; their sibling:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4273 (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
4274 (save-excursion (allout-next-sibling)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4275 (allout-show-children))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4276 (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
4277 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4278 (if (> arg 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4279 ;; 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
4280 (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
4281 (if (listp (car children-chart))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4282 ;; whoops:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4283 (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
4284 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4285 (dolist (child-point children-chart)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4286 (goto-char child-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4287 (allout-shift-out 1))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4288 (allout-rebullet-topic (* arg -1))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4289 (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
4290 ;;;_ : 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
4291 ;;;_ > 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
4292 (defun allout-kill-line (&optional arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4293 "Kill line, adjusting subsequent lines suitably for outline mode."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4294
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4295 (interactive "*P")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4296
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4297 (if (or (not (allout-mode-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4298 (not (bolp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4299 (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
4300 ;; Just do a regular kill:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4301 (kill-line arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4302 ;; Ah, have to watch out for adjustments:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4303 (let* ((beg (point))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4304 end
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4305 (beg-hidden (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4306 (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
4307 (setq end (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4308 (allout-hidden-p)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4309 (depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4310
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4311 (allout-annotate-hidden beg end)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4312 (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
4313 (allout-unprotected (kill-line arg))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4314 (kill-line arg))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4315 (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
4316
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4317 (if allout-numbered-bullet
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4318 (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
4319 (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
4320 (allout-next-heading))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4321 (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
4322 (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
4323 ;;;_ > 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
4324 (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
4325 "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
4326 (interactive)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4327 (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
4328 (condition-case nil
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4329 (allout-kill-line)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4330 (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
4331 ;;;_ > 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
4332 (defun allout-kill-topic ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4333 "Kill topic together with subtopics.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4334
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4335 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
4336
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4337 - 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
4338 - 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
4339 - 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
4340 previous one.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4341
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4342 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
4343 allout-yank-processing for exposure recovery."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4344
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4345 (interactive)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4346 (let* ((inhibit-field-text-motion t)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4347 (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
4348 end
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4349 (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
4350 (allout-end-of-current-subtree)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4351 (if (and (/= (current-column) 0) (not (eobp)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4352 (forward-char 1))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4353 (if (not (eobp))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4354 (if (and (looking-at "\n")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4355 (or (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4356 (or (not (allout-next-heading))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4357 (= depth allout-recent-depth)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4358 (and (> (- beg (point-min)) 3)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4359 (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
4360 (forward-char 1)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4361
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4362 (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
4363 (unwind-protect
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4364 (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
4365 (if buffer-read-only
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4366 ;; 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
4367 (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
4368
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4369 (save-excursion
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4370 (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
4371 (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
4372 ;;;_ > 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
4373 (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
4374 "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
4375 (interactive)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4376 (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
4377 (condition-case nil
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4378 (allout-kill-topic)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4379 (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
4380 ;;;_ > allout-annotate-hidden (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4381 (defun allout-annotate-hidden (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4382 "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
4383
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4384 (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
4385 (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
4386 (allout-deannotate-hidden begin end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4387 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4388 (goto-char begin)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4389 (let (done next prev overlay)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4390 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4391 ;; 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
4392 (if (not (allout-hidden-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4393 (setq next
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4394 (max (1+ (point))
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4395 (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
4396 'invisible
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4397 nil end))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4398 (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
4399 ;; 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
4400 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4401 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4402 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4403 (if (not (allout-hidden-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4404 ;; 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
4405 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4406 (setq overlay (allout-get-invisibility-overlay))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4407 (setq next (overlay-end overlay)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4408 prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4409 ;; 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
4410 (when next
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4411 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4412 (allout-unprotected
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4413 (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
4414 (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
4415 'allout-was-hidden t)))))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4416 (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
4417 ;;;_ > 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
4418 (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
4419 "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
4420
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4421 (allout-unprotected
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4422 (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
4423 (buffer-undo-list t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4424 ;(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
4425 )))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4426 ;;;_ > allout-hide-by-annotation (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4427 (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
4428 "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
4429 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4430 (goto-char begin)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4431 (let ((was-modified (buffer-modified-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4432 done next prev)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4433 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4434 ;; 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
4435 (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
4436 (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
4437 'allout-was-hidden
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4438 nil end)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4439 (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
4440 ;; 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
4441 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4442 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4443 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4444 (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
4445 ;; still not at start of annotation.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4446 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4447 ;; 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
4448 (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
4449 'allout-was-hidden
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4450 nil end))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4451 (overlay-put (make-overlay prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4452 '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
4453 (allout-deannotate-hidden prev next)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4454 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4455 (if next (goto-char next)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4456 (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
4457 ;;;_ > 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
4458 (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
4459
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4460 "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
4461
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4462 Does depth adjustment of yanked topics, when:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4463
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4464 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
4465 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
4466 topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4467
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4468 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
4469
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4470 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
4471 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
4472 header into which it's being yanked.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4473
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4474 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
4475 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
4476 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
4477
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4478 (interactive "*P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4479 ; Get to beginning, leaving
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4480 ; region around subject:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4481 (if (< (allout-mark-marker t) (point))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4482 (exchange-point-and-mark))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4483 (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
4484 (into-bol (bolp))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4485 (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
4486 ;; '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
4487 (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
4488 (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
4489 (looking-at allout-regexp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4490 (allout-prefix-data)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4491 ;; `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
4492 ;; 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
4493 (rectify-numbering (or resituate
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4494 (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
4495 (if resituate
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4496 ;; 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
4497 (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
4498 (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
4499 1
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4500 (- (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
4501 (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
4502 (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
4503 (adjust-to-depth
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4504 ;; 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
4505 ;; adjustment should be made:
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4506 (save-excursion
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4507 (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
4508 (eolp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4509 (goto-char subj-beg)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4510 (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
4511 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4512 (beginning-of-line)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4513 (not (= (point) subj-beg)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4514 (looking-at allout-regexp)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4515 (allout-prefix-data))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4516 allout-recent-depth)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4517 (more t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4518 (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
4519 (if adjust-to-depth
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4520 ; Do the adjustment:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4521 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4522 (save-restriction
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4523 (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
4524 ; Trim off excessive blank
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4525 ; 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
4526 (goto-char (point-max))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4527 (if (looking-at "^$")
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4528 (allout-unprotected (delete-char -1)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4529 ; Work backwards, with each
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4530 ; shallowest level,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4531 ; successively excluding the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4532 ; last processed topic from
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4533 ; the narrow region:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4534 (while more
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4535 (allout-back-to-current-heading)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4536 ; 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
4537 (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
4538 (save-excursion
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4539 (allout-unprotected
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4540 (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
4541 subj-depth)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4542 (allout-depth))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4543 (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
4544 (progn (widen)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4545 (forward-char -1)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4546 (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
4547 ;; 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
4548 ;; use old one:
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4549 (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
4550 allout-distinctive-bullets-string)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4551 ; Delete from bullet of old to
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4552 ; 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
4553 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4554 (beginning-of-line)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4555 (allout-unprotected
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4556 (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
4557 (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
4558 (goto-char subj-beg)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4559 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4560 ; Delete base subj prefix,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4561 ; leaving old one:
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4562 (allout-unprotected
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4563 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4564 (delete-region (point) (+ (point)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4565 prefix-len
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4566 (- adjust-to-depth
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4567 subj-depth)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4568 ; and delete residual subj
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4569 ; 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
4570 (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
4571 (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
4572 (exchange-point-and-mark))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4573 (if rectify-numbering
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4574 (progn
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4575 (save-excursion
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4576 ; 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
4577 (message "... reconciling numbers")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4578 ; ... 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
4579 (goto-char subj-beg)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4580 (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
4581 (allout-unprotected
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4582 (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
4583 (allout-depth) ;;; depth
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4584 nil ;;; number-control
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4585 nil ;;; index
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4586 t)))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4587 (message ""))))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4588 (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
4589 (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
4590 (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
4591 (if (not resituate)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4592 (exchange-point-and-mark))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4593 (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
4594 ;;;_ > 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
4595 (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
4596 "`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
4597
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4598 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
4599
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4600 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
4601 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
4602
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4603 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
4604 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
4605 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
4606 topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4607
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4608 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
4609 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
4610 header into which it's being yanked.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4611
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4612 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
4613 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
4614 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
4615 exactly like normal yanks.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4616
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4617 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
4618 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
4619
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
4620 `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
4621 works with normal `yank' in non-outline buffers."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4622
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4623 (interactive "*P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4624 (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
4625 (allout-unprotected
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4626 (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
4627 (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
4628 (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
4629 ;;;_ > 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
4630 (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
4631 "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
4632
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4633 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
4634
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4635 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
4636 by pops to non-distinctive yanks. Bug..."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4637
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4638 (interactive "*p")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4639 (setq this-command 'yank)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4640 (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
4641 (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
4642 (allout-yank-processing)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4643
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4644 ;;;_ - Specialty bullet functions
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4645 ;;;_ : 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
4646 ;;;_ > 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
4647 (defun allout-resolve-xref ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4648 "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
4649
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4650 \(Works according to setting of `allout-file-xref-bullet')."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4651 (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
4652 (if (not allout-file-xref-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4653 (error
64428
e55dd693f95b (allout-resolve-xref): Fix typos in error strings.
Juanma Barranquero <lekktu@gmail.com>
parents: 64400
diff changeset
4654 "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
4655 (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
4656 (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
4657 allout-file-xref-bullet)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4658 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4659 file-name)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4660 (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
4661 (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
4662 (heading-end (progn (end-of-line) (point))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4663 (goto-char text-start)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4664 (setq file-name
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4665 (if (re-search-forward "\\s-\\(\\S-*\\)" heading-end t)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4666 (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
4667 (setq file-name (expand-file-name file-name))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4668 (if (or (file-exists-p file-name)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4669 (if (file-writable-p file-name)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4670 (y-or-n-p (format "%s not there, create one? "
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4671 file-name))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4672 (error "%s not found and can't be created" file-name)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4673 (condition-case failure
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4674 (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
4675 (error failure))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4676 (error "%s not found" file-name))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4677 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4678 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4679 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4680 )
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4681
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4682 ;;;_ #6 Exposure Control
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4683
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4684 ;;;_ - Fundamental
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4685 ;;;_ > 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
4686 (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
4687 "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
4688
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4689 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
4690 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
4691 `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
4692 invoked.)"
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4693
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4694 ;; 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
4695 (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
4696 (when flag
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4697 (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
4698 (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
4699 (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
4700 (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
4701 (while props
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4702 (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
4703 (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
4704 (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
4705 ;;;_ > 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
4706 (defun allout-flag-current-subtree (flag)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4707 "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
4708
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4709 (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
4710 (allout-back-to-current-heading)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4711 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4712 (end-of-line))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4713 (allout-flag-region (point)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4714 ;; Exposing must not leave trailing blanks hidden,
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4715 ;; 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
4716 ;; can use flag's inverse as the
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4717 ;; include-trailing-blank cue:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4718 (allout-end-of-current-subtree (not flag))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4719 flag)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4720
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4721 ;;;_ - Topic-specific
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4722 ;;;_ > allout-show-entry ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4723 (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
4724 "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
4725
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4726 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
4727 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
4728 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
4729 the exposure."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4730
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4731 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4732 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4733 (let (beg end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4734 (allout-goto-prefix-doublechecked)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4735 (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
4736 (setq end (allout-pre-next-prefix))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4737 (allout-flag-region beg end nil)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4738 (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
4739 ;;;_ > 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
4740 (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
4741
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4742 "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
4743
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4744 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
4745
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4746 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
4747 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
4748
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4749 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
4750 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
4751 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
4752 it.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4753
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4754 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
4755 point of non-opened subtree?)"
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4756
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4757 (interactive "p")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4758 (let ((start-point (point)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4759 (if (and (not strict)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4760 (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4761
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4762 (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
4763 ; expose it.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4764 ;; 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
4765 ;; infinite regress:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4766 (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
4767
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4768 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4769 (allout-beginning-of-current-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4770 (save-restriction
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4771 (let* (depth
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4772 ;; 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
4773 ;; 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
4774 (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
4775 ((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
4776 (t level)))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4777 (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
4778 (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
4779 ;; interactive, show discontinuous children:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4780 (and chart
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4781 (interactive-p)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4782 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4783 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4784 (setq depth (allout-current-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4785 (and (allout-next-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4786 (> allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4787 (1+ depth))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4788 (message
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4789 "Discontinuous offspring; use `%s %s'%s."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4790 (substitute-command-keys
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4791 "\\[universal-argument]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4792 (substitute-command-keys
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4793 "\\[allout-shift-out]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4794 " to elevate them.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4795 (allout-chart-to-reveal
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4796 chart (- allout-recent-depth depth))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4797 (goto-char start-point)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4798 (when (and strict (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4799 ;; 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
4800 ;; unless strict was set.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4801 (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
4802 (when allout-show-bodies
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4803 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4804 (allout-show-current-entry)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4805 (while to-reveal
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4806 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4807 (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
4808 (progn (search-forward "\n" nil t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4809 (1- (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4810 nil)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4811 (when allout-show-bodies
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4812 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4813 (allout-show-current-entry))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4814 (setq to-reveal (cdr to-reveal)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4815 ;; 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
4816 ;; within invisible text:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4817 (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
4818 ;;;_ > 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
4819 (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
4820 "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
4821
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4822 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
4823 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4824 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4825 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4826 (orig-pt (point))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4827 (orig-pref (allout-goto-prefix-doublechecked))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4828 (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
4829 (bag-it 0))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4830 (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
4831 (while (allout-hidden-p)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4832 (move-beginning-of-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4833 (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
4834 (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
4835 ;; 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
4836 ;; 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
4837 (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
4838 (allout-show-current-subtree)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4839 (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
4840 (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
4841 (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
4842 (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
4843 "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
4844 (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
4845 (allout-show-children)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4846 (goto-char orig-pref)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4847 (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
4848 (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
4849 (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
4850 ;;;_ > 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
4851 (defun allout-hide-current-entry ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4852 "Hide the body directly following this heading."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4853 (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
4854 (allout-back-to-current-heading)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4855 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4856 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4857 (end-of-line))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4858 (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
4859 (progn (allout-end-of-entry) (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4860 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
4861 ;;;_ > 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
4862 (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
4863 "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
4864
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4865 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4866 (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
4867 (allout-hide-current-entry)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4868 (save-excursion (allout-show-to-offshoot))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4869 (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
4870 (allout-flag-region (point)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4871 (progn (allout-end-of-entry t) (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4872 nil)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4873 )))
48856
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-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
4875 (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
4876 "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
4877 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
4878 (interactive "P")
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4879 (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
4880 (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
4881 ;; 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
4882 (if (not (allout-next-heading))
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
4883 (error "No topics")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4884 ;; 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
4885 (message "Above outermost topic - exposing all.")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4886 (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
4887 (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
4888 (if (not arg)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4889 (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
4890 (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
4891 (allout-expose-topic '(* :))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4892 ;;;_ > 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
4893 (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
4894 "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
4895
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4896 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
4897 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
4898 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
4899 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
4900 (save-excursion
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4901 (and
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4902 ;; 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
4903 (>= (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
4904 (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
4905 (point))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4906 (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
4907
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4908 (or include-single-liners
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4909 (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
4910 ;;;_ > 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
4911 (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
4912 "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
4913
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4914 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
4915 and its siblings.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4916
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4917 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
4918 siblings, even if the target topic is already closed."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4919
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4920 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4921 (let* ((from (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4922 (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
4923 (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
4924 (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
4925 (just-close nil)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4926 ((allout-ascend) (allout-hide-current-subtree))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4927 (t (goto-char 0)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4928 (message sibs-msg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4929 (allout-goto-prefix-doublechecked)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4930 (allout-expose-topic '(0 :))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4931 (message (concat sibs-msg " Done."))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4932 (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
4933 ;;;_ > 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
4934 (defun allout-show-current-branches ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4935 "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
4936 (interactive)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4937 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4938 (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
4939 (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
4940 ;;;_ > 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
4941 (defun allout-hide-current-leaves ()
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4942 "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
4943 (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
4944 (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
4945 (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
4946 (point))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4947
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4948 ;;;_ - 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
4949 ;;;_ > 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
4950 (defun allout-show-all ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4951 "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
4952 (interactive)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4953 (message "Exposing entire buffer...")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4954 (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
4955 (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
4956 ;;;_ > 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
4957 (defun allout-hide-bodies ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4958 "Hide all of buffer except headings."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4959 (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
4960 (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
4961 ;;;_ > 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
4962 (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
4963 "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
4964 (save-excursion
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4965 (save-restriction
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4966 (narrow-to-region start end)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4967 (goto-char (point-min))
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4968 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4969 (while (not (eobp))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4970 (end-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4971 (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
4972 (if (not (eobp))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4973 (forward-char
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4974 (if (looking-at "\n\n")
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4975 2 1))))))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4976
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4977 ;;;_ > 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
4978 (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
4979 "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
4980
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4981 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
4982 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
4983 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
4984 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
4985
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4986 Cursor is left at start position.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4987
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4988 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
4989
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4990 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
4991
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
4992 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
4993 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
4994
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4995 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
4996 subtopics of the current topic.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4997
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4998 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
4999 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
5000 explicit specs following the `:'.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5001
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5002 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
5003
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5004 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
5005 - 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
5006 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
5007 that level.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5008 - 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
5009 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
5010 - 0 means to close topic - hide all offspring.
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5011 : - `repeat'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5012 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
5013 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
5014 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
5015 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
5016 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
5017 * - 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
5018 + - 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
5019 - - 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
5020
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5021 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
5022 \(allout-expose-topic '(-1 : 0))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5023 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
5024 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
5025 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
5026 \(allout-expose-topic '(-1 () : 1 0))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5027 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
5028 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
5029 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
5030 \(allout-expose-topic '(-2 : -1 *))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5031 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
5032 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
5033 last and completely open the last one."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5034
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5035 (interactive "xExposure spec: ")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5036 (if (not (listp spec))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5037 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
5038 (let ((depth (allout-depth))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5039 (max-pos 0)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5040 prev-elem curr-elem
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5041 stay)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5042 (while spec
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5043 (setq prev-elem curr-elem
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5044 curr-elem (car spec)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5045 spec (cdr spec))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5046 (cond ; Do current element:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5047 ((null curr-elem) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5048 ((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
5049 (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
5050 (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
5051 (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
5052 ((eq curr-elem '+)
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
5053 (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
5054 (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
5055 (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
5056 (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
5057 (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
5058 ((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
5059 ((eq curr-elem ':)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5060 (setq stay t)
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5061 ;; 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
5062 ;; w.r.t. remaining siblings:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5063 (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
5064 ;; 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
5065 (- (length (allout-chart-siblings))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5066 (length spec))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5067 (if (< 0 residue)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5068 ;; 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
5069 (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
5070 spec)))))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5071 ((numberp curr-elem)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5072 (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
5073 (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
5074 (if (> 0 curr-elem)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5075 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
5076 (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
5077 (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
5078 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
5079 (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
5080 (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
5081 (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
5082 (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
5083 ((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
5084 (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
5085 (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
5086 (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
5087 (cond (stay (setq stay nil))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5088 ((listp (car spec)) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5089 ((> max-pos (point))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5090 ;; 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
5091 (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
5092 (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
5093 ((allout-next-sibling depth))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5094 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
5095 ;;;_ > 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
5096 (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
5097
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5098 "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
5099 format) instead.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5100
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5101 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
5102
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5103 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
5104 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
5105
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5106 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
5107 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
5108 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
5109 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
5110 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
5111
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5112 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
5113
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5114 - 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
5115 - 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
5116 absolute value of the number.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5117 - 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
5118 - 0 just closes
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5119 - `*' completely opens the topic, including bodies.
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5120 - `+' shows all the sub headers, but not the bodies
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5121 - `-' 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
5122
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5123 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
5124 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
5125 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
5126 for the corresponding offspring of the topic.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5127
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5128 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
5129
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5130 (interactive "xExposure spec: ")
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5131 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5132 (depth (allout-current-depth))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5133 max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5134 (cond ((null spec) nil)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5135 ((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
5136 (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
5137 (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
5138 (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
5139 ((numberp spec)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5140 (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
5141 (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
5142 (end-of-line)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5143 (if (or (not max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5144 (> (point) max-pos))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5145 (setq max-pos (point)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5146 (if (> 0 spec)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5147 (setq spec (* -1 spec)))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5148 (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
5149 (allout-show-children spec)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5150 ((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
5151 ;(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
5152 ; (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
5153 ; (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
5154 (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
5155 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
5156 (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
5157 (setq spec (cdr spec))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5158 (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
5159 (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
5160 (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
5161 (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
5162 (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
5163 (setq max-pos got)))))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5164 (while (and followers
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5165 (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
5166 (progn (goto-char max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5167 (setq max-pos nil)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5168 (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
5169 (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
5170 (allout-old-expose-topic (car followers))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5171 (setq followers (cdr followers)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5172 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
5173 ;;;_ > 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
5174 (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
5175 "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
5176 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
5177 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
5178
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5179 Cursor is left at start position.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5180
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5181 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
5182
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5183 Examples:
61969
38ca28ee68d6 (allout-exposure): Remove macro and obsolete declaration.
Nick Roberts <nickrob@snap.net.nz>
parents: 59996
diff changeset
5184 \(allout-new-exposure (-1 () () () 1) 0)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5185 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
5186 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
5187 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
5188 \(allout-new-exposure : -1 0)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5189 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
5190 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
5191 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
5192 \(allout-new-exposure -2 : -1 *)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5193 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
5194 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
5195 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
5196 (list 'save-excursion
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5197 '(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
5198 (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
5199 (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
5200 (list 'allout-expose-topic (list 'quote spec))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5201
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5202 ;;;_ #7 Systematic outline presentation - copying, printing, flattening
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5203
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5204 ;;;_ - Mapping and processing of topics
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5205 ;;;_ ( 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
5206 ;;;_ > 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
5207 (defun allout-stringify-flat-index (flat-index &optional context)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5208 "Convert list representing section/subsection/... to document string.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5209
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5210 Optional arg CONTEXT indicates interior levels to include."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5211 (let ((delim ".")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5212 result
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5213 numstr
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5214 (context-depth (or (and context 2) 1)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5215 ;; Take care of the explicit context:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5216 (while (> context-depth 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5217 (setq numstr (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5218 flat-index (cdr flat-index)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5219 result (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5220 (cons delim (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5221 (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5222 context-depth (if flat-index (1- context-depth) 0)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5223 (setq delim " ")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5224 ;; Take care of the indentation:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5225 (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5226 (progn
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5227 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5228 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5229 (cons delim
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5230 (cons (make-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5231 (1+ (truncate (if (zerop (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5232 1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5233 (log10 (car flat-index)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5234 ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5235 result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5236 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5237 ;; Dispose of single extra delim:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5238 (setq result (cdr result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5239 (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
5240 ;;;_ > 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
5241 (defun allout-stringify-flat-index-plain (flat-index)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5242 "Convert list representing section/subsection/... to document string."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5243 (let ((delim ".")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5244 result)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5245 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5246 (setq result (cons (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5247 (if result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5248 (cons delim result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5249 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5250 (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
5251 ;;;_ > 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
5252 (defun allout-stringify-flat-index-indented (flat-index)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5253 "Convert list representing section/subsection/... to document string."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5254 (let ((delim ".")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5255 result
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5256 numstr)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5257 ;; Take care of the explicit context:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5258 (setq numstr (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5259 flat-index (cdr flat-index)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5260 result (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5261 (cons delim (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5262 (cons numstr result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5263 (setq delim " ")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5264 ;; Take care of the indentation:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5265 (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5266 (progn
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5267 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5268 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5269 (cons delim
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5270 (cons (make-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5271 (1+ (truncate (if (zerop (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5272 1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5273 (log10 (car flat-index)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5274 ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5275 result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5276 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5277 ;; Dispose of single extra delim:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5278 (setq result (cdr result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5279 (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
5280 ;;;_ > 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
5281 (defun allout-listify-exposed (&optional start end format)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5282
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5283 "Produce a list representing exposed topics in current region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5284
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5285 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
5286 the subject region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5287
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5288 Optional START and END indicate bounds of region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5289
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5290 optional arg, FORMAT, designates an alternate presentation form for
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5291 the prefix:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5292
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5293 list - Present prefix as numeric section.subsection..., starting with
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5294 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
5295 `indent' (symbol) - Convert header prefixes to all white space,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5296 except for distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5297
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5298 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
5299 header and body. The elements of that list are:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5300
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5301 - a number representing the depth of the topic,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5302 - a string representing the header-prefix, including trailing whitespace and
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5303 bullet.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5304 - a string representing the bullet character,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5305 - 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
5306 portion of the topic entry."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5307
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5308 (interactive "r")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5309 (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5310 (let*
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5311 ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5312 ;; state vars:
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5313 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
5314 next done)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5315
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5316 (goto-char start)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5317 (beginning-of-line)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5318 ;; 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
5319 (if (> (allout-goto-prefix-doublechecked) start)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5320 ;; First topic follows beginning point - register preliminary stuff:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5321 (setq result (list (list 0 "" nil
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5322 (buffer-substring start (1- (point)))))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5323 (while (and (not done)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5324 (not (eobp)) ; Loop until we've covered the region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5325 (not (> (point) end)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5326 (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
5327 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
5328 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
5329 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
5330 (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
5331 (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
5332 (setq new-depth allout-recent-depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5333 (setq gone-out out
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5334 out (< new-depth depth))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5335 (beginning-of-line)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5336 (setq next (point))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5337 (goto-char beg)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5338 (setq strings nil)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5339 (while (> next (point)) ; Get all the exposed text in
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5340 (setq strings
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5341 (cons (buffer-substring
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5342 beg
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5343 ;To hidden text or end of line:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5344 (progn
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5345 (end-of-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5346 (allout-back-to-visible-text)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5347 strings))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5348 (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
5349 (line-move 1)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
5350 (beginning-of-line))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5351 (setq beg (point)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5352 ;; Accumulate list for this topic:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5353 (setq strings (nreverse strings))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5354 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5355 (cons
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5356 (if format
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5357 (let ((special (if (string-match
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5358 (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
5359 allout-distinctive-bullets-string)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5360 bullet)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5361 (cond ((listp format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5362 (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
5363 (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
5364 (allout-stringify-flat-index format
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5365 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
5366 (allout-stringify-flat-index-plain
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5367 format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5368 strings
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5369 special))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5370 ((eq format 'indent)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5371 (if special
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5372 (list depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5373 (concat (make-string (1+ depth) ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5374 (substring prefix -1))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5375 strings)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5376 (list depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5377 (make-string depth ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5378 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
5379 (t (error "allout-listify-exposed: %s %s"
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5380 "invalid format" format))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5381 (list depth prefix strings))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5382 result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5383 ;; Reasses format, if any:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5384 (if (and format (listp format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5385 (cond ((= new-depth depth)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5386 (setq format (cons (1+ (car format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5387 (cdr format))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5388 ((> new-depth depth) ; descending - assume by 1:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5389 (setq format (cons 1 format)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5390 (t
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5391 ; Pop the residue:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5392 (while (< new-depth depth)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5393 (setq format (cdr format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5394 (setq depth (1- depth)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5395 ; And increment the current one:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5396 (setq format
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5397 (cons (1+ (or (car format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5398 -1))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5399 (cdr format)))))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5400 ;; 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
5401 (nreverse result))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5402 ;;;_ > my-region-active-p ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5403 (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
5404 (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
5405 '(region-active-p)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5406 '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
5407 ;;;_ > allout-process-exposed (&optional func from to frombuf
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5408 ;;; 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
5409 (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
5410 format start-num)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5411 "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
5412
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5413 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
5414
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5415 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
5416 FROMBUF to buffer TOBUF. Sixth optional arg, FORMAT, designates an
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5417 alternate presentation form:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5418
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5419 `flat' - Present prefix as numeric section.subsection..., starting with
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5420 section indicated by the start-num, innermost nesting first.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5421 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
5422 X level, but subsequent topics have only leaf topic
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5423 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
5424 `indent' (symbol) - Convert header prefixes to all white space,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5425 except for distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5426
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5427 Defaults:
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5428 FUNCTION: `allout-insert-listified'
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5429 FROM: region start, if region active, else start of buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5430 TO: region end, if region active, else end of buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5431 FROMBUF: current buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5432 TOBUF: buffer name derived: \"*current-buffer-name exposed*\"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5433 FORMAT: nil"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5434
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5435 ; Resolve arguments,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5436 ; 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
5437 (if (not func) (setq func 'allout-insert-listified))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5438 (if (not (and from to))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5439 (if (my-region-active-p)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5440 (setq from (region-beginning) to (region-end))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5441 (setq from (point-min) to (point-max))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5442 (if frombuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5443 (if (not (bufferp frombuf))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5444 ;; Specified but not a buffer - get it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5445 (let ((got (get-buffer frombuf)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5446 (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
5447 (error (concat "allout-process-exposed: source buffer "
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5448 frombuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5449 " not found."))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5450 (setq frombuf got))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5451 ;; not specified - default it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5452 (setq frombuf (current-buffer)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5453 (if tobuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5454 (if (not (bufferp tobuf))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5455 (setq tobuf (get-buffer-create tobuf)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5456 ;; not specified - default it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5457 (setq tobuf (concat "*" (buffer-name frombuf) " exposed*")))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5458 (if (listp format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5459 (nreverse format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5460
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5461 (let* ((listified
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5462 (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
5463 (allout-listify-exposed from to format))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5464 (set-buffer tobuf)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5465 (mapcar func listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5466 (pop-to-buffer tobuf)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5467
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5468 ;;;_ - 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
5469 ;;;_ > 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
5470 (defun allout-insert-listified (listified)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5471 "Insert contents of listified outline portion in current buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5472
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5473 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
5474
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5475 \`(depth prefix text)'
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5476
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5477 or \`(depth prefix text bullet-plus)'
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5478
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5479 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
5480 (setq listified (cdr listified))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5481 (let ((prefix (prog1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5482 (car listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5483 (setq listified (cdr listified))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5484 (text (prog1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5485 (car listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5486 (setq listified (cdr listified))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5487 (bullet-plus (car listified)))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5488 (insert prefix)
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5489 (if bullet-plus (insert (concat " " bullet-plus)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5490 (while text
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5491 (insert (car text))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5492 (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
5493 (insert "\n")))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5494 (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
5495 ;;;_ > 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
5496 (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
5497 "Duplicate exposed portions of current outline to another buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5498
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5499 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
5500
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5501 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
5502
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5503 Optional second arg TOBUF is target buffer name.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5504
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5505 Optional third arg FORMAT, if non-nil, symbolically designates an
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5506 alternate presentation format for the outline:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5507
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5508 `flat' - Convert topic header prefixes to numeric
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5509 section.subsection... identifiers.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5510 `indent' - Convert header prefixes to all white space, except for
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5511 distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5512 `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
5513 the full path, the rest have only the section number
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5514 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
5515
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5516 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5517 (if (not tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5518 (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
5519 (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
5520 (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
5521 (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
5522 (buf (current-buffer))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5523 (start-list ()))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5524 (if (eq format 'flat)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5525 (setq format (if arg (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5526 (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
5527 (allout-topic-flat-index))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5528 '(1))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5529 (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
5530 (allout-process-exposed 'allout-insert-listified
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5531 beg
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5532 end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5533 (current-buffer)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5534 tobuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5535 format start-list)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5536 (goto-char (point-min))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5537 (pop-to-buffer buf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5538 (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
5539 ;;;_ > 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
5540 (defun allout-flatten-exposed-to-buffer (&optional arg tobuf)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5541 "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
5542
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5543 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
5544 `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
5545
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5546 Use `allout-indented-exposed-to-buffer' for indented presentation.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5547
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5548 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
5549
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5550 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
5551 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
5552 used verbatim."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5553 (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
5554 (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
5555 ;;;_ > 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
5556 (defun allout-indented-exposed-to-buffer (&optional arg tobuf)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5557 "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
5558
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5559 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
5560 `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
5561
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5562 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
5563
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5564 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
5565
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5566 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
5567 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
5568 used verbatim."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5569 (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
5570 (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
5571
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5572 ;;;_ - 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
5573 ;;;_ > 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
5574 (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
5575 "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
5576 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
5577 string across LaTeX processing."
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5578 (mapconcat (function
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5579 (lambda (char)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5580 (cond ((memq char '(?\\ ?$ ?% ?# ?& ?{ ?} ?_ ?^ ?- ?*))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5581 (concat "\\char" (number-to-string char) "{}"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5582 ((= char ?\n) "\\\\")
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5583 (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
5584 string
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5585 ""))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5586 ;;;_ > 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
5587 (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
5588 "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
5589
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5590 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
5591 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
5592 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
5593 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5594 (beginning-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5595 (let ((beg (point))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5596 (end (progn (end-of-line)(point))))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5597 (goto-char beg)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5598 (while (re-search-forward "\\\\"
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5599 ;;"\\\\\\|\\{\\|\\}\\|\\_\\|\\$\\|\\\"\\|\\&\\|\\^\\|\\-\\|\\*\\|#"
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5600 end ; bounded by end-of-line
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5601 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
5602 (goto-char (match-beginning 2))
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5603 (insert "\\")
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5604 (setq end (1+ end))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5605 (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
5606 ;;;_ > 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
5607 (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
5608 "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
5609 ;; 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
5610 ;; 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
5611 (set-buffer buffer)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5612 (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
5613 "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
5614 (page-numbering (if allout-number-pages
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5615 "\\pagestyle{empty}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5616 ""))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5617 (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
5618 allout-title-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5619 (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
5620 allout-label-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5621 (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
5622 allout-head-line-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5623 (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
5624 allout-body-line-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5625 (setlength (format "%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5626 "\\newlength{\\stepsize}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5627 "\\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
5628 allout-indent
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5629 "}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5630 (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
5631 "\\newcommand{\\OneHeadLine}[3]{%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5632 "\\noindent%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5633 "\\hspace*{#2\\stepsize}%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5634 "\\labelcmd{#1}\\hspace*{.2cm}"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5635 "\\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
5636 allout-line-skip
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5637 "]\n}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5638 (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
5639 "\\newcommand{\\OneBodyLine}[2]{%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5640 "\\noindent%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5641 "\\hspace*{#1\\stepsize}%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5642 "\\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
5643 allout-line-skip
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5644 "]\n}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5645 (begindoc "\\begin{document}\n\\begin{center}\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5646 (title (format "%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5647 "\\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
5648 (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
5649 (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
5650 (eval allout-title)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5651 (error "<unnamed buffer>"))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5652 "Unnamed Outline"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5653 "}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5654 "\\end{center}\n\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5655 (hsize "\\hsize = 7.5 true in\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5656 (hoffset "\\hoffset = -1.5 true in\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5657 (vspace "\\vspace{.1cm}\n\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5658 (insert (concat doc-style
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5659 page-numbering
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5660 titlecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5661 labelcmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5662 headlinecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5663 bodylinecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5664 setlength
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5665 oneheadline
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5666 onebodyline
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5667 begindoc
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5668 title
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5669 hsize
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5670 hoffset
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5671 vspace)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5672 )))
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5673 ;;;_ > 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
5674 (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
5675 "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
5676 (set-buffer buffer)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5677 (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
5678 ;;;_ > 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
5679 (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
5680 "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
5681
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5682 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
5683 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
5684 (let* ((head-line (if text (car text)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5685 (body-lines (cdr text))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5686 (curr-line)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5687 body-content bop)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5688 ; Do the head line:
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5689 (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
5690 (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
5691 "\1}{"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5692 depth
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5693 "}{\\verb\1 "
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5694 (if head-line
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5695 (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
5696 "")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5697 "\1}\n"))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5698 (if (not body-lines)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5699 nil
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5700 ;;(insert "\\beginlines\n")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5701 (insert "\\begin{verbatim}\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5702 (while body-lines
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5703 (setq curr-line (car body-lines))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5704 (if (and (not body-content)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5705 (not (string-match "^\\s-*$" curr-line)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5706 (setq body-content t))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5707 ; Mangle any occurrences of
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5708 ; "\end{verbatim}" in text,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5709 ; it's special:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5710 (if (and body-content
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5711 (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
5712 (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
5713 ">"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5714 (substring curr-line bop))))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5715 ;;(insert "|" (car body-lines) "|")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5716 (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
5717 (allout-latex-verbatim-quote-curr-line)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5718 (insert "\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5719 (setq body-lines (cdr body-lines)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5720 (if body-content
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5721 (setq body-content nil)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5722 (forward-char -1)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5723 (insert "\\ ")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5724 (forward-char 1))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5725 ;;(insert "\\endlines\n")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5726 (insert "\\end{verbatim}\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5727 )))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5728 ;;;_ > 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
5729 (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
5730 "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
5731 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
5732 with \"*\" prepended and \" latex-formed*\" appended.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5733
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5734 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
5735
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5736 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5737 (if (not tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5738 (setq tobuf
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5739 (get-buffer-create (concat "*" (buffer-name) " latexified*"))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5740 (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
5741 (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
5742 (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
5743 (buf (current-buffer)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5744 (set-buffer tobuf)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5745 (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
5746 (allout-insert-latex-header tobuf)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5747 (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
5748 (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
5749 beg
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5750 end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5751 buf
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5752 tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5753 (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
5754 (allout-insert-latex-trailer tobuf)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5755 (goto-char (point-min))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5756 (pop-to-buffer buf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5757 (goto-char start-pt)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5758
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5759 ;;;_ #8 Encryption
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5760 ;;;_ > 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
5761 (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
5762 "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
5763
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5764 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
5765 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
5766 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
5767 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
5768 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
5769
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5770 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
5771
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5772 \*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
5773 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
5774
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5775 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
5776 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
5777
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5778 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
5779 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
5780 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
5781 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
5782 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
5783 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
5784 auto-encryption specifics.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5785
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5786 \*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
5787 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
5788 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
5789
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5790 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
5791 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
5792 \\[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
5793
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5794 Passphrase Caching
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5795
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5796 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
5797 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
5798
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5799 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
5800 `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
5801
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5802 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
5803
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5804 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
5805 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
5806 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
5807 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
5808 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
5809 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
5810 keys.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5811
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5812 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
5813 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
5814 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
5815 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
5816 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
5817
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5818 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
5819 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
5820 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
5821 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
5822 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
5823 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
5824 (interactive "P")
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5825 (save-excursion
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5826 (allout-back-to-current-heading)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5827 (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
5828 )
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5829 )
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5830 ;;;_ > 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
5831 (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
5832 "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
5833
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5834 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
5835 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
5836 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
5837 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
5838 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
5839
74864
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
5840 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
5841 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
5842
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5843 \**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
5844 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
5845
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5846 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
5847
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5848 (interactive "P")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5849 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5850 (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
5851
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5852 (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
5853 (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
5854 " 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
5855
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5856 (let* ((allout-buffer (current-buffer))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5857 ;; Assess location:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5858 (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
5859 (after-bullet-pos (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5860 (was-encrypted
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5861 (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
5862 (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
5863 (allout-encrypted-topic-p)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5864 (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
5865 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5866 (backward-char 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5867 (allout-hidden-p)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5868 (subtree-beg (1+ (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5869 (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
5870 (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
5871 subtree-end))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5872 (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
5873 (subtree-trailing-char (char-after subtree-end))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5874 ;; 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
5875 ;; check for the error condition
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5876 (result-text (if (or (string= "" subject-text)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5877 (string= "\n" subject-text))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5878 (error "No topic contents to %scrypt"
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5879 (if was-encrypted "de" "en"))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5880 nil))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5881 ;; Assess key parameters:
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5882 (key-info (or
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5883 ;; 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
5884 (and was-encrypted
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5885 (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
5886 (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
5887 '(keypair nil))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5888 '(symmetric nil)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5889 (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
5890 (for-key-identity (cadr key-info))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5891 (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
5892 (was-coding-system buffer-file-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5893
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5894 (when (not was-encrypted)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5895 ;; 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
5896 ;; 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
5897 ;; them.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5898 (setq buffer-file-coding-system
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5899 (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
5900 ;; 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
5901 ;; 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
5902 ;; 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
5903 ;; 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
5904 ;; local variable.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5905 (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
5906 was-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5907 (yes-or-no-p
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5908 (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
5909 " var? Necessary when only encrypted text"
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5910 " is in that coding system. ")
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5911 buffer-file-coding-system)))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5912 (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
5913 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
5914
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5915 (setq result-text
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5916 (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
5917 (current-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5918 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
5919
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5920 ;; 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
5921 (allout-unprotected
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5922 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5923 (set-buffer allout-buffer)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5924 (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
5925 (insert result-text)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5926 (if was-collapsed
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5927 (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
5928 ;; 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
5929 (if (not was-encrypted)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5930 (if (and (= subtree-end-char ?\n)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5931 (= subtree-trailing-char ?\n))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5932 (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
5933 ;; 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
5934 (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
5935 (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
5936 allout-topic-encryption-bullet))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5937 (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
5938 (delete-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5939 (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
5940 (if was-encrypted
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5941 ;; 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
5942 (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
5943 (delete-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5944 ;; 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
5945 (goto-char after-bullet-pos)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5946 (insert "*"))))
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
5947 (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
5948 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
5949 ;;;_ > 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
5950 ;;; 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
5951 ;;; passphrase)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5952 (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
5953 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
5954 verifying passphrase)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5955 "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
5956
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5957 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
5958
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5959 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
5960
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5961 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
5962
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5963 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
5964 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
5965
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5966 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
5967 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
5968
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5969 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
5970 for verification purposes.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5971
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
5972 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
5973 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
5974 `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
5975 `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
5976
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5977 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
5978
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5979 (require 'pgg)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5980
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5981 (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
5982 (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
5983
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5984 (let* ((scheme (upcase
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5985 (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
5986 (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
5987 (or for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5988 (split-string (read-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5989 (format "%s message recipients: "
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5990 scheme))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5991 "[ \t,]+"))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5992 (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
5993 (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
5994 (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
5995 (buffer-name allout-buffer)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5996 (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
5997 key-type
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5998 (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
5999 target-prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6000 (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
6001 target-prompt-id))))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6002 (encoding (with-current-buffer allout-buffer
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6003 buffer-file-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6004 (multibyte (with-current-buffer allout-buffer
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6005 enable-multibyte-characters))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6006 (strip-plaintext-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6007 (if (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6008 (allout-get-configvar-values
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6009 '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
6010 (reject-ciphertext-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6011 (if (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6012 (allout-get-configvar-values
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6013 '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
6014 (rejected (or rejected 0))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6015 (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
6016 rejected))
74864
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
6017 result-text status
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
6018 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6019
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6020 (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
6021 ;; 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
6022 (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
6023
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6024 (catch 'encryption-failed
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6025
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6026 ;; 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
6027 (if (and (not passphrase)
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6028 (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
6029 (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
6030 target-cache-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6031 target-prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6032 key-type
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6033 allout-buffer
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6034 retried fetch-pass)))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6035
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6036 (with-temp-buffer
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6037
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6038 (insert text)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6039
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6040 ;; 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
6041 (set-buffer-multibyte multibyte)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6042 (when encoding
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6043 (set-buffer-file-coding-system encoding)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6044 (if (not decrypt)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6045 (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
6046
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6047 (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
6048 (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
6049 (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
6050 (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
6051 (goto-char (point-min))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6052 (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
6053 (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
6054
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6055 (cond
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6056
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6057 ;; symmetric:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6058 ((equal key-type 'symmetric)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6059 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6060 (if decrypt
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6061
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6062 (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
6063
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6064 (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
6065 passphrase)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6066
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6067 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6068 (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
6069 ;; failed - handle passphrase caching
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6070 (if verifying
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6071 (throw 'encryption-failed nil)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6072 (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
6073 (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
6074 (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
6075 "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
6076
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6077 ;; encrypt 'keypair:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6078 ((not decrypt)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6079
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6080 (setq status
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 (pgg-encrypt for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6083 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
6084
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6085 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6086 (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
6087 (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
6088 (error "encryption failed"))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6089
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6090 ;; decrypt 'keypair:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6091 (t
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6092
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6093 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6094 (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
6095
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6096 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6097 (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
6098 (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
6099 (error "decryption failed")))))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6100
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6101 (setq result-text
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6102 (buffer-substring-no-properties
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6103 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
6104 )
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6105
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6106 ;; validate result - non-empty
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6107 (cond ((not result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6108 (if verifying
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6109 nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6110 ;; 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
6111 (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
6112 (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
6113 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
6114 (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
6115 rejected verifying nil)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6116
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6117 ;; 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
6118 ((and (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6119 ;; 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
6120 (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
6121 reject-it)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6122 (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
6123 (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
6124 result-text))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6125 (pop regexps))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6126 reject-it))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6127 (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
6128 (if (<= rejections-left 0)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6129 (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
6130 " (%s), per `%s'")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6131 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
6132 '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
6133 (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
6134 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
6135 retried (1+ rejected)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6136 verifying passphrase)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6137 ;; 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
6138 ((and (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6139 (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
6140 result-text))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6141 (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
6142 "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
6143
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6144 ;; 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
6145 ((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
6146 (if (or verifying decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6147 (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
6148 passphrase t))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6149 result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6150
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6151 ;; 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
6152 ;; 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
6153 (t
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6154 (set-buffer allout-buffer)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6155 (if passphrase
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6156 (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
6157 passphrase t))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6158 (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
6159 allout-buffer)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6160 result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6161 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6162 )
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 )
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6165 ;;;_ > 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
6166 ;;; 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
6167 (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
6168 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
6169 "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
6170
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6171 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
6172 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
6173 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
6174 user for corroboration.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6175
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6176 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
6177
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6178 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
6179
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6180 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
6181
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6182 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
6183
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6184 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
6185
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6186 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
6187
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6188 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
6189 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
6190
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6191 (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
6192 ;; 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
6193 (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
6194 (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
6195 pgg-default-scheme
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6196 "GPG")))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6197 (if prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6198 (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
6199 ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6200 cache-id t)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6201
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6202 ;; Symmetric hereon:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6203
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6204 (save-excursion
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6205 (set-buffer allout-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6206 (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
6207 (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
6208 (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
6209 'needed)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6210 retried)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6211 (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
6212 ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6213 (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
6214 (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
6215 prompt-id retry-message))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6216 (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
6217 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
6218 (prompt full-prompt)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6219 (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
6220
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6221 (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
6222 (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
6223 (got-pass (or cached
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6224 (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
6225 confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6226
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6227 (if (not got-pass)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6228 nil
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6229
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6230 ;; 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
6231 ;; 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
6232 (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
6233
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6234 (cond (verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6235 (save-window-excursion
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6236 (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
6237 allout-buffer 'symmetric
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6238 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
6239 (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
6240 (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
6241
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6242 (if (and (not confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6243 (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
6244 (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
6245 " - use new one instead? "))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6246 ;; deactivate password for subsequent
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6247 ;; confirmation:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6248 (progn
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6249 (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
6250 (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
6251 nil)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6252 t))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6253 (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
6254 (error "Wrong passphrase."))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6255 ;; 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
6256 ;; (new) passphrase:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6257 ((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
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 ;; 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
6260 ;; 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
6261 (if (not confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6262 (setq confirmation
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6263 (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
6264 " ... confirm spelling: ")
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6265 cache-id t)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6266 (prog1
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6267 (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
6268 confirmation
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6269 (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
6270 " confirmation differ - retry? "))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6271 (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
6272 (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
6273 ;; recurse to this routine:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6274 (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
6275 (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
6276 (error "Confirmation failed."))))))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6277 ;;;_ > allout-encrypted-topic-p ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6278 (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
6279 "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
6280 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6281 (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
6282 (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
6283 allout-topic-encryption-bullet)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6284 (looking-at "\\*"))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6285 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6286 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6287 ;;;_ > 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
6288 ;; XXX gpg-specific, alas
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6289 (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
6290 "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
6291
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6292 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
6293
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6294 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
6295 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
6296 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
6297
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6298 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
6299 (require 'pgg-parse)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6300 (save-excursion
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6301 (with-temp-buffer
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6302 (insert text)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6303 (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
6304 (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
6305 'symmetric
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6306 'keypair))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6307 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
6308 (if (equal type 'keypair)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6309 (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
6310 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
6311 secret-keys)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6312 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
6313 (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
6314 first-secret-key))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6315 (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
6316 )
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6317 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6318 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6319 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6320 ;;;_ > 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
6321 (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
6322 "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
6323 ;; 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
6324 (random t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6325 (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
6326 (dotimes (i (length spew))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6327 (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
6328 (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
6329 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
6330 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6331 ;;;_ > 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
6332 ;;; outline-buffer)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6333 (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
6334 outline-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6335 "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
6336
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6337 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
6338 settings.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6339
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6340 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
6341
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6342 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
6343
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6344 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
6345 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
6346
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6347 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
6348 `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
6349 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
6350 `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
6351
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6352 ;; 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
6353 ;; - adjust the verifier
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6354 ;; - 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
6355 ;; - 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
6356
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6357 (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
6358 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
6359 (new-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6360 (if new-verifier-needed
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6361 ;; 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
6362 (subst-char-in-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6363 ?\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
6364 passphrase))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6365 new-hint)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6366 (when new-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6367 ;; 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
6368 (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
6369 (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
6370 (setq new-hint
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6371 (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
6372 allout-passphrase-hint-string))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6373 (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
6374 (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
6375 (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
6376 allout-passphrase-hint-string)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6377 (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
6378 (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
6379 (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
6380 allout-passphrase-verifier-string))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6381 )
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6382 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6383 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6384 ;;;_ > 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
6385 (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
6386 "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
6387
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6388 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
6389
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6390 (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
6391 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
6392 (if verifier-string
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6393 ;; Return it uncollapsed
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6394 (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
6395 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6396 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6397 ;;;_ > 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
6398 (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
6399 "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
6400
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6401 \"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
6402 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6403 (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
6404 (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
6405 allout-passphrase-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6406 (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
6407 '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
6408 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
6409 t)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6410 ;;;_ > 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
6411 (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
6412 "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
6413
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6414 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
6415 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
6416 `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
6417
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6418 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
6419 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
6420 must also have content."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6421 (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
6422 (while (not done)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6423
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6424 (if (not (re-search-forward
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6425 (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
6426 (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
6427 (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
6428 nil t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6429 (setq got nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6430 done t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6431 (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
6432 (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
6433 (forward-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6434 (setq got (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6435
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6436 (cond ((not got)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6437 (setq done t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6438
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6439 ((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
6440 (setq got nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6441 done t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6442
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6443 ((eobp)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6444 (setq got nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6445 done t))
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 (t
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6448 (setq content-beg (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6449 (backward-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6450 (allout-end-of-subtree)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6451 (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
6452 (and except-mark
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6453 (<= content-beg except-mark)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6454 (>= (point) except-mark)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6455 ;; Continue looking
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6456 (setq got nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6457 ;; Got it!
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6458 (setq done t)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6459 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6460 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6461 (if got
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6462 (goto-char got))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6463 )
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 ;;;_ > 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
6466 (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
6467 "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
6468
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6469 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
6470 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
6471 `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
6472
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6473 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
6474 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
6475 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
6476 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
6477 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
6478
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6479 (interactive "p")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6480 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6481 (let* ((current-mark (point-marker))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6482 (current-mark-position (marker-position current-mark))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6483 was-modified
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6484 bo-subtree
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6485 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
6486 (goto-char (point-min))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6487 (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
6488 (setq was-modified (buffer-modified-p))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6489 (when (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6490 (and (boundp 'allout-encrypt-unencrypted-on-saves)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6491 allout-encrypt-unencrypted-on-saves
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6492 (setq bo-subtree (re-search-forward "$"))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6493 (not (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6494 (>= current-mark (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6495 (allout-end-of-current-subtree)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6496 (<= current-mark (point))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6497 (setq editing-topic (point)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6498 ;; 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
6499 ;; 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
6500 editing-point (- current-mark-position
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6501 (count-trailing-whitespace-region
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6502 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
6503 (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
6504 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6505 (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
6506 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6507 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6508 (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
6509 (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
6510 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6511 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6512 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6513
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6514 ;;;_ #9 miscellaneous
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6515 ;;;_ : Mode:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6516 ;;;_ > outlineify-sticky ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6517 ;; 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
6518 ;;;###autoload
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6519 (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
6520 ;;;###autoload
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6521 (defun outlineify-sticky (&optional arg)
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
6522 "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
6523
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6524 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
6525 setup for auto-startup."
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6526
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6527 (interactive "P")
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6528
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6529 (allout-mode t)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6530
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6531 (save-excursion
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6532 (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
6533 (if (allout-goto-prefix)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6534 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
6535 (allout-open-topic 2)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
6536 (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
6537 "`allout-mode' docstring: `^Hm'."))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6538 (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
6539 "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
6540 ;;;_ > 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
6541 (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
6542 "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
6543
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6544 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
6545 ;; 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
6546 (let (beg prefix suffix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6547 (save-excursion
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6548 (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
6549 (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
6550 (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
6551 (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
6552 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6553 (setq beg (- (point) 16))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6554 (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
6555 (point)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6556 (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
6557 (forward-char -1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6558 (point))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6559 (setq prefix (buffer-substring-no-properties
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6560 (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
6561 (forward-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6562 (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6563 beg))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6564 (list beg prefix suffix))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6565 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6566 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6567 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6568 ;;;_ > 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
6569 (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
6570 "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
6571
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6572 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
6573 `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
6574
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6575 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
6576 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
6577 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
6578 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
6579 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
6580
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
6581 `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
6582 (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
6583 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
6584 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6585 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
6586 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
6587 (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
6588 beg prefix suffix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6589 (if section-data
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6590 (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
6591 prefix (cadr section-data)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6592 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
6593 ;; create the section
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6594 (goto-char (point-max))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6595 (open-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6596 (allout-open-topic 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6597 (end-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6598 (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
6599 (allout-open-topic 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6600 (setq beg (point)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6601 suffix ""
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6602 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
6603 (beginning-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6604 (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6605 beg))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6606 (goto-char beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6607 (insert "Local variables:\n")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6608 (allout-open-topic 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6609 (insert "End:\n")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6610 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6611 ;; 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
6612 ;; of new value:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6613 (goto-char beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6614 (allout-show-to-offshoot)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6615 (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
6616 (let* ((value-beg (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6617 (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
6618 (forward-char -1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6619 (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6620 (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
6621 (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
6622 (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
6623 (end-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6624 (open-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6625 (forward-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6626 (insert (concat prefix varname ":")))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6627 (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
6628 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6629 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6630 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6631 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6632 ;;;_ > allout-get-configvar-values (varname)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6633 (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
6634 "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
6635
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6636 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
6637 otherwise are ignored.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6638
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6639 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
6640 not its value."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6641
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6642 (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
6643 got)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6644 (dolist (sym configvar-value)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6645 (if (not (boundp sym))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6646 (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
6647 configvar-name sym))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6648 (delq sym (symbol-value configvar-name)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6649 (push (symbol-value sym) got)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6650 (reverse got)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6651 ;;;_ : Topics:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6652 ;;;_ > allout-mark-topic ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6653 (defun allout-mark-topic ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6654 "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
6655 (interactive)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6656 (let ((inhibit-field-text-motion t))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6657 (beginning-of-line))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6658 (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6659 (push-mark (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6660 (allout-end-of-current-subtree)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6661 (exchange-point-and-mark))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6662 ;;;_ : UI:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6663 ;;;_ > solicit-char-in-string (prompt string &optional do-defaulting)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6664 (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
6665 "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
6666
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6667 Optional arg DO-DEFAULTING indicates to accept empty input (CR)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6668
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6669 (let ((new-prompt prompt)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6670 got)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6671
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6672 (while (not got)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6673 (message "%s" new-prompt)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6674
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6675 ;; 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
6676 ;; treatment for `?' character. (Oughta use minibuffer keymap instead.)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6677 (setq got
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6678 (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
6679
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6680 (setq got
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6681 (cond ((string-match (regexp-quote got) string) got)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6682 ((and do-defaulting (string= got "\r"))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6683 ;; Return empty string to default:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6684 "")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6685 ((string= got "\C-g") (signal 'quit nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6686 (t
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6687 (setq new-prompt (concat prompt
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6688 got
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6689 " ...pick from: "
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6690 string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6691 ""))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6692 nil))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6693 ;; got something out of loop - return it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6694 got)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6695 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6696 ;;;_ : Strings:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6697 ;;;_ > regexp-sans-escapes (string)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6698 (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
6699 "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
6700
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6701 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
6702 single backslash.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6703
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6704 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
6705
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6706 (if (string= regexp "")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6707 ""
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6708 ;; 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
6709 ;; backslash, or else to nil:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6710 (setq successive-backslashes
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6711 (if (= (aref regexp 0) ?\\)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6712 (if successive-backslashes (1+ successive-backslashes) 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6713 nil))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6714 (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
6715 ;; Include first char:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6716 (concat (substring regexp 0 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6717 (regexp-sans-escapes (substring regexp 1)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6718 ;; Exclude first char, but maintain count:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6719 (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
6720 ;;;_ > count-trailing-whitespace-region (beg end)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6721 (defun count-trailing-whitespace-region (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6722 "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
6723
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6724 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
6725 (if (> beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6726 0
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6727 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6728 (goto-char beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6729 (let ((count 0))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6730 (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
6731 (goto-char (1+ (match-beginning 2)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6732 (setq count (1+ count)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6733 count))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6734 ;;;_ > allout-format-quote (string)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6735 (defun allout-format-quote (string)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6736 "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
6737 (apply 'concat
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6738 (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
6739 string)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6740 ;;;_ : lists
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6741 ;;;_ > allout-flatten (list)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6742 (defun allout-flatten (list)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6743 "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
6744 ;; classic.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6745 (cond ((null list) nil)
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
6746 ((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
6747 (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
6748 ;;;_ : Compatability:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6749 ;;;_ > 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
6750 (defun allout-mark-marker (&optional force buffer)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6751 "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
6752
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6753 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
6754 so pass them along when appropriate."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6755 (if (featurep 'xemacs)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6756 (apply 'mark-marker force buffer)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6757 (mark-marker)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6758 ;;;_ > 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
6759 (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
6760 (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
6761 "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
6762 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
6763 (let ((i (length string))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6764 (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
6765 (while (> i 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6766 (setq i (1- i))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6767 (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
6768 (aset newstr i tochar)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6769 newstr)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6770 ;;;_ > wholenump if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6771 (if (not (fboundp 'wholenump))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6772 (defalias 'wholenump 'natnump))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6773 ;;;_ > remove-overlays if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6774 (if (not (fboundp 'remove-overlays))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6775 (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
6776 "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
6777 Overlays might be moved and/or split.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6778 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
6779 (unless beg (setq beg (point-min)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6780 (unless end (setq end (point-max)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6781 (if (< end beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6782 (setq beg (prog1 end (setq end beg))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6783 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6784 (dolist (o (overlays-in beg end))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6785 (when (eq (overlay-get o name) val)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6786 ;; Either push this overlay outside beg...end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6787 ;; or split it to exclude beg...end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6788 ;; 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
6789 (if (< (overlay-start o) beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6790 (if (> (overlay-end o) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6791 (progn
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6792 (move-overlay (copy-overlay o)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6793 (overlay-start o) beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6794 (move-overlay o end (overlay-end o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6795 (move-overlay o (overlay-start o) beg))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6796 (if (> (overlay-end o) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6797 (move-overlay o end (overlay-end o))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6798 (delete-overlay o)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6799 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6800 ;;;_ > 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
6801 (if (not (fboundp 'copy-overlay))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6802 (defun copy-overlay (o)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6803 "Return a copy of overlay O."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6804 (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
6805 ;; 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
6806 ;; insertion-type of the two markers.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6807 (overlay-buffer o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6808 (props (overlay-properties o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6809 (while props
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6810 (overlay-put o1 (pop props) (pop props)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6811 o1)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6812 ;;;_ > 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
6813 (if (not (fboundp 'add-to-invisibility-spec))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6814 (defun add-to-invisibility-spec (element)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6815 "Add ELEMENT to `buffer-invisibility-spec'.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6816 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
6817 that can be added."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6818 (if (eq buffer-invisibility-spec t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6819 (setq buffer-invisibility-spec (list t)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6820 (setq buffer-invisibility-spec
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6821 (cons element buffer-invisibility-spec))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6822 ;;;_ > 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
6823 (if (not (fboundp 'remove-from-invisibility-spec))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6824 (defun remove-from-invisibility-spec (element)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6825 "Remove ELEMENT from `buffer-invisibility-spec'."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6826 (if (consp buffer-invisibility-spec)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6827 (setq buffer-invisibility-spec (delete element
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6828 buffer-invisibility-spec)))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6829 ;;;_ > 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
6830 (if (not (fboundp 'move-beginning-of-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6831 (defun move-beginning-of-line (arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6832 "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
6833 \(This disregards invisible newlines such as those
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6834 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
6835
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6836 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
6837 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
6838 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
6839 (interactive "p")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6840 (or arg (setq arg 1))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6841 (if (/= arg 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6842 (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
6843
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6844 ;; 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
6845 (skip-chars-backward "^\n")
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6846 (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
6847 (goto-char (if (featurep 'xemacs)
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6848 (previous-property-change (point))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6849 (previous-char-property-change (point))))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6850 (skip-chars-backward "^\n"))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6851 (vertical-motion 0))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6852 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6853 ;;;_ > 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
6854 (if (not (fboundp 'move-end-of-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6855 (defun move-end-of-line (arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6856 "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
6857 \(This disregards invisible newlines such as those
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6858 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
6859
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6860 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
6861 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
6862 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
6863 (interactive "p")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6864 (or arg (setq arg 1))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6865 (let (done)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6866 (while (not done)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6867 (let ((newpos
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6868 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6869 (let ((goal-column 0))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6870 (and (condition-case nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6871 (or (line-move arg) t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6872 (error nil))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6873 (not (bobp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6874 (progn
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6875 (while (and (not (bobp))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6876 (line-move-invisible-p (1- (point))))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6877 (goto-char
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6878 (previous-char-property-change (point))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6879 (backward-char 1)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6880 (point)))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6881 (goto-char newpos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6882 (if (and (> (point) newpos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6883 (eq (preceding-char) ?\n))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6884 (backward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6885 (if (and (> (point) newpos) (not (eobp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6886 (not (eq (following-char) ?\n)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6887 ;; If we skipped something intangible
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6888 ;; 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
6889 ;; keep going.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6890 (setq arg 1)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6891 (setq done t)))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6892 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6893 ;;;_ > line-move-invisible-p if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6894 (if (not (fboundp 'line-move-invisible-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6895 (defun line-move-invisible-p (pos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6896 "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
6897 (let ((prop
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6898 (get-char-property pos 'invisible)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6899 (if (eq buffer-invisibility-spec t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6900 prop
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6901 (or (memq prop buffer-invisibility-spec)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6902 (assq prop buffer-invisibility-spec))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6903
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6904 ;;;_ #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
6905 ;;;_ > 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
6906 (defun allout-bullet-isearch (&optional bullet)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
6907 "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
6908 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6909 (if (not bullet)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6910 (setq bullet (solicit-char-in-string
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6911 "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
6912 (regexp-sans-escapes allout-bullets-string))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
6913
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6914 (let ((isearch-regexp t)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6915 (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
6916 allout-header-prefix
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6917 "[ \t]*"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6918 bullet)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6919 (isearch-repeat 'forward)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6920 (isearch-mode t)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6921
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6922 ;;;_ #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
6923 ;;;_ > 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
6924 (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
6925 "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
6926 (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
6927 (allout-test-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6928 (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
6929 (sit-for .5))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6930 ;;;_ : test resumptions:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6931 ;;;_ > 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
6932 (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
6933 "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
6934 (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
6935 (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
6936 ;;;_ > allout-test-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6937 (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
6938 "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
6939 (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
6940 "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
6941 (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
6942 "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
6943 (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
6944 "Exercise allout resumptions."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6945 ;; 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
6946 ;; 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
6947
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6948 ;; 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
6949 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6950 (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
6951 (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
6952 (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
6953 (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
6954 (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
6955 (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
6956 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6957 (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
6958 (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
6959
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6960 ;; 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
6961 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6962 (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
6963 (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
6964 (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
6965 (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
6966 (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
6967 (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
6968 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6969 (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
6970 (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
6971 (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
6972
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6973 ;; 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
6974 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6975 (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
6976 (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
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 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
6979 " 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
6980 (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
6981 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
6982 " 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
6983 (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
6984 (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
6985 (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
6986 (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
6987 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6988 (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
6989 (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
6990 (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
6991 (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
6992
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6993 ;; 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
6994 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6995 (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
6996 (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
6997 (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
6998 (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
6999 (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
7000 (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
7001 '(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
7002 '(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
7003 (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
7004 '(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
7005 '(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
7006 ;; 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
7007 (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
7008 (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
7009 (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
7010 (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
7011 (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
7012 (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
7013 (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
7014 (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
7015 (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
7016 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7017 (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
7018 (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
7019 (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
7020 (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
7021 (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
7022 (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
7023 (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
7024 (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
7025 (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
7026
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7027 ;; 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
7028 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7029 (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
7030 (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
7031 (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
7032 (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
7033 (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
7034 (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
7035 '(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
7036 '(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
7037 (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
7038 (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
7039 (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
7040 (allout-do-resumptions))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7041 )
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7042 ;;;_ % 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
7043 (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
7044 (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
7045
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7046 ;;;_ #12 Provide
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
7047 (provide 'allout)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7048
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7049 ;;;_* Local emacs vars.
69124
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7050 ;; The following `allout-layout' local variable setting:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7051 ;; - 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
7052 ;; - shows the children of the third to last (config vars)
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7053 ;; - and the second to last (code section),
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7054 ;; - and closes the last topic (this local-variables section).
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7055 ;;Local variables:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7056 ;;allout-layout: (0 : -1 -1 0)
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7057 ;;End:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7058
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7059 ;; arch-tag: cf38fbc3-c044-450f-8bff-afed8ba5681c
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
7060 ;;; allout.el ends here