annotate lisp/allout.el @ 87564:d0544447616a

(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions outside the with-current-buffer. (byte-compile-insert-header): Use with-current-buffer.
author Richard M. Stallman <rms@gnu.org>
date Fri, 04 Jan 2008 05:34:44 +0000
parents 25c8924964c6
children 107ccd98fa12 56a72e2bd635
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
78236
9355f9b7bbff Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 76204
diff changeset
17 ;; the Free Software Foundation; either version 3, or (at your option)
6736
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
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
112 ;;;_ = allout-command-prefix
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
113 (defcustom allout-command-prefix "\C-c "
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
114 "*Key sequence to be used as prefix for outline mode command key bindings.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
115
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
116 Default is '\C-c<space>'; just '\C-c' is more short-and-sweet, if you're
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
117 willing to let allout use a bunch of \C-c keybindings."
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
118 :type 'string
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
119 :group 'allout)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
120 ;;;_ = allout-keybindings-list
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
121 ;;; You have to reactivate allout-mode - `(allout-mode t)' - to
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
122 ;;; institute changes to this var.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
123 (defvar allout-keybindings-list ()
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
124 "*List of `allout-mode' key / function bindings, for `allout-mode-map'.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
125
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
126 String or vector key will be prefaced with `allout-command-prefix',
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
127 unless optional third, non-nil element is present.")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
128 (setq allout-keybindings-list
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
129 '(
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
130 ; Motion commands:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
131 ("\C-n" allout-next-visible-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
132 ("\C-p" allout-previous-visible-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
133 ("\C-u" allout-up-current-level)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
134 ("\C-f" allout-forward-current-level)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
135 ("\C-b" allout-backward-current-level)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
136 ("\C-a" allout-beginning-of-current-entry)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
137 ("\C-e" allout-end-of-entry)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
138 ; Exposure commands:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
139 ("\C-i" allout-show-children)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
140 ("\C-s" allout-show-current-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
141 ("\C-h" allout-hide-current-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
142 ("\C-t" allout-toggle-current-subtree-exposure)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
143 ("h" allout-hide-current-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
144 ("\C-o" allout-show-current-entry)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
145 ("!" allout-show-all)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
146 ("x" allout-toggle-current-subtree-encryption)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
147 ; Alteration commands:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
148 (" " allout-open-sibtopic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
149 ("." allout-open-subtopic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
150 ("," allout-open-supertopic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
151 ("'" allout-shift-in)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
152 (">" allout-shift-in)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
153 ("<" allout-shift-out)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
154 ("\C-m" allout-rebullet-topic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
155 ("*" allout-rebullet-current-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
156 ("#" allout-number-siblings)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
157 ("\C-k" allout-kill-line t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
158 ("\M-k" allout-copy-line-as-kill t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
159 ("\C-y" allout-yank t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
160 ("\M-y" allout-yank-pop t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
161 ("\C-k" allout-kill-topic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
162 ("\M-k" allout-copy-topic-as-kill)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
163 ; Miscellaneous commands:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
164 ;([?\C-\ ] allout-mark-topic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
165 ("@" allout-resolve-xref)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
166 ("=c" allout-copy-exposed-to-buffer)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
167 ("=i" allout-indented-exposed-to-buffer)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
168 ("=t" allout-latexify-exposed)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
169 ("=p" allout-flatten-exposed-to-buffer)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
170
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
171 ;;;_ = 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
172 (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
173 "*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
174
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
175 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
176 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
177 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
178 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
179
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
180 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
181 \(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
182 `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
183
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
184 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
185 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
186
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
187 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
188 auto-layout is not.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
189
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
190 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
191 enabled.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
192
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
193 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
194 this variable."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
195 :type '(choice (const :tag "On" t)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
196 (const :tag "Ask about layout" "ask")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
197 (const :tag "Mode only" "activate")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
198 (const :tag "Off" nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
199 :group 'allout)
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
200 ;;;_ = allout-default-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
201 (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
202 "*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
203
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
204 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
205 `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
206 layout specifications.
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
207
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
208 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
209 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
210 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
211 `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
212
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
213 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
214
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
215 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
216 where:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
217 - 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
218 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
219 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
220 - 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
221 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
222 - 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
223 : - 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
224 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
225 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
226 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
227 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
228 * - 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
229 + - 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
230 - - 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
231 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
232 corresponding item(s)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
233
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
234 Examples:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
235 '(-2 : 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
236 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
237 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
238 '(-1 () : 1 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
239 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
240 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
241 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
242 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
243 '(-2 : -1 *)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
244 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
245 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
246 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
247
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
248 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
249
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
250 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
251 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
252 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
253 :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
254 :group 'allout)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
255 ;;;_ : allout-layout-type
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
256 (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
257 "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
258 :type '(repeat
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
259 (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
260 (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
261 (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
262 (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
263 (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
264 (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
265
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
266 ;;;_ = allout-inhibit-auto-fill
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
267 (defcustom allout-inhibit-auto-fill nil
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
268 "*If non-nil, auto-fill will be inhibited in the allout buffers.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
269
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
270 You can customize this setting to set it for all allout buffers, or set it
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
271 in individual buffers if you want to inhibit auto-fill only in particular
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
272 buffers. (You could use a function on `allout-mode-hook' to inhibit
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
273 auto-fill according, eg, to the major mode.)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
274
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
275 If you don't set this and auto-fill-mode is enabled, allout will use the
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
276 value that `normal-auto-fill-function', if any, when allout mode starts, or
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
277 else allout's special hanging-indent maintaining auto-fill function,
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
278 `allout-auto-fill'."
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
279 :type 'boolean
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
280 :group 'allout)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
281 (make-variable-buffer-local 'allout-inhibit-auto-fill)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
282 ;;;_ = allout-use-hanging-indents
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
283 (defcustom allout-use-hanging-indents t
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
284 "*If non-nil, topic body text auto-indent defaults to indent of the header.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
285 Ie, it is indented to be just past the header prefix. This is
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
286 relevant mostly for use with indented-text-mode, or other situations
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
287 where auto-fill occurs."
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
288 :type 'boolean
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
289 :group 'allout)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
290 (make-variable-buffer-local 'allout-use-hanging-indents)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
291 ;;;###autoload
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
292 (put 'allout-use-hanging-indents 'safe-local-variable
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
293 (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil)))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
294 ;;;_ = allout-reindent-bodies
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
295 (defcustom allout-reindent-bodies (if allout-use-hanging-indents
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
296 'text)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
297 "*Non-nil enables auto-adjust of topic body hanging indent with depth shifts.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
298
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
299 When active, topic body lines that are indented even with or beyond
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
300 their topic header are reindented to correspond with depth shifts of
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
301 the header.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
302
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
303 A value of t enables reindent in non-programming-code buffers, ie
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
304 those that do not have the variable `comment-start' set. A value of
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
305 `force' enables reindent whether or not `comment-start' is set."
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
306 :type '(choice (const nil) (const t) (const text) (const force))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
307 :group 'allout)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
308
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
309 (make-variable-buffer-local 'allout-reindent-bodies)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
310 ;;;###autoload
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
311 (put 'allout-reindent-bodies 'safe-local-variable
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
312 '(lambda (x) (memq x '(nil t text force))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
313
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
314 ;;;_ = 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
315 (defcustom allout-show-bodies nil
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
316 "*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
317 just the header."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
318 :type 'boolean
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
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-show-bodies)
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-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
323 (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
324
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
325 ;;;_ = 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
326 (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
327 "*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
328
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
329 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
330 follows a different command.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
331
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
332 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
333 advance as follows:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
334
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
335 - 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
336 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
337 - 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
338 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
339 - 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
340 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
341 - 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
342 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
343 - 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
344 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
345 - 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
346 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
347
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
348 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
349 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
350 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
351
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
352 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
353 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
354 repeated calls."
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
355 :type 'boolean :group 'allout)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
356 ;;;_ = 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
357 (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
358 "*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
359
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
360 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
361 follows a different command.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
362
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
363 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
364 advance as follows:
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
365
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
366 - 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
367 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
368 - 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
369 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
370 - 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
371 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
372
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
373 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
374 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
375 cycling back to start.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
376
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
377 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
378 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
379 calls."
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
380 :type 'boolean :group 'allout)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
381
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
382 ;;;_ = 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
383 (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
384 ;; 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
385 ;; 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
386 "*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
387
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
388 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
389 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
390 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
391 character, which is typically set to the `allout-primary-bullet'."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
392 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
393 :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
394 (make-variable-buffer-local 'allout-header-prefix)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
395 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
396 (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
397 ;;;_ = 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
398 (defcustom allout-primary-bullet "*"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
399 "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
400
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
401 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
402 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
403 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
404
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
405 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
406 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
407 and `allout-distinctive-bullets-string' for the range of available
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
408 bullets."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
409 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
410 :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
411 (make-variable-buffer-local 'allout-primary-bullet)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
412 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
413 (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
414 ;;;_ = 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
415 (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
416 "*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
417
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
418 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
419 bullets.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
420
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
421 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
422
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
423 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
424 of this var to take effect."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
425 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
426 :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
427 (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
428 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
429 (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
430 ;;;_ = 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
431 (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
432 "*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
433
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
434 These bullets are distinguish topics with particular character.
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
435 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
436 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
437 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
438
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
439 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
440 otherwise automatically rebulleted, so their marking is
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
441 persistent until deliberately changed. Their significance is
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
442 purely by convention, however. Some conventions suggest
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
443 themselves:
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
444
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
445 `(' - open paren - an aside or incidental point
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
446 `?' - question mark - uncertain or outright question
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
447 `!' - exclamation point/bang - emphatic
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
448 `[' - 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
449 `\"' - double quote - a quotation or other citation
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
450 `=' - 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
451 `^' - carat - relates to something above
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
452
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
453 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
454
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
455 `+' - plus - pending consideration, completion
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
456 `_' - underscore - done, completed
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
457 `&' - ampersand - addendum, furthermore
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
458
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
459 \(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
460 software. By default:
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
461
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
462 `~' marks encryptable topics - see `allout-topic-encryption-bullet'
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
463 `#' marks auto-numbered bullets - see `allout-numbered-bullet'.)
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
464
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
465 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
466 bullets.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
467
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
468 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
469 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
470
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
471 DO NOT include the close-square-bracket, `]', on either of the bullet
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
472 strings."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
473 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
474 :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
475 (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
476 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
477 (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
478
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
479 ;;;_ = 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
480 (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
481 "*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
482
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
483 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
484 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
485 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
486 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
487
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
488 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
489 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
490
50855
31ce4fcda3d8 (allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents: 49966
diff changeset
491 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
492 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
493 \(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
494
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
495 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
496 `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
497
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
498 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
499 `allout-primary-bullet' unaltered.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
500
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
501 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
502 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
503 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
504 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
505 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
506 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
507 `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
508 undesired.]"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
509 :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
510 (const allout-mode-leaders)
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
511 (const comment-start))
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
512 :group 'allout)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
513 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
514 (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
515 '(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
516 (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
517 ;;;_ = 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
518 (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
519 "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
520
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
521 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
522 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
523 `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
524
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
525 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
526 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
527 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
528 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
529
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
530 ;;;_ = 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
531 (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
532 "*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
533
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
534 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
535 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
536 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
537
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
538 Whatever the setting of this variable, both old and new style prefixes
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
539 are always respected by the topic maneuvering functions."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
540 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
541 :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
542 (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
543 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
544 (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
545 (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
546 ;;;_ = 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
547 (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
548 "*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
549
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
550 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
551 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
552 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
553 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
554
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
555 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
556 prefixes:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
557
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
558 * Top level
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
559 .* A topic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
560 . + One level 3 subtopic
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
561 . . One level 4 subtopic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
562 . . A second 4 subtopic
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
563 . + Another level 3 subtopic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
564 . #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
565 . #2 Another
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
566 . ! 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
567 . #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
568
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
569 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
570 numbered and other distinctive bullets retained):
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
571
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
572 * Top level
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
573 .* A topic
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
574 . * One level 3 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
575 . * One level 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
576 . * A second 4 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
577 . * Another level 3 subtopic
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
578 . #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
579 . #2 Another
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
580 . ! 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
581 . #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
582
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
583 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
584 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
585 this variable setting.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
586
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
587 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
588 is non-nil."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
589 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
590 :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
591 (make-variable-buffer-local 'allout-stylish-prefixes)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
592 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
593 (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
594 (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
595
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
596 ;;;_ = 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
597 (defcustom allout-numbered-bullet "#"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
598 "*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
599
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
600 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
601 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
602 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
603 disables numbering maintenance."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
604 :type '(choice (const nil) string)
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
605 :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
606 (make-variable-buffer-local 'allout-numbered-bullet)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
607 ;;;###autoload
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
608 (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
609 (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
610 'string-or-null-p
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
611 '(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
612 ;;;_ = 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
613 (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
614 "*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
615
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
616 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
617 :type '(choice (const nil) string)
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
618 :group 'allout)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
619 ;;;###autoload
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
620 (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
621 (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
622 'string-or-null-p
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
623 '(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
624 ;;;_ = 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
625 (defcustom allout-presentation-padding 2
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
626 "*Presentation-format white-space padding factor, for greater indent."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
627 :type 'integer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
628 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
629
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
630 (make-variable-buffer-local 'allout-presentation-padding)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
631 ;;;###autoload
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
632 (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
633
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
634 ;;;_ = 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
635 (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
636 "*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
637 numbers to minimal amount with some context. Otherwise, entire
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
638 numbers are always used."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
639 :type 'boolean
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
640 :group 'allout)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
641
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
642 ;;;_ + 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
643 ;;;_ - 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
644 (defcustom allout-number-pages nil
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
645 "*Non-nil turns on page numbering for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
646 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
647 :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
648 ;;;_ - 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
649 (defcustom allout-label-style "\\large\\bf"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
650 "*Font and size of labels for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
651 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
652 :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
653 ;;;_ - 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
654 (defcustom allout-head-line-style "\\large\\sl "
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
655 "*Font and size of entries for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
656 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
657 :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
658 ;;;_ - 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
659 (defcustom allout-body-line-style " "
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
660 "*Font and size of entries for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
661 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
662 :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
663 ;;;_ - 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
664 (defcustom allout-title-style "\\Large\\bf"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
665 "*Font and size of titles for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
666 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
667 :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
668 ;;;_ - allout-title
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
669 (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
670 "*Expression to be evaluated to determine the title for LaTeX
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
671 formatted copy."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
672 :type 'sexp
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
673 :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
674 ;;;_ - 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
675 (defcustom allout-line-skip ".05cm"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
676 "*Space between lines for LaTeX formatting of an outline."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
677 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
678 :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
679 ;;;_ - 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
680 (defcustom allout-indent ".3cm"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
681 "*LaTeX formatted depth-indent spacing."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
682 :type 'string
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
683 :group 'allout)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
684
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
685 ;;;_ + Topic encryption
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
686 ;;;_ = allout-encryption group
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
687 (defgroup allout-encryption nil
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
688 "Settings for topic encryption features of allout outliner."
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
689 :group 'allout)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
690 ;;;_ = allout-topic-encryption-bullet
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
691 (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
692 "*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
693 :type '(choice (const nil) string)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
694 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
695 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
696 ;;;_ = allout-passphrase-verifier-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
697 (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
698 "*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
699
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
700 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
701 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
702 :type 'boolean
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
703 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
704 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
705 (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
706 ;;;_ = allout-passphrase-hint-handling
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
707 (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
708 "*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
709
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
710 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
711 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
712 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
713
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
714 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
715 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
716 :type '(choice (const always)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
717 (const needed)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
718 (const disabled))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
719 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
720 :group 'allout-encryption)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
721 (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
722 ;;;_ = allout-encrypt-unencrypted-on-saves
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
723 (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
724 "*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
725
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
726 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
727 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
728
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
729 - 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
730 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
731 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
732 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
733 encrypted.)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
734 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
735 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
736 - 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
737 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
738 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
739 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
740 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
741 - 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
742
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
743 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
744 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
745 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
746 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
747 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
748
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
749 :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
750 (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
751 (const :tag "No" nil))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
752 :version "22.0"
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
753 :group 'allout-encryption)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
754 (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
755
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
756 ;;;_ + Developer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
757 ;;;_ = allout-developer group
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
758 (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
759 "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
760 :group 'allout)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
761 ;;;_ = 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
762 (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
763 "*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
764
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
765 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
766
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
767 \(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
768 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
769 compilation.)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
770
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
771 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
772 :type 'boolean
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
773 :group 'allout-developer)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
774
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
775 ;;;_ + Miscellaneous customization
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
776
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
777 ;;;_ = 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
778 (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
779 "*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
780
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
781 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
782 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
783
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
784 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
785 is nil.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
786
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
787 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
788 For details, see `allout-toggle-current-subtree-encryption's docstring."
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
789 :type 'boolean
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 19923
diff changeset
790 :group 'allout)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
791 (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
792
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
793 ;;;_* CODE - no user customizations below.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
794
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
795 ;;;_ #1 Internal Outline Formatting and Configuration
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
796 ;;;_ : 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
797 ;;;_ = allout-version
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
798 (defvar allout-version "2.2.1"
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
799 "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
800 ;;;_ > 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
801 (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
802 "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
803 (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
804 (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
805 (if here (insert msg))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
806 (message "%s" msg)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
807 msg))
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
808 ;;;_ : 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
809 ;;;_ = allout-mode
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
810 (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
811 (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
812 ;;;_ = allout-layout nil
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
813 (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
814 "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
815
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
816 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
817 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
818 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
819 `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
820
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
821 \*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
822 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
823
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
824 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
825 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
826
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
827 ;;;Local variables:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
828 ;;;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
829 ;;;End:
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
830
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
831 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
832 \(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
833 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
834 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
835
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
836 `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
837 `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
838 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
839 (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
840 ;;;###autoload
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
841 (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
842 '(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
843
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
844 ;;;_ : 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
845 ;;;_ = 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
846 (defvar allout-regexp ""
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
847 "*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
848
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
849 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
850 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
851 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
852 (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
853 ;;;_ = 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
854 (defvar allout-bullets-string ""
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
855 "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
856
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
857 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
858 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
859 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
860 (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
861 ;;;_ = 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
862 (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
863 "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
864 (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
865 ;;;_ = allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
866 (defvar allout-depth-specific-regexp ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
867 "*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
868
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
869 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
870 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
871 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
872
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
873 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
874 `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
875 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
876 topic prefix to be matched.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
877 (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
878 ;;;_ = allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
879 (defvar allout-depth-one-regexp ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
880 "*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
881
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
882 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
883 `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
884 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
885 topic prefix to be matched.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
886 (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
887 ;;;_ = 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
888 (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
889 "`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
890
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
891 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
892 (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
893 ;;;_ = 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
894 (defvar allout-bob-regexp ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
895 "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
896 (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
897 ;;;_ = 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
898 (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
899 "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
900 (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
901 ;;;_ = 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
902 (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
903 "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
904 (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
905
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
906 ;;;_ = allout-doublecheck-at-and-shallower
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
907 (defconst allout-doublecheck-at-and-shallower 3
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
908 "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
909
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
910 Verified with `allout-aberrant-container-p'. The usefulness of
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
911 this check is limited to shallow depths, because the
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
912 determination of aberrance is according to the mistaken item
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
913 being followed by a legitimate item of excessively greater depth.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
914
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
915 The classic example of a mistaken item, for a standard allout
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
916 outline configuration, is a body line that begins with an '...'
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
917 ellipsis. This happens to contain a legitimate depth-2 header
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
918 prefix, constituted by two '..' dots at the beginning of the
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
919 line. The only thing that can distinguish it *in principle* from
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
920 a legitimate one is if the following real header is at a depth
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
921 that is discontinuous from the depth of 2 implied by the
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
922 ellipsis, ie depth 4 or more. As the depth being tested gets
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
923 greater, the likelihood of this kind of disqualification is
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
924 lower, and the usefulness of this test is lower.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
925
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
926 Extending the depth of the doublecheck increases the amount it is
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
927 applied, increasing the cost of the test - on casual estimation,
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
928 for outlines with many deep topics, geometrically (O(n)?).
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
929 Taken together with decreasing likelihood that the test will be
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
930 useful at greater depths, more modest doublecheck limits are more
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
931 suitably economical.")
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
932 ;;;_ 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
933 (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
934 "*Reset the leading string used to identify topic headers."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
935 (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
936 (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
937 (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
938 (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
939 ;;;_ 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
940 (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
941 "*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
942
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
943 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
944 language comments. Returns the leading string."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
945
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
946 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
947 (if (not (stringp header-lead))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
948 (setq header-lead (read-string
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
949 "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
950 (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
951 (allout-reset-header-lead header-lead)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
952 header-lead)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
953 ;;;_ > 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
954 (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
955 "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
956
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
957 Works according to settings of:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
958
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
959 `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
960 `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
961 `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
962 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
963
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
964 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
965 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
966 (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
967 (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
968 (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
969 '(allout-mode-leaders
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
970 comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
971 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
972 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
973 ;; 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
974 t)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
975 (leader
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
976 (cond
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
977 ((not use-leader) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
978 ;; Use the explicitly designated leader:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
979 ((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
980 (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
981 ;; 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
982 (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
983 ;; ... 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
984 (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
985 comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
986 ;; Use comment-start, maybe tripled, and with
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
987 ;; underscore:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
988 (concat
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
989 (if (string= " "
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
990 (substring comment-start
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
991 (1- (length comment-start))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
992 ;; 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
993 (substring comment-start 0 -1)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
994 (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
995 ;; ... and append underscore, whichever:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
996 "_")))))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
997 (if (not leader)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
998 nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
999 (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
1000 (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
1001 ;; 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
1002 ;; 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
1003 (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
1004 allout-header-prefix)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1005 (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
1006 '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
1007 ;;;_ > 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
1008 (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
1009 "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
1010
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1011 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
1012 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
1013 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
1014 (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
1015 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
1016 (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
1017 (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
1018 ;;;_ > 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
1019 (defun set-allout-regexp ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1020 "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
1021
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1022 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
1023 `allout-distinctive-bullets-string'.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1024
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1025 Also refresh various data structures that hinge on the regexp."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1026
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1027 (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
1028 ;; 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
1029 (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
1030 (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
1031 '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
1032 'allout-primary-bullet))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1033 cur-string
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1034 cur-len
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1035 cur-char
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1036 index)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1037 (while strings
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1038 (setq index 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1039 (setq cur-len (length (setq cur-string (symbol-value (car strings)))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1040 (while (< index cur-len)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1041 (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
1042 (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
1043 (concat allout-bullets-string
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1044 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1045 ; Single dash would denote a
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1046 ; sequence, repeated denotes
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1047 ; a dash:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1048 ((eq cur-char ?-) "--")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1049 ; literal close-square-bracket
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1050 ; doesn't work right in the
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1051 ; expr, exclude it:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1052 ((eq cur-char ?\]) "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1053 (t (regexp-quote (char-to-string cur-char))))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1054 (setq index (1+ index)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1055 (setq strings (cdr strings)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1056 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1057 ;; 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
1058 (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
1059 (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
1060
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1061 (let (new-part old-part)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1062 (setq new-part (concat "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1063 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1064 "[ \t]*"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1065 ;; 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
1066 "[" allout-bullets-string "]"
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 old-part (concat "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1069 (regexp-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1070 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1071 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1072 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1073 "+"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1074 " ?[^" allout-primary-bullet "]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1075 allout-regexp (concat new-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1076 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1077 old-part
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1078 "\\|\^l")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1079
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1080 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
1081 "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1082 "\n" old-part)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1083
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1084 allout-bob-regexp (concat "\\`" new-part
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 "\\`" old-part))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1087
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1088 (setq allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1089 (concat "\\(^\\|\\`\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1090 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1091
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1092 ;; new-style spacers-then-bullet string:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1093 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1094 (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
1095 " \\{%s\\}"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1096 "[" (allout-format-quote allout-bullets-string) "]"
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 ;; 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
1100 (if (< 0 allout-header-subtraction)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1101 ""
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 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1104 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1105 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1106 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1107 (allout-format-quote
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1108 (regexp-quote allout-primary-bullet))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1109 "\\{%s\\}"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1110 ;; disqualify greater depths:
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 (allout-format-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1113 "]\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1114 ))
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 ))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1117 (setq allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1118 (concat "\\(^\\|\\`\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1119 "\\("
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 "\\("
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1122 (regexp-quote allout-header-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1123 ;; 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
1124 ;; intervening whitespace:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1125 " *"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1126 (concat "[^ " allout-bullets-string "]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1127 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1128 (if (< 0 allout-header-subtraction)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1129 ;; 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
1130 ;; 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
1131 ""
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1132 (concat "\\|"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1133 (regexp-quote allout-primary-bullet)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1134 ;; disqualify deeper primary-bullet sequences:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1135 "[^" allout-primary-bullet "]"))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1136 "\\)"
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1137 ))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1138 ;;;_ : 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
1139 ;;;_ = 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
1140 (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
1141 ;;;_ > 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
1142 (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
1143 "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
1144
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1145 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
1146 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
1147 (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
1148 (pref (list allout-command-prefix)))
84855
5b7295004fd1 (produce-allout-mode-map, allout-process-exposed):
Juanma Barranquero <lekktu@gmail.com>
parents: 78492
diff changeset
1149 (mapc (function
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1150 (lambda (cell)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1151 (let ((add-pref (null (cdr (cdr cell))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1152 (key-suff (list (car cell))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1153 (apply 'define-key
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1154 (list map
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1155 (apply 'vconcat (if add-pref
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1156 (append pref key-suff)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1157 key-suff))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1158 (car (cdr cell)))))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
1159 keymap-list)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1160 map))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1161 ;;;_ : Menu bar
54952
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1162 (defvar allout-mode-exposure-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1163 (defvar allout-mode-editing-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1164 (defvar allout-mode-navigation-menu)
5e2b4f7225cb (allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents: 54770
diff changeset
1165 (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
1166 (defun produce-allout-mode-menubar-entries ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1167 (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
1168 (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
1169 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1170 "Allout outline exposure menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1171 '("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
1172 ["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
1173 ["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
1174 ["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
1175 ["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
1176 ["Hide Leaves" allout-hide-current-leaves t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1177 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1178 ["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
1179 (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
1180 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1181 "Allout outline editing menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1182 '("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
1183 ["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
1184 ["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
1185 ["Open Supertopic" allout-open-supertopic t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1186 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1187 ["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
1188 ["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
1189 ["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
1190 ["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
1191 ["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
1192 "----"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1193 ["Toggle Topic Encryption"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1194 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
1195 (> (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
1196 (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
1197 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1198 "Allout outline navigation menu."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1199 '("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
1200 ["Next Visible Heading" allout-next-visible-heading t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1201 ["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
1202 allout-previous-visible-heading t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1203 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1204 ["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
1205 ["Forward Current Level" allout-forward-current-level t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1206 ["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
1207 allout-backward-current-level t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1208 "----"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1209 ["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
1210 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
1211 ["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
1212 ["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
1213 (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
1214 allout-mode-map
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1215 "Allout outlines miscellaneous bindings."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1216 '("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
1217 ["Version" allout-version t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1218 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1219 ["Duplicate Exposed" allout-copy-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1220 ["Duplicate Exposed, numbered"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
1221 allout-flatten-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1222 ["Duplicate Exposed, indented"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
1223 allout-indented-exposed-to-buffer t]
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1224 "----"
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
1225 ["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
1226 ["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
1227 ;;;_ : 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
1228 ;;;_ = 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
1229 (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
1230 "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
1231
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1232 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
1233 (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
1234 ;;;_ > 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
1235 (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
1236 "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
1237
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1238 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
1239
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1240 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
1241 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
1242 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
1243
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1244 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
1245 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
1246 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
1247 as described further below.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1248
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1249 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
1250 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
1251 existing value.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1252
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1253 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
1254 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
1255 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
1256
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1257 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
1258 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
1259
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1260 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
1261 (while pairs
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1262 (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
1263 (name (car pair))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1264 (value (cadr pair))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1265 (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
1266 (caddr pair)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1267 prior-value)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1268 (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
1269 (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
1270 name (type-of name)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
1271 (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
1272 (symbol-value name)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1273 (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
1274 (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
1275 ;; 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
1276 (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
1277 ;; 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
1278 (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
1279 ;; 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
1280 ;; 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
1281 (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
1282 (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
1283 (if qualifier
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1284 (cond ((eq qualifier 'extend)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1285 (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
1286 (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
1287 (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
1288 ((eq qualifier 'append)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1289 (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
1290 (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
1291 (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
1292 (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
1293 qualifier)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1294 (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
1295 ;;;_ > allout-do-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1296 (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
1297 "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
1298
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1299 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
1300 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
1301
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1302 (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
1303 (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
1304 (name (car pair))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1305 (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
1306 (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
1307 ;; 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
1308 (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
1309 ;; 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
1310 (set name (car value-cell))))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1311 ;;;_ : 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
1312 ;;;_ > allout-unprotected (expr)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1313 (defmacro allout-unprotected (expr)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1314 "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
1315 `(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
1316 (inhibit-field-text-motion t))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1317 ,expr))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1318 ;;;_ = allout-mode-hook
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1319 (defvar allout-mode-hook nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1320 "*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
1321 ;;;_ = 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
1322 (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
1323 "*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
1324 ;;;_ = allout-exposure-category
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1325 (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
1326 "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
1327 ;;;_ x allout-view-change-hook
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1328 (defvar allout-view-change-hook nil
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1329 "*(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
1330
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1331 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
1332 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
1333 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
1334 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
1335 ;;;_ = allout-exposure-change-hook
b69cce4ff5a0 2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70256
diff changeset
1336 (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
1337 "*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
1338
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1339 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
1340
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1341 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
1342
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1343 - 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
1344 - 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
1345 - 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
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
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1349 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
1350 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
1351 ;;;_ = allout-structure-added-hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1352 (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
1353 "*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
1354
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1355 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
1356
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1357 - 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
1358 - 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
1359
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1360 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
1361 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
1362
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1363 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
1364 ;;;_ = allout-structure-deleted-hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1365 (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
1366 "*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
1367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1368 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
1369
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1370 - 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
1371 - 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
1372
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1373 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
1374 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
1375
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1376 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
1377 ;;;_ = allout-structure-shifted-hook
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1378 (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
1379 "*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
1380
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1381 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
1382
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1383 - 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
1384 - 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
1385
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1386 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
1387 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
1388
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1389 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
1390 ;;;_ = allout-outside-normal-auto-fill-function
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1391 (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
1392 "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
1393
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1394 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
1395 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
1396 (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
1397 ;;;_ = 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
1398 (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
1399 "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
1400 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
1401 to track repeats.")
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1402 ;;;_ = allout-passphrase-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1403 (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
1404 "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
1405 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
1406
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1407 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
1408 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
1409 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
1410 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
1411 search attacks.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1412
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1413 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
1414 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
1415 `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
1416 (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
1417 ;;;###autoload
70225
81a284d45346 (allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70002
diff changeset
1418 (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
1419 ;;;_ = allout-passphrase-hint-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1420 (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
1421 "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
1422
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1423 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
1424 the reminder is deployed.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1425
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
1426 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
1427 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
1428 `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
1429 (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
1430 (setq-default allout-passphrase-hint-string "")
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
1431 ;;;###autoload
70225
81a284d45346 (allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70002
diff changeset
1432 (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
1433 ;;;_ = allout-after-save-decrypt
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1434 (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
1435 "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
1436
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1437 - 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
1438 - 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
1439
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1440 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
1441 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
1442 (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
1443 ;;;_ = 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
1444 (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
1445 "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
1446
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1447 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
1448 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
1449 prior to encryption.
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1450
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1451 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
1452
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1453 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
1454 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
1455 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
1456 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
1457 (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
1458 ;;;_ = 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
1459 (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
1460 "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
1461
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1462 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
1463 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
1464 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
1465
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1466 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
1467
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1468 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
1469 `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
1470 is raised.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1471
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1472 (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
1473 ;;;_ = 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
1474 (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
1475 "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
1476
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1477 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
1478 (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
1479 ;;;_ > allout-mode-p ()
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1480 ;; 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
1481 ;; 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
1482 (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
1483 "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
1484 'allout-mode)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1485 ;;;_ > 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
1486 (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
1487 "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
1488
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1489 (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
1490 (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
1491 (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
1492 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1493 (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
1494 'except-current)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1495 (point-marker))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1496 (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
1497 (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
1498 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1499 (message "auto-encrypting pending topics")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1500 (sit-for 0)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1501 (condition-case failure
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1502 (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
1503 (allout-encrypt-decrypted except-mark))
87407
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
1504 (message "allout-write-file-hook-handler suppressing error %s"
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
1505 failure)
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
1506 (sit-for 2)
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
1507 (error "allout-write-file-hook-handler suppressing error %s"
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
1508 failure))))
66230
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 nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1511 ;;;_ > 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
1512 (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
1513 "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
1514
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1515 (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
1516 ;; 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
1517 (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
1518 (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
1519 ;;;_ > allout-after-saves-handler ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1520 (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
1521 "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
1522
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1523 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
1524 the save.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1525
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1526 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
1527 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
1528 (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
1529 (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
1530 allout-after-save-decrypt))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1531 t
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1532 (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
1533 (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
1534 (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
1535 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1536 (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
1537 (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
1538 (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
1539 )
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1540 ;;;_ = allout-inhibit-aberrance-doublecheck nil
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1541 ;; 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
1542 ;; 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
1543 ;; 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
1544 ;; 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
1545 ;; 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
1546 ;; almost never be needed, however.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1547 (defvar allout-inhibit-aberrance-doublecheck nil
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1548 "Internal state, for momentarily inhibits aberrance doublecheck.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1549
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
1550 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
1551 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
1552
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1553 ;;;_ #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
1554 ;;;_ = 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
1555 (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
1556 "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
1557 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
1558 (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
1559 ;;;_ > 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
1560 (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
1561 "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
1562
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1563 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
1564
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1565 - nil (or no argument) deactivate auto-activation/layout;
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1566 - `activate', enable auto-activation only;
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1567 - `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
1568 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
1569 - `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
1570 - 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
1571 any confirmation check.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1572
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1573 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
1574 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
1575 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
1576 `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
1577
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1578 `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
1579 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
1580 setting.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1581
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
1582 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
1583 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
1584
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1585 \(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
1586 \(allout-init t)"
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1587
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1588 (interactive)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1589 (if (interactive-p)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1590 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1591 (setq mode
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1592 (completing-read
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1593 (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
1594 "(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
1595 '(("nil")("full")("activate")("deactivate")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1596 ("ask") ("report") (""))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1597 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1598 t))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1599 (if (string= mode "")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1600 (setq mode 'report)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1601 (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
1602 (let
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1603 ;; 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
1604 ((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
1605 (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
1606 'find-file-hook
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1607 '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
1608 (curr-mode 'allout-auto-activation))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1609
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1610 (cond ((not mode)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1611 (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
1612 (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
1613 (if (interactive-p)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1614 (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
1615 ((eq mode 'report)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1616 (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
1617 (allout-init nil)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
1618 ;; 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
1619 (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
1620 (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
1621 (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
1622 (cond ((eq mode 'activate)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1623 (message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1624 "Outline mode auto-activation enabled.")
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1625 'activate)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1626 ((eq mode 'report)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1627 ;; 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
1628 (allout-init mode))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1629 ((eq mode 'ask)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1630 (message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1631 (concat "Outline mode auto-activation and "
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1632 "-layout (upon confirmation) enabled."))
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1633 'ask)
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1634 ((message
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
1635 "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
1636 '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
1637 ;;;_ > 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
1638 (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
1639 "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
1640 (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
1641 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
1642 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
1643 allout-mode-misc-menu))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1644 cur)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1645 (while menus
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1646 (setq cur (car menus)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1647 menus (cdr menus))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1648 (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
1649 ;;;_ > allout-overlay-preparations
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1650 (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
1651 "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
1652 (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
1653 (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
1654 (put 'allout-exposure-category 'evaporate t)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1655 ;; 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
1656 ;; 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
1657 ;; 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
1658 ;; 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
1659 ;; 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
1660 ;; 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
1661 (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
1662 'allout-isearch-end-handler)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1663 (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
1664 (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
1665 (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
1666 '(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
1667 (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
1668 '(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
1669 ;;;_ > allout-mode (&optional toggle)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1670 ;;;_ : Defun:
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
1671 ;;;###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
1672 (defun allout-mode (&optional toggle)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1673 ;;;_ . Doc string:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1674 "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
1675 \\<allout-mode-map>
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1676
78492
7c8949dbfa0d Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
1677 Optional prefix argument TOGGLE forces the mode to re-initialize
7c8949dbfa0d Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
1678 if it is positive, otherwise it turns the mode off. Allout
7c8949dbfa0d Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
1679 outline mode always runs as a minor mode.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1680
48858
f4d079377a9a Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48857
diff changeset
1681 Allout outline mode provides extensive outline oriented formatting and
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1682 manipulation. It enables structural editing of outlines, as well as
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1683 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
1684 accommodating syntax-sensitive text like programming languages. (For
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1685 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
1686 outline.)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1687
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1688 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
1689
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1690 - 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
1691 repositioning, promotion/demotion, cut, and paste
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1692 - 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
1693 - 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
1694 - easy topic encryption and decryption
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1695 - \"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
1696 - 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
1697 - independent extensibility, using comprehensive exposure and authoring hooks
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1698
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
1699 and many other features.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1700
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1701 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
1702 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
1703 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
1704 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
1705 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
1706
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1707 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
1708 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
1709 `\\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
1710 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
1711 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
1712 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
1713 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
1714 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
1715
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1716 Exposure Control:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1717 ----------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1718 \\[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
1719 \\[allout-show-children] `allout-show-children'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1720 \\[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
1721 \\[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
1722 \\[allout-show-all] `allout-show-all'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1723
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1724 Navigation:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1725 ----------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1726 \\[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
1727 \\[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
1728 \\[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
1729 \\[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
1730 \\[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
1731 \\[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
1732 \\[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
1733 \\[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
1734 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
1735 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
1736
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1737
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1738 Topic Header Production:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1739 -----------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1740 \\[allout-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
1741 \\[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
1742 \\[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
1743
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1744 Topic Level and Prefix Adjustment:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1745 ---------------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1746 \\[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
1747 \\[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
1748 \\[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
1749 current topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1750 \\[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
1751 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
1752 are alternated according to nesting depth.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1753 \\[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
1754 the offspring are not affected.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1755 With repeat count, revoke numbering.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1756
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1757 Topic-oriented Killing and Yanking:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1758 ----------------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1759 \\[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
1760 \\[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
1761 \\[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
1762 \\[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
1763 \\[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
1764 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
1765 heading (ie, prefix sans text).
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1766 \\[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
1767
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1768 Topic-oriented Encryption:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1769 -------------------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1770 \\[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
1771 Encrypt/Decrypt topic content
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1772
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1773 Misc commands:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1774 -------------
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1775 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
1776 and establish a default file-var setting
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1777 for `allout-layout'.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1778 \\[allout-mark-topic] `allout-mark-topic'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1779 \\[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
1780 Duplicate outline, sans concealed text, to
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1781 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
1782 of current buffer - \"*BUFFERNAME exposed*\".
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1783 \\[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
1784 Like above 'copy-exposed', but convert topic
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1785 prefixes to section.subsection... numeric
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1786 format.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1787 \\[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
1788 auto-activation.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1789
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1790 Topic Encryption
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1791
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1792 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
1793 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
1794 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
1795 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
1796
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1797 Topics pending encryption are, by default, automatically
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1798 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
1799 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
1800 automatically decrypted for continued editing.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1801
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1802 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
1803 preventing accidents like neglected encryption before saves,
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1804 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
1805 pitfalls.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1806
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1807 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
1808 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
1809 for details.
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 HOT-SPOT Operation
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1812
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1813 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
1814 navigation and exposure control.
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1815
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1816 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
1817 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
1818 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
1819 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
1820 \(\\[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
1821
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1822 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
1823 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
1824 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
1825 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
1826 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
1827
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1828 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
1829 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
1830 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
1831 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
1832 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
1833 \(\\[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
1834 at the beginning of the current entry.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1835
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1836 Extending Allout
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1837
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1838 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
1839 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
1840 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
1841
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1842 `allout-mode-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1843 `allout-mode-deactivate-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1844 `allout-exposure-change-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1845 `allout-structure-added-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1846 `allout-structure-deleted-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1847 `allout-structure-shifted-hook'
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1848
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1849 Terminology
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1850
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1851 Topic hierarchy constituents - TOPICS and SUBTOPICS:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1852
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1853 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
1854 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
1855 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
1856 CURRENT ITEM:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1857 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
1858 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
1859 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
1860 called the:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1861 LEVEL: The same as DEPTH.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1862
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1863 ANCESTORS:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1864 Those ITEMs whose TOPICs contain an ITEM.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1865 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
1866 of the ITEM.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1867 OFFSPRING:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1868 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
1869 SUBTOPIC:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1870 An OFFSPRING of its ANCESTOR TOPICs.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1871 CHILD:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1872 An immediate SUBTOPIC of its PARENT.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1873 SIBLINGS:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1874 TOPICs having the same PARENT and DEPTH.
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1875
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1876 Topic text constituents:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1877
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1878 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
1879 text.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1880 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
1881 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
1882 BODY: Same as ENTRY.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1883 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
1884 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
1885 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
1886 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
1887 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
1888 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
1889 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
1890 the PREFIX.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1891
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1892 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
1893 of the ITEM.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1894 PREFIX-LEAD:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1895 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
1896 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
1897 `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
1898
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1899 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
1900 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
1901 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
1902 (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
1903 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
1904 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
1905 docstring for more detail.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1906 PREFIX-PADDING:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1907 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
1908 bullet, determining the ITEM's DEPTH.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1909 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
1910 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
1911 `allout-distinctive-bullets-string'. When creating a TOPIC,
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1912 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
1913 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
1914 provide a universal argugment \(\\[universal-argument]) to the
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
1915 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
1916 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
1917 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
1918 more details.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1919 EXPOSURE:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1920 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
1921 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
1922 CONCEALED:
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1923 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
1924 text is represented by \"...\" ellipses.
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1925
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
1926 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
1927 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
1928 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
1929 ;;;_ . Code
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1930 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1931
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1932 (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
1933 (allout-mode-p)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1934 ; Massage universal-arg `toggle' val:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1935 (toggle (and toggle
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1936 (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
1937 toggle)))
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
1938 ; 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
1939 (explicit-activation (and toggle
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1940 (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
1941 (and (wholenump toggle)
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
1942 (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
1943 ;; 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
1944 (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
1945 (car command-history)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1946 (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
1947 'write-file-functions)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1948 ((boundp 'write-file-hooks)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1949 'write-file-hooks)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1950 (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
1951 do-layout
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1952 )
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1953
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1954 ; 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
1955 (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
1956
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1957 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1958
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1959 ;; 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
1960 ;; 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
1961 ;; 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
1962 ;; 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
1963 ;; skip everything.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1964 ((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
1965 ; 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
1966 active ; Already activated.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1967 (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
1968 (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
1969 emacs-version)); 19.19.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1970 t)
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
1971
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1972 ;; Deactivation:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
1973 ((and (not explicit-activation)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1974 (or active toggle))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1975 ; Activation not explicitly
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1976 ; requested, and either in
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1977 ; active state or *de*activation
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1978 ; 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
1979 (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
1980
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1981 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1982
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
1983 (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
1984 (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
1985 (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
1986 (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
1987 (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
1988 (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
1989 (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
1990
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
1991 (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
1992 '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
1993
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1994 (setq allout-mode nil)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
1995 (run-hooks 'allout-mode-deactivate-hook))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1996
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
1997 ;; Activation:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1998 ((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
1999 (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
2000 (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
2001 ;; 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
2002 (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
2003
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2004 (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
2005
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2006 (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
2007 (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
2008
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2009 (set-allout-regexp)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2010 (allout-add-resumptions
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2011 '(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
2012 allout-line-boundary-regexp
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2013 extend)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2014 '(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
2015 allout-bob-regexp
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2016 extend))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2017
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2018 ;; 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
2019 (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
2020 (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
2021
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2022 ;; 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
2023 (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
2024 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
2025 (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
2026 (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
2027 minor-mode-map-alist)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2028
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2029 (add-to-invisibility-spec '(allout . t))
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
2030
71893
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 '(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
2032 (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
2033 (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
2034 (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
2035 nil t)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2036 (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
2037 (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
2038 nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2039 (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
2040 nil t)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2041
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2042 ;; 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
2043 ;; 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
2044 ;; 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
2045 ;; etc.)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2046 (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
2047 ;; 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
2048 (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
2049 (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
2050 auto-fill-function)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2051 ;; 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
2052 ;; filling is active:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2053 (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
2054 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
2055 '(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
2056 ;; 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
2057 (list 'paragraph-start
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2058 (concat paragraph-start "\\|^\\("
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2059 allout-regexp "\\)"))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2060 (list 'paragraph-separate
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2061 (concat paragraph-separate "\\|^\\("
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2062 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
2063 (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
2064 (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
2065 (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
2066
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2067 (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
2068
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2069 (if allout-layout
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2070 (setq do-layout t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2071
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2072 (setq allout-mode t)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2073 (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
2074
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2075 ;; Reactivation:
7527
1f09079e18c4 (outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents: 7476
diff changeset
2076 ((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
2077 (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
2078 ) ;; 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
2079
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2080 ;; 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
2081 (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
2082 allout-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2083 allout-default-layout)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2084 (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
2085 allout-auto-activation
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2086 use-layout
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2087 (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
2088 (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
2089 (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
2090 (buffer-name)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2091 use-layout))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2092 t
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2093 (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
2094 nil)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2095 t)))
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2096 (save-excursion
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2097 (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
2098 (goto-char 0)
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2099 (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
2100 (condition-case err
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2101 (progn
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
2102 (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
2103 (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
2104 ;; 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
2105 ;; 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
2106 (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
2107 (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
2108 allout-mode
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2109 ) ; let*
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2110 ) ; defun
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2111
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2112 (defun allout-setup-mode-map ()
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2113 "Establish allout-mode bindings."
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2114 (setq-default allout-mode-map
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2115 (produce-allout-mode-map allout-keybindings-list))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2116 (setq allout-mode-map
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2117 (produce-allout-mode-map allout-keybindings-list))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2118 (substitute-key-definition 'beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2119 'allout-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2120 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2121 (substitute-key-definition 'move-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2122 'allout-beginning-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2123 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2124 (substitute-key-definition 'end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2125 'allout-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2126 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2127 (substitute-key-definition 'move-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2128 'allout-end-of-line
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2129 allout-mode-map global-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2130 (fset 'allout-mode-map allout-mode-map))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2131
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2132 ;; 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
2133 ;; been invoked:
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2134 (allout-setup-mode-map)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2135
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2136 ;;;_ > allout-minor-mode
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2137 (defalias 'allout-minor-mode 'allout-mode)
68956
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2138
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2139 ;;;_ - Position Assessment
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2140 ;;;_ > allout-hidden-p (&optional pos)
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2141 (defsubst allout-hidden-p (&optional pos)
af2db645bc9d (allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents: 68953
diff changeset
2142 "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
2143 (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
2144
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2145 ;;;_ > 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
2146 ;;; &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2147 (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
2148 &optional prelen)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2149 "Shift the overlay so stuff inserted in front of it is excluded."
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2150 (if after
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2151 ;; XXX Shouldn't moving the overlay should be unnecessary, if overlay
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2152 ;; front-advance on the overlay worked as it should?
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2153 (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
2154 ;;;_ > 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
2155 ;;; &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2156 (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
2157 &optional prelen)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2158 "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
2159
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2160 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
2161 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
2162 reclosing the opened text.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2163
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2164 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
2165 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
2166
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2167 (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
2168 (let ((start (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2169 (ol-start (overlay-start ol))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2170 (ol-end (overlay-end ol))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2171 first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2172 (goto-char beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2173 (while (< (point) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2174 (when (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2175 (allout-show-to-offshoot)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2176 (if (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2177 (save-excursion (forward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2178 (allout-show-to-offshoot)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2179 (when (not first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2180 (setq first (point))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2181 (goto-char (if (featurep 'xemacs)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2182 (next-property-change (1+ (point)) nil end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2183 (next-char-property-change (1+ (point)) end))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2184 (when first
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2185 (goto-char first)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2186 (condition-case nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2187 (if (not
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2188 (yes-or-no-p
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2189 (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
2190 (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
2191 " \\[keyboard-quit] also reconceals) "))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2192 (progn (goto-char start)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2193 (error "Concealed-text change refused.")))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2194 (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
2195 (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
2196 (error "Concealed-text change abandoned, text reconcealed."))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2197 (goto-char start))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2198 ;;;_ > allout-before-change-handler (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2199 (defun allout-before-change-handler (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2200 "Protect against changes to invisible text.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2201
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
2202 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
2203
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2204 (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
2205 (allout-show-to-offshoot))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2206
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
2207 ;; 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
2208 ;; 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
2209 (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
2210 ;; 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
2211 (save-excursion
78915
e7a2828a162d (allout-before-change-handler): Replace got-char by goto-char.
Martin Rudalics <rudalics@gmx.at>
parents: 78492
diff changeset
2212 (goto-char beg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2213 (let ((overlay (allout-get-invisibility-overlay)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2214 (allout-overlay-interior-modification-handler
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2215 overlay nil beg end nil)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2216 ;;;_ > allout-isearch-end-handler (&optional overlay)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2217 (defun allout-isearch-end-handler (&optional overlay)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2218 "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
2219
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2220 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
2221 `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
2222 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
2223
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2224 (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
2225 (allout-show-to-offshoot)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2226
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2227 ;;;_ #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
2228 ;;; 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
2229 ;;; 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
2230 ;;; `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
2231 ;;; 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
2232 ;;; 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
2233 ;;; 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
2234 ;;; 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
2235 ;;;_ = 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
2236 (defvar allout-recent-prefix-beginning 0
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2237 "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
2238 (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
2239 ;;;_ = 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
2240 (defvar allout-recent-prefix-end 0
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2241 "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
2242 (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
2243 ;;;_ = allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2244 (defvar allout-recent-depth 0
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2245 "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
2246 (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
2247 ;;;_ = 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
2248 (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
2249 "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
2250 (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
2251 ;;;_ > allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2252 (defsubst allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2253 "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
2254
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2255 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
2256 (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
2257 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
2258 (match-beginning 2))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2259 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
2260 allout-recent-prefix-beginning
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2261 allout-header-subtraction)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2262 allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2263 ;;;_ > nullify-allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2264 (defsubst nullify-allout-prefix-data ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2265 "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
2266 (setq allout-recent-prefix-end (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2267 allout-recent-prefix-beginning (point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2268 allout-recent-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2269 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
2270 ;;;_ > allout-recent-depth ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2271 (defsubst allout-recent-depth ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2272 "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
2273
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2274 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
2275 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
2276 `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
2277 to return the current depth."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2278
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2279 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
2280 ;;;_ > allout-recent-prefix ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2281 (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
2282 "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
2283
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2284 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
2285 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
2286 `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
2287 to return the current prefix."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2288 (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
2289 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
2290 ;;;_ > 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
2291 (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
2292 "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
2293
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2294 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
2295 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
2296 `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
2297 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
2298 '(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
2299 allout-recent-prefix-end))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2300
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2301 ;;;_ #4 Navigation
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2302
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2303 ;;;_ - Position Assessment
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2304 ;;;_ : Location Predicates
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2305 ;;;_ > allout-do-doublecheck ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2306 (defsubst allout-do-doublecheck ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2307 "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
2308 (and
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2309 ;; 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
2310 ;; 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
2311 (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
2312 ;; 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
2313 (<= 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
2314 ;;;_ > allout-aberrant-container-p ()
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2315 (defun allout-aberrant-container-p ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2316 "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
2317
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2318 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
2319 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
2320
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2321 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
2322 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
2323
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2324 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
2325 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
2326 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
2327
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2328 ;; 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
2329 ;; 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
2330 ;; 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
2331 ;; 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
2332 ;; 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
2333 ;; 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
2334 ;; 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
2335 ;; actually connected with their prospective context.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2336
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2337 (let ((depth (allout-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2338 (start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2339 done aberrant)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2340 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2341 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2342 (while (and (not done)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2343 (re-search-forward allout-line-boundary-regexp nil 0))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2344 (allout-prefix-data)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2345 (goto-char allout-recent-prefix-beginning)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2346 (cond
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2347 ;; sibling - continue:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2348 ((eq allout-recent-depth depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2349 ;; first offspring is excessive - aberrant:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2350 ((> allout-recent-depth (1+ depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2351 (setq done t aberrant t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2352 ;; next non-sibling is lower-depth - not aberrant:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2353 (t (setq done t))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2354 (if aberrant
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2355 aberrant
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2356 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2357 ;; recalibrate allout-recent-*
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2358 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2359 nil)))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2360 ;;;_ > 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
2361 (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
2362 "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
2363
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2364 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
2365 (save-excursion
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2366 (allout-beginning-of-current-line)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2367 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2368 (and (looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2369 (allout-prefix-data)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2370 (or (not (allout-do-doublecheck))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2371 (not (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
2372 ;;;_ > allout-on-heading-p ()
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2373 (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
2374 ;;;_ > 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
2375 (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
2376 "True if point is located where current topic prefix ends, heading begins."
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2377 (and (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2378 (save-excursion (let ((inhibit-field-text-motion t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2379 (beginning-of-line))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2380 (looking-at allout-regexp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2381 (= (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
2382 ;;;_ : 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
2383 ;;;_ > allout-depth ()
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2384 (defun allout-depth ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2385 "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
2386
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2387 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
2388
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2389 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
2390 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2391 (let ((start-point (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2392 (if (and (allout-goto-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2393 (not (< start-point (point))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2394 allout-recent-depth
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2395 (progn
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2396 ;; Oops, no prefix, nullify it:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2397 (nullify-allout-prefix-data)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2398 ;; ... and return 0:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2399 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
2400 ;;;_ > allout-current-depth ()
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2401 (defun allout-current-depth ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2402 "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
2403
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2404 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
2405 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2406 (if (allout-back-to-current-heading)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2407 (max 1
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2408 (- allout-recent-prefix-end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2409 allout-recent-prefix-beginning
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2410 allout-header-subtraction))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2411 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
2412 ;;;_ > 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
2413 (defun allout-get-current-prefix ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2414 "Topic prefix of the current topic."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2415 (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
2416 (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
2417 (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
2418 ;;;_ > 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
2419 (defun allout-get-bullet ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2420 "Return bullet of containing topic (visible or not)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2421 (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
2422 (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
2423 (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
2424 ;;;_ > 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
2425 (defun allout-current-bullet ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2426 "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
2427 (condition-case nil
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2428 (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
2429 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2430 (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
2431 allout-recent-prefix-end))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2432 ;; 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
2433 (args-out-of-range nil))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2434 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2435 ;;;_ > 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
2436 (defun allout-get-prefix-bullet (prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2437 "Return the bullet of the header prefix string PREFIX."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2438 ;; 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
2439 ;; 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
2440 (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
2441 (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
2442 ;;;_ > 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
2443 (defun allout-sibling-index (&optional depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2444 "Item number of this prospective topic among its siblings.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2445
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2446 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
2447 opening a new level, and return 0.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2448
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2449 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
2450
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2451 (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2452 (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
2453 ((or (null depth) (= depth (allout-depth)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2454 (let ((index 1))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2455 (while (allout-previous-sibling allout-recent-depth nil)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2456 (setq index (1+ index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2457 index))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2458 ((< 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
2459 (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
2460 (allout-sibling-index))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2461 (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
2462 ;;;_ > 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
2463 (defun allout-topic-flat-index ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2464 "Return a list indicating point's numeric section.subsect.subsubsect...
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2465 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
2466 (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
2467 (next-index (allout-sibling-index depth))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2468 (rev-sibls nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2469 (while (> next-index 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2470 (setq rev-sibls (cons next-index rev-sibls))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2471 (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
2472 (setq next-index (allout-sibling-index depth)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2473 rev-sibls)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2474 )
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2475
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2476 ;;;_ - Navigation routines
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2477 ;;;_ > allout-beginning-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2478 (defun allout-beginning-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2479 "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
2480
71915
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
2481 ;; 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
2482 ;; 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
2483 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2484 (move-beginning-of-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2485 (beginning-of-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2486 (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
2487 (beginning-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2488 (if (or (allout-hidden-p) (not (bolp)))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2489 (forward-char -1)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2490 ;;;_ > allout-end-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2491 (defun allout-end-of-current-line ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2492 "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
2493 ;; 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
2494 ;; `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
2495 ;; `move-beginning-of-line'.
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2496 (let ((inhibit-field-text-motion t))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2497 (end-of-line)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2498 (while (allout-hidden-p)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2499 (end-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
2500 (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
2501 ;;;_ > allout-beginning-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2502 (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
2503 "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
2504
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2505 (interactive)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2506
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2507 (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
2508 (not (equal last-command this-command)))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2509 (progn
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2510 (if (and (not (bolp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2511 (allout-hidden-p (1- (point))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2512 (goto-char (previous-single-char-property-change
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2513 (1- (point)) 'invisible)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2514 (move-beginning-of-line 1))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2515 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2516 (let ((beginning-of-body
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2517 (save-excursion
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2518 (while (and (allout-do-doublecheck)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2519 (allout-aberrant-container-p)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2520 (allout-previous-visible-heading 1)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2521 (allout-beginning-of-current-entry)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2522 (point))))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2523 (cond ((= (current-column) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2524 (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
2525 ((< (point) beginning-of-body)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2526 (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
2527 ((= (point) beginning-of-body)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2528 (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
2529 (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
2530 (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
2531 ;; 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
2532 (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
2533 ;;;_ > allout-end-of-line ()
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2534 (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
2535 "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
2536
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2537 (interactive)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2538
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2539 (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
2540 (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
2541 (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
2542 (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
2543 (allout-end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2544 (point))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2545 (cond ((not (eolp))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2546 (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
2547 ((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
2548 (forward-char -1)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2549 (allout-hidden-p)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2550 (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
2551 (allout-show-current-entry)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2552 (allout-show-children)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2553 (allout-end-of-entry))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2554 ((>= (point) end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2555 (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
2556 (allout-end-of-current-line))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2557 (t
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2558 (if (not (and transient-mark-mode mark-active))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2559 (push-mark))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2560 (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
2561 ;;;_ > 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
2562 (defsubst allout-next-heading ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2563 "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
2564
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2565 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
2566
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2567 We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2568 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2569
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2570 (if (looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2571 (forward-char 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2572
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2573 (when (re-search-forward allout-line-boundary-regexp nil 0)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2574 (allout-prefix-data)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2575 (and (allout-do-doublecheck)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2576 ;; this will set allout-recent-* on the first non-aberrant topic,
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2577 ;; whether it's the current one or one that disqualifies it:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2578 (allout-aberrant-container-p))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2579 (goto-char allout-recent-prefix-beginning))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2580 ;;;_ > 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
2581 (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
2582 "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
2583 ;; 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
2584 ;; and usable by allout-mode.
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2585 (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
2586 ;;;_ > allout-previous-heading ()
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2587 (defun allout-previous-heading ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2588 "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
2589
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2590 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
2591
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2592 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
2593
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2594 (if (bobp)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2595 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2596 (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
2597 ;; 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
2598 (allout-goto-prefix)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2599 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2600 (when (or (re-search-backward allout-line-boundary-regexp nil 0)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2601 (looking-at allout-bob-regexp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2602 (goto-char (allout-prefix-data))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2603 (if (and (allout-do-doublecheck)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2604 (allout-aberrant-container-p))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2605 (or (allout-previous-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2606 (and (goto-char start-point)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2607 ;; recalibrate allout-recent-*:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2608 (allout-depth)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2609 nil))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2610 (point)))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2611 ;;;_ > allout-get-invisibility-overlay ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2612 (defun allout-get-invisibility-overlay ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2613 "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
2614 (let ((overlays (overlays-at (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2615 got)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2616 (while (and overlays (not got))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2617 (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
2618 (setq got (car overlays))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2619 (pop overlays)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2620 got))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2621 ;;;_ > allout-back-to-visible-text ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2622 (defun allout-back-to-visible-text ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2623 "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
2624 (if (allout-hidden-p)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2625 (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
2626 (point))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2627
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2628 ;;;_ - Subtree Charting
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2629 ;;;_ " 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
2630 ;;; 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
2631 ;;;
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2632 ;;; 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
2633 ;;; 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
2634
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2635 ;;;_ > 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
2636 (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
2637 "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
2638
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2639 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
2640 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
2641
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2642 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
2643 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
2644
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2645 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
2646
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2647 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
2648
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2649 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
2650 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
2651 for their elaborate manipulations.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2652
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2653 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
2654 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
2655 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
2656 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
2657 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
2658 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
2659
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2660 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
2661 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
2662 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
2663
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2664 (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
2665 chart curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2666
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2667 (if original ; Just starting?
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2668 ; Register initial settings and
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2669 ; 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
2670 (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
2671 (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
2672 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2673 (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
2674 (allout-next-heading))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2675
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2676 ;; 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
2677 ;; 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
2678 ;; the typically quite constrained Emacs max-lisp-eval-depth.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2679 ;;
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2680 ;; 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
2681 ;; operation rather than recursing for lower levels. Bah.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2682
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2683 (while (and (not (eobp))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2684 ; Still within original topic?
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2685 (< 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
2686 (cond ((= prev-depth curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2687 ;; 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
2688 (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
2689 (if (and levels (<= levels 1))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2690 ;; 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
2691 (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
2692 ;; 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
2693 ;; 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
2694 (while (and (<= curr-depth
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2695 allout-recent-depth)
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2696 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2697 (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
2698 (allout-next-heading)))))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2699 (if visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2700 (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
2701 (allout-next-heading))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2702
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2703 ((and (< prev-depth curr-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2704 (or (not levels)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2705 (> levels 0)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2706 ;; 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
2707 (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
2708 (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
2709 (1- levels))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2710 visible
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2711 orig-depth
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2712 curr-depth)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2713 chart))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2714 ;; ... then continue with this one.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2715 )
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2716
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2717 ;; ... 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
2718
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2719 )))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2720
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2721 (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
2722 ; the original level. Position
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2723 ; to the end of it:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2724 (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
2725 (and (= (preceding-char) ?\n)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2726 (= (aref (buffer-substring (max 1 (- (point) 3))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2727 (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2728 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2729 ?\n)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2730 (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
2731 (setq allout-recent-end-of-subtree (point))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
2732
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2733 chart ; (nreverse chart) not necessary,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2734 ; and maybe not preferable.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2735 ))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2736 ;;;_ > 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
2737 (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
2738 "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
2739 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
2740 for an explanation of charts."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2741 (save-excursion
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2742 (when (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2743 (let ((chart (list (point))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2744 (while (allout-next-sibling)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2745 (setq chart (cons (point) chart)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2746 (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
2747 ;;;_ > 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
2748 (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
2749
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2750 "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
2751
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2752 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
2753
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2754 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
2755 start point."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2756
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2757 (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
2758 (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
2759 chart)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2760 (setq here (car chart))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2761 (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
2762 (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
2763 depth
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
2764 (1- depth)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2765 ;; 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
2766 ;; more depth to go:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2767 (if further (setq result (append further result)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2768 (setq chart (cdr chart)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2769 (goto-char here)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2770 (if (allout-hidden-p)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2771 (setq result (cons here result)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2772 (setq chart (cdr chart))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2773 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
2774 ;;;_ 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
2775 ;; (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
2776 ;; "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
2777
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2778 ;; 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
2779
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2780 ;; 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
2781 ;; 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
2782 ;; 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
2783 ;; 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
2784 ;; 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
2785 ;; 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
2786
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2787 ;; 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
2788 ;; 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
2789 ;; exposed reside.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2790
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2791 ;; - 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
2792 ;; 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
2793 ;; 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
2794 ;; - 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
2795 ;; opened.
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2796 ;; - 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
2797 ;; 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
2798 ;; exposure:"
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2799 ;; (while spec
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2800 ;; (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
2801 ;; )
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2802 ;; )
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
2803 ;; (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
2804 ;; )
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2805
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2806 ;;;_ - 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
2807 ;;;_ > 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
2808 (defun allout-goto-prefix ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2809 "Put point at beginning of immediately containing outline topic.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2810
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2811 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
2812
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2813 Not sensitive to topic visibility.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2814
46161
29f1f32aee5b (outline-goto-prefix): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 44182
diff changeset
2815 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
2816
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2817 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2818 (let (done)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2819 (while (and (not done)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2820 (search-backward "\n" nil 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2821 (forward-char 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2822 (if (looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2823 (setq done (allout-prefix-data))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2824 (forward-char -1)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2825 (if (bobp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2826 (cond ((looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2827 (allout-prefix-data))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2828 ((allout-next-heading))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2829 (done))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2830 done))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2831 ;;;_ > allout-goto-prefix-doublechecked ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2832 (defun allout-goto-prefix-doublechecked ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2833 "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
2834
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2835 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
2836 `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
2837 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
2838 `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
2839 (if (allout-goto-prefix)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2840 (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
2841 (allout-aberrant-container-p))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2842 (allout-previous-heading)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2843 (point))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2844
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
2845 ;;;_ > 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
2846 (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
2847 "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
2848
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
2849 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
2850 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
2851
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2852 (if (not (allout-goto-prefix-doublechecked))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2853 nil
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2854 (goto-char allout-recent-prefix-end)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2855 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2856 (if ignore-decorations
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2857 t
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2858 (while (looking-at "[0-9]") (forward-char 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
2859 (if (and (not (eolp)) (looking-at "\\s-")) (forward-char 1))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2860 ;; 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
2861 (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
2862 ;;;_ > 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
2863 (defun allout-current-bullet-pos ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
2864 "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
2865
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2866 (if (not (allout-current-depth))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2867 nil
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2868 (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
2869 ;;;_ > 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
2870 (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
2871 "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
2872
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2873 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
2874
df3186ae0953 * allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents: 73201
diff changeset
2875 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
2876 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
2877
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2878 (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
2879 (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
2880 (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
2881 (if (<= (point) bol-point)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2882 (if (interactive-p)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2883 (allout-end-of-prefix)
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2884 (point))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2885 (goto-char (point-min))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
2886 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
2887 ;;;_ > 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
2888 (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
2889 ;;;_ > allout-pre-next-prefix ()
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2890 (defun allout-pre-next-prefix ()
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2891 "Skip forward to just before the next heading line.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2892
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2893 Returns that character position."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2894
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2895 (if (allout-next-heading)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
2896 (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
2897 ;;;_ > 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
2898 (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
2899 "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
2900
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2901 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
2902 visible topic.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2903
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2904 Optional 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
2905 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
2906 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
2907
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2908 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
2909 (interactive "P")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2910 (if current
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2911 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2912 (allout-goto-prefix-doublechecked))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2913 (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
2914 (allout-next-heading)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2915 (while (and (not (eobp))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2916 (> 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
2917 (allout-next-heading))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2918 (if (eobp)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2919 (allout-end-of-entry)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
2920 (forward-char -1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2921 (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
2922 (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
2923 (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
2924 ;;;_ > 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
2925 (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
2926
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2927 "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
2928
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2929 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
2930 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
2931 excluded as delimiting whitespace between topics.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2932
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2933 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
2934 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2935 (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
2936 ;;;_ > 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
2937 (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
2938 "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
2939
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2940 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
2941 \(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
2942 (interactive)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2943 (let ((start-point (point)))
69250
85c3b33d6427 Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents: 69124
diff changeset
2944 (move-beginning-of-line 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2945 (if (< 0 (allout-current-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2946 (goto-char allout-recent-prefix-end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2947 (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
2948 (allout-end-of-prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2949 (if (and (interactive-p)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2950 (= (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
2951 (goto-char (allout-current-bullet-pos)))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2952 ;;;_ > allout-end-of-entry (&optional inclusive)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2953 (defun allout-end-of-entry (&optional inclusive)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2954 "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
2955
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2956 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
2957 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
2958 collapsed."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2959 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2960 (allout-pre-next-prefix)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2961 (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
2962 (forward-char -1))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2963 (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
2964 ;;;_ > 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
2965 (defun allout-end-of-current-heading ()
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
2966 (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
2967 (allout-beginning-of-current-entry)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2968 (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
2969 (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
2970 (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
2971 ;;;_ > allout-get-body-text ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2972 (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
2973 "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
2974 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2975 (allout-end-of-prefix)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2976 (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
2977 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2978 (backward-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2979 (let ((pre-body (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2980 (if (not pre-body)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2981 nil
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
2982 (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
2983 (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
2984 (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
2985 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2986 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2987 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
2988 )
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2989
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2990 ;;;_ - 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
2991 ;;;_ > 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
2992 (defun allout-ascend-to-depth (depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
2993 "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
2994 (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
2995 (let (last-ascended)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2996 (while (and (< depth allout-recent-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2997 (setq last-ascended (allout-ascend))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2998 (goto-char allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
2999 (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
3000 (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
3001 ;;;_ > allout-ascend ()
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3002 (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
3003 "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
3004
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3005 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
3006 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
3007 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
3008 (if dont-move-if-unsuccessful
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3009 (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
3010 (prog1
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3011 (if (allout-beginning-of-level)
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
3012 (let ((bolevel (point))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
3013 (bolevel-depth allout-recent-depth))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
3014 (allout-previous-heading)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3015 (cond ((< allout-recent-depth bolevel-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3016 allout-recent-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3017 ((= allout-recent-depth bolevel-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3018 (if dont-move-if-unsuccessful
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3019 (goto-char dont-move-if-unsuccessful))
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3020 (allout-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3021 nil)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3022 (t
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3023 ;; 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
3024 (goto-char bolevel)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3025 (allout-depth)
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3026 nil))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3027 (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
3028 ;;;_ > 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
3029 (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
3030 "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
3031
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3032 Returning depth if successful, nil if not."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3033 (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
3034 (start-depth (allout-depth)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3035 (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
3036 (and (> (allout-depth) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3037 (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
3038 (allout-next-heading) ; ... go further
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3039 (< 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
3040 (if (and (> (allout-depth) 0)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3041 (= allout-recent-depth depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3042 depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3043 (goto-char start-point)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3044 nil))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3045 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3046 ;;;_ > allout-up-current-level (arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3047 (defun allout-up-current-level (arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3048 "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
3049 (interactive "p")
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3050 (let ((start-point (point)))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3051 (allout-back-to-current-heading)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3052 (if (not (allout-ascend))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3053 (progn (goto-char start-point)
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3054 (error "Can't ascend past outermost level"))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3055 (if (interactive-p) (allout-end-of-prefix))
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
3056 allout-recent-prefix-beginning)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3057
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3058 ;;;_ - 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
3059 ;;;_ > 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
3060 (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
3061 "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
3062
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3063 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
3064
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3065 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
3066
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3067 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
3068
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3069 (if (if backward (bobp) (eobp))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3070 nil
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3071 (let ((target-depth (or depth (allout-depth)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3072 (start-point (point))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3073 (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
3074 (count 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3075 leaping
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3076 last-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3077 (while (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3078 ;; 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
3079 (not leaping)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3080 ;; not at limit:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3081 (not (if backward (bobp) (eobp)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3082 ;; still traversable:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3083 (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
3084 ;; we're below the target depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3085 (> (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
3086 (setq count (1+ count))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3087 (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
3088 (setq leaping t)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3089 (cond (leaping
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3090 (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
3091 (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3092 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3093 (if depth (allout-depth) target-depth)
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 ((and (not (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3096 (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
3097 (= 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
3098 (not (= start-prefix-beginning
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
3099 allout-recent-prefix-beginning)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3100 allout-recent-prefix-beginning)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3101 (t
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3102 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3103 (if depth (allout-depth) target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3104 nil)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3105 ;;;_ > 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
3106 (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
3107 "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
3108
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3109 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
3110
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3111 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
3112
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3113 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
3114
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3115 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
3116
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3117 - 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
3118 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
3119 - 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
3120 some extra navigation
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3121 - 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
3122
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3123 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
3124 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
3125 `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
3126 situation."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3127
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3128 (if (if backward (bobp) (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3129 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3130 (let* ((start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3131 (target-depth (or depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3132 (search-whitespace-regexp nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3133 (depth-biased (- target-depth 2))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3134 (expression (if (<= target-depth 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3135 allout-depth-one-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3136 (format allout-depth-specific-regexp
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3137 depth-biased depth-biased)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3138 found
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3139 done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3140 (while (not done)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3141 (setq found (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3142 (if backward
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3143 (re-search-backward expression nil 'to-limit)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3144 (forward-char 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3145 (re-search-forward expression nil 'to-limit))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3146 (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
3147 (setq found nil))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3148 (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
3149 (if (not found)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3150 (progn (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3151 nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3152 ;; 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
3153 ;; 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
3154 ;; 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
3155 ;; 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
3156 (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
3157 (if (< allout-recent-depth target-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3158 ;; 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
3159 (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3160 (goto-char start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3161 (allout-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3162 nil)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3163 (goto-char found)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3164 ;; locate cursor and set allout-recent-*:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3165 (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
3166 ;;;_ > 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
3167 (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
3168 "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
3169
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3170 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
3171
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3172 Optional BACKWARD reverses direction.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3173
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3174 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
3175 (allout-next-sibling depth (not backward))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3176 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3177 ;;;_ > 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
3178 (defun allout-snug-back ()
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
3179 "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
3180
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3181 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
3182 (if (or (bobp) (eobp))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3183 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3184 (forward-char -1))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3185 (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
3186 nil
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3187 (forward-char -1))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3188 (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
3189 ;;;_ > 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
3190 (defun allout-beginning-of-level ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3191 "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
3192 (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
3193 ;;;_ > 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
3194 (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
3195 "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
3196
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3197 (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
3198 (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
3199 (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
3200 (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
3201 ;;;_ > 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
3202 (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
3203 "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
3204
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3205 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
3206
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3207 (interactive "p")
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3208 (let* ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
3209 (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
3210 (step (if backward -1 1))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3211 prev got)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3212
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3213 (while (> arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3214 (while (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3215 ;; Boundary condition:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3216 (not (if backward (bobp)(eobp)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3217 ;; 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
3218 (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
3219 (error nil))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3220 (allout-beginning-of-current-line))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3221 ;; Deal with apparent header line:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3222 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3223 (if (not (looking-at allout-regexp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3224 ;; not a header line, keep looking:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3225 t
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3226 (allout-prefix-data)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3227 (if (and (allout-do-doublecheck)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3228 (allout-aberrant-container-p))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3229 ;; skip this aberrant prospective header line:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3230 t
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3231 ;; this prospective headerline qualifies - register:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3232 (setq got allout-recent-prefix-beginning)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3233 ;; and break the loop:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3234 nil)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3235 ;; 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
3236 (if got (setq prev got))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3237 (setq arg (1- arg)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3238 (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
3239 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3240 (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
3241 (goto-char prev)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3242 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3243 ((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
3244 ;;;_ > 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
3245 (defun allout-previous-visible-heading (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3246 "Move to the previous heading line.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3247
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3248 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
3249 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
3250 matches)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3251 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3252 (prog1 (allout-next-visible-heading (- arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3253 (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
3254 ;;;_ > 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
3255 (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
3256 "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
3257
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3258 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
3259
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3260 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
3261 (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
3262 (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
3263 (start-arg arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3264 (backward (> 0 arg)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3265 (if (= 0 start-depth)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3266 (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
3267 (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
3268 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3269 (while (and (not (zerop arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3270 (if backward
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3271 (allout-previous-sibling)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3272 (allout-next-sibling)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3273 (setq arg (1- arg)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3274 (if (not (interactive-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3275 nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3276 (allout-end-of-prefix)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3277 (if (not (zerop arg))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3278 (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
3279 (if backward "first" "last")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3280 allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3281 (- (abs start-arg) arg)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3282 (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
3283 ;;;_ > 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
3284 (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
3285 "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
3286 (interactive "p")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3287 (if (interactive-p)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3288 (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
3289 (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
3290 (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
3291
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3292 ;;;_ #5 Alteration
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3293
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3294 ;;;_ - 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
3295 ;;;_ = 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
3296 (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
3297 "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
3298
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3299 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
3300 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
3301 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
3302 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
3303 `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
3304 (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
3305 ;;;_ = allout-command-counter
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3306 (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
3307 "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
3308
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3309 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
3310 coordinating with allout activity.")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3311 (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
3312 ;;;_ > 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
3313 (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
3314 "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
3315
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
3316 - 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
3317 outline commands.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3318
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3319 - 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
3320
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3321 ; 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
3322 (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
3323 nil
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3324
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3325 (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
3326 allout-after-save-decrypt)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3327 (allout-after-saves-handler))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3328
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3329 ;; 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
3330 (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
3331 (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
3332 (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
3333 (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
3334 ))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3335 ;;;_ > 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
3336 (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
3337 "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
3338
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3339 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
3340 topic bullet character.
49962
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3341
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3342 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
3343 reinterpreted as the corresponding control-character in the
13d146080936 (allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 49588
diff changeset
3344 `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
3345 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
3346 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
3347
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
3348 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
3349 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
3350 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
3351 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
3352 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
3353
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3354 (if (not (allout-mode-p))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3355 nil
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3356 ;; Increment allout-command-counter
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
3357 (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
3358 ;; Do hot-spot navigation.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3359 (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
3360 (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
3361 (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
3362 ;;;_ > 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
3363 (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
3364 "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
3365
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3366 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
3367 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
3368 this-command accordingly.
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3369
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3370 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
3371 (interactive)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3372 (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
3373 (char-to-string last-command-char)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3374 (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
3375 ;; 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
3376 ((and (fboundp 'characterp)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3377 (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
3378 (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
3379 (t 0)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3380 mapped-binding)
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3381
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3382 (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
3383 nil
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3384
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3385 (if (and
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3386 ;; exclude control chars and escape:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3387 (<= 33 key-num)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3388 (setq mapped-binding
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3389 (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
3390 ;; translate literal membership on list:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3391 (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
3392 ;; translate as a keybinding:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3393 (key-binding (vconcat allout-command-prefix
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3394 (char-to-string
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3395 (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
3396 (>= 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
3397 (- key-num 96) key-num)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3398 t))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3399 ;; 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
3400 (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
3401 ;; 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
3402 (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
3403
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3404 (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
3405 (setq mapped-binding
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3406 (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
3407
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3408 (if mapped-binding
71915
9315116570f0 (allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents: 71893
diff changeset
3409 (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
3410
48856
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-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
3412 (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
3413 "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
3414
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3415 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
3416 (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
3417 (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
3418 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
3419 (allout-mode t)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3420
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3421 ;;;_ - 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
3422 ;;;_ > 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
3423 (defun allout-solicit-alternate-bullet (depth &optional current-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3424
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3425 "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
3426
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3427 Offer one suitable for current depth DEPTH as default."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3428
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3429 (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
3430 (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
3431 (sans-escapes (regexp-sans-escapes allout-bullets-string))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3432 choice)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3433 (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
3434 (goto-char (allout-current-bullet-pos))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3435 (setq choice (solicit-char-in-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3436 (format "Select bullet: %s ('%s' default): "
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3437 sans-escapes
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3438 (substring-no-properties default-bullet))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3439 sans-escapes
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3440 t)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3441 (message "")
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3442 (if (string= choice "") default-bullet choice))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3443 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3444 ;;;_ > 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
3445 (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
3446 "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
3447 (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
3448 ;;;_ > 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
3449 (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
3450 "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
3451 (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
3452 (string= allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3453 (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
3454 (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
3455 (allout-get-bullet)))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3456 ;;;_ > 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
3457 (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
3458 "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
3459 (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
3460 (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
3461 (if prefix
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3462 (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
3463 (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
3464 ;;;_ > 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
3465 (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
3466 "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
3467 ;; 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
3468 (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
3469 (char-to-string (aref allout-plain-bullets-string
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3470 (% (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
3471 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
3472 allout-primary-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3473 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3474
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3475 ;;;_ - 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
3476 ;;;_ > 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
3477 (defun allout-make-topic-prefix (&optional prior-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3478 new
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3479 depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3480 solicit
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3481 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3482 index)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3483 ;; 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
3484 ;; 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
3485 ;; changing level of current topic.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3486 ;; Solicit dominates specified bullet-char.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3487 ;;;_ . Doc string:
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3488 "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
3489
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3490 All the arguments are optional.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3491
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3492 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
3493 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
3494 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
3495 for instance.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3496
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3497 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
3498 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
3499 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
3500 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
3501 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
3502 bullet or previous sibling.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3503
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3504 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
3505 the current topics' depth.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3506
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3507 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
3508 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
3509 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
3510 distinction or depth) is offered. (This overrides other options,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3511 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
3512 context-specific bullet is used.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3513
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3514 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
3515 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
3516 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
3517 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
3518
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3519 \(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
3520
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3521 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
3522 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
3523 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
3524 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
3525 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
3526 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
3527 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
3528 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
3529 index for each successive sibling)."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3530 ;;;_ . Code:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3531 ;; The options are ordered in likely frequence of use, most common
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3532 ;; highest, least lowest. Ie, more likely to be doing prefix
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3533 ;; adjustments than soliciting, and yet more than numbering.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3534 ;; Current prefix is least dominant, but most likely to be commonly
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3535 ;; specified...
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3536
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3537 (let* (body
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3538 numbering
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3539 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
3540 (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
3541 (header-lead allout-header-prefix)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3542 (bullet-char
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3543
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3544 ;; Getting value for bullet char is practically the whole job:
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 (cond
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3547 ; 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
3548 ((<= depth 1) (setq header-lead "") allout-primary-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3549 ; 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
3550 (allout-old-style-prefixes
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3551 ;; Cheat - make body the whole thing, null out header-lead and
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3552 ;; bullet-char:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3553 (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
3554 (string-to-char allout-primary-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3555 (setq header-lead "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3556 "")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3557
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3558 ;; (Neither level 1 nor old-style, so we're space padding.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3559 ;; 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
3560
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3561 ;; Solicitation overrides numbering and other cases:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3562 ((progn (setq body (make-string (- depth 2) ?\ ))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3563 ;; The actual condition:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3564 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
3565 (let* ((got (allout-solicit-alternate-bullet depth solicit)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3566 ;; 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
3567 (setq numbering (and allout-numbered-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3568 (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
3569 (string= got allout-numbered-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3570 ;; Now return what we got, regardless:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3571 got))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3572
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3573 ;; 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
3574 ((and allout-numbered-bullet number-control)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3575 (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
3576 allout-numbered-bullet
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3577 (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
3578 (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
3579 prior-bullet)))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3580 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
3581 (allout-bullet-for-depth depth))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3582
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3583 ;;; Neither soliciting nor controlled numbering ;;;
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3584 ;;; (may be controlled denumbering, tho) ;;;
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 ;; Check wrt previous sibling:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3587 ((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
3588 (<= 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
3589 allout-numbered-bullet ; ... & numbering enabled
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3590 (not denumbering)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3591 (let ((sibling-bullet
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3592 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3593 ;; 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
3594 (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
3595 (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
3596 (allout-get-bullet))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3597 (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
3598 (string= allout-numbered-bullet sibling-bullet))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3599 (setq numbering sibling-bullet)))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3600
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3601 ;; Distinctive prior bullet?
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3602 ((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
3603 (allout-distinctive-bullet prior-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3604 ;; 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
3605 (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
3606 (string= prior-bullet allout-numbered-bullet)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3607 ;; or numbered, and not denumbering:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3608 (setq numbering (not denumbering)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3609 ;; Here 'tis:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3610 prior-bullet))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3611
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3612 ;; 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
3613 ((allout-bullet-for-depth depth)))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3614
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3615 (concat header-lead
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3616 body
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3617 bullet-char
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3618 (if numbering
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3619 (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
3620 (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
3621 ((allout-sibling-index))))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3622 )
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-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
3625 (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
3626 "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
3627
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3628 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
3629 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
3630 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
3631
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3632 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
3633 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
3634 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
3635 case.)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3636
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3637 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
3638
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3639 Nuances:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3640
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3641 - 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
3642 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
3643
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3644 - 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
3645 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
3646 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
3647 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
3648 deliberately dividing topic bodies.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3649
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3650 - 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
3651 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
3652 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
3653 single-spacing is used.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3654
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3655 - 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
3656 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
3657 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
3658 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
3659 from there."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3660
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3661 (allout-beginning-of-current-line)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3662 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3663 (let* ((inhibit-field-text-motion t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3664 (depth (+ (allout-current-depth) relative-depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3665 (opening-on-blank (if (looking-at "^\$")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3666 (not (setq before nil))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3667 ;; bunch o vars set while computing ref-topic
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3668 opening-numbered
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3669 ref-depth
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3670 ref-bullet
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3671 (ref-topic (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3672 (cond ((< relative-depth 0)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3673 (allout-ascend-to-depth depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3674 ((>= relative-depth 1) nil)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3675 (t (allout-back-to-current-heading)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3676 (setq ref-depth allout-recent-depth)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3677 (setq ref-bullet
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3678 (if (> allout-recent-prefix-end 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3679 (allout-recent-bullet)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3680 ""))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3681 (setq opening-numbered
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3682 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3683 (and allout-numbered-bullet
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3684 (or (<= relative-depth 0)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3685 (allout-descend-to-depth depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3686 (if (allout-numbered-type-prefix)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3687 allout-numbered-bullet))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3688 (point)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3689 dbl-space
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3690 doing-beginning
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3691 start end)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3692
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3693 (if (not opening-on-blank)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3694 ; Positioning and vertical
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3695 ; padding - only if not
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3696 ; opening-on-blank:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3697 (progn
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3698 (goto-char ref-topic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3699 (setq dbl-space ; Determine double space action:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3700 (or (and (<= relative-depth 0) ; not descending;
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3701 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3702 ;; at b-o-b or preceded by a blank line?
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3703 (or (> 0 (forward-line -1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3704 (looking-at "^\\s-*$")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3705 (bobp)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3706 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3707 ;; succeeded by a blank line?
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3708 (allout-end-of-current-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3709 (looking-at "\n\n")))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3710 (and (= ref-depth 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3711 (or before
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3712 (= depth 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3713 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3714 ;; Don't already have following
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3715 ;; vertical padding:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3716 (not (allout-pre-next-prefix)))))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3717
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3718 ;; Position to prior heading, if inserting backwards, and not
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3719 ;; going outwards:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3720 (if (and before (>= relative-depth 0))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3721 (progn (allout-back-to-current-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3722 (setq doing-beginning (bobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3723 (if (not (bobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3724 (allout-previous-heading)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3725 (if (and before (bobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3726 (open-line 1)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3727
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3728 (if (<= relative-depth 0)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3729 ;; Not going inwards, don't snug up:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3730 (if doing-beginning
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3731 (if (not dbl-space)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3732 (open-line 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3733 (open-line 2))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3734 (if before
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3735 (progn (end-of-line)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3736 (allout-pre-next-prefix)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3737 (while (and (= ?\n (following-char))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3738 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3739 (forward-char 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3740 (allout-hidden-p)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3741 (forward-char 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3742 (if (not (looking-at "^$"))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3743 (open-line 1)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3744 (allout-end-of-current-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3745 (if (looking-at "\n\n") (forward-char 1))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3746 ;; Going inwards - double-space if first offspring is
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3747 ;; double-spaced, otherwise snug up.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3748 (allout-end-of-entry)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3749 (if (eobp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3750 (newline 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3751 (line-move 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3752 (allout-beginning-of-current-line)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3753 (backward-char 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3754 (if (bolp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3755 ;; Blank lines between current header body and next
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3756 ;; header - get to last substantive (non-white-space)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3757 ;; line in body:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3758 (progn (setq dbl-space t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3759 (re-search-backward "[^ \t\n]" nil t)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3760 (if (looking-at "\n\n")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3761 (setq dbl-space t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3762 (if (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3763 (allout-next-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3764 (when (> allout-recent-depth ref-depth)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3765 ;; This is an offspring.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3766 (forward-line -1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3767 (looking-at "^\\s-*$")))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3768 (progn (forward-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3769 (open-line 1)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3770 (forward-line 1)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3771 (allout-end-of-current-line))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3772
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3773 ;;(if doing-beginning (goto-char doing-beginning))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3774 (if (not (bobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3775 ;; We insert a newline char rather than using open-line to
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3776 ;; avoid rear-stickiness inheritence of read-only property.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3777 (progn (if (and (not (> depth ref-depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3778 (not before))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3779 (open-line 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3780 (if (and (not dbl-space) (> depth ref-depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3781 (newline 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3782 (if dbl-space
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3783 (open-line 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3784 (if (not before)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3785 (newline 1)))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3786 (if (and dbl-space (not (> relative-depth 0)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3787 (newline 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3788 (if (and (not (eobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3789 (or (not (bolp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3790 (and (not (bobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3791 ;; bolp doesnt detect concealed
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3792 ;; trailing newlines, compensate:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3793 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3794 (forward-char -1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3795 (allout-hidden-p)))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3796 (forward-char 1))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3797 ))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3798 (setq start (point))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3799 (insert (concat (allout-make-topic-prefix opening-numbered t depth)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3800 " "))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3801 (setq end (1+ (point)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3802
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3803 (allout-rebullet-heading (and offer-recent-bullet ref-bullet)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3804 depth nil nil t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3805 (if (> relative-depth 0)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3806 (save-excursion (goto-char ref-topic)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3807 (allout-show-children)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3808 (end-of-line)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3809
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3810 (run-hook-with-args 'allout-structure-added-hook start end)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3811 )
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3812 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3813 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3814 ;;;_ > allout-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
3815 (defun allout-open-subtopic (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3816 "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
3817
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3818 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
3819 prior to the current one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3820 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3821 (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
3822 ;;;_ > 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
3823 (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
3824 "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
3825
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3826 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
3827
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3828 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
3829 one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3830 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3831 (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
3832 ;;;_ > 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
3833 (defun allout-open-supertopic (arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3834 "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
3835
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3836 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
3837 topic prior to the current one."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3838
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3839 (interactive "p")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3840 (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
3841
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3842 ;;;_ - Outline Alteration
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3843 ;;;_ : 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
3844 ;;;_ = 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
3845 (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
3846 "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
3847 ;;;_ > 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
3848 (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
3849 "`allout-mode' autofill function.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3850
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
3851 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
3852 `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
3853
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3854 (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
3855 (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
3856 ;; Check for topic header indentation:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3857 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3858 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3859 (beginning-of-line)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3860 (if (looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3861 ;; ... construct indentation to account for
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3862 ;; length of topic prefix:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3863 (make-string (progn (allout-end-of-prefix)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3864 (current-column))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
3865 ?\ ))))))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3866 (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
3867 auto-fill-function
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3868 'do-auto-fill)))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
3869 (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
3870 (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
3871 ;;;_ > 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
3872 (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
3873 "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
3874
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3875 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
3876 be accommodated.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3877
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3878 Note that refill of indented paragraphs is not done."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3879
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3880 (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
3881 (allout-end-of-prefix)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3882 (let* ((new-margin (current-column))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3883 excess old-indent-begin old-indent-end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3884 ;; 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
3885 ;; *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
3886 ;; 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
3887 (old-margin (+ old-depth (- new-margin new-depth))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3888
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3889 ;; 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
3890 (allout-unprotected
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3891 (save-match-data
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3892 (while
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
3893 (and (re-search-forward "\n\\(\\s-*\\)"
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3894 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3895 t)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3896 ;; Register the indent data, before we reset the
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
3897 ;; 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
3898 (setq old-indent-begin (match-beginning 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3899 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
3900 (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
3901 (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
3902 old-margin)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3903 ;; 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
3904 nil
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3905 ;; 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
3906 ;; reindent it, preserving its existing indentation
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3907 ;; beyond the old margin:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3908 (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
3909 (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
3910 ;;;_ > 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
3911 (defun allout-rebullet-current-heading (arg)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3912 "Solicit new bullet for current visible heading."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3913 (interactive "p")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3914 (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
3915 (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
3916 from to
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3917 (backwards (if (< arg 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3918 (setq arg (* arg -1)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3919 (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
3920 (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
3921 (allout-end-of-prefix)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3922 (setq from allout-recent-prefix-beginning
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3923 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
3924 (allout-rebullet-heading t ;;; solicit
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3925 nil ;;; depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3926 nil ;;; number-control
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3927 nil ;;; index
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3928 t) ;;; do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3929 (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
3930 from to t))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3931 (setq arg (1- arg))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3932 (if (<= arg 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3933 nil
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3934 (setq initial-col nil) ; Override positioning back to init col
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3935 (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
3936 (allout-next-visible-heading 1)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3937 (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
3938 (allout-next-visible-heading -1))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3939 (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
3940 (cond (on-bullet (goto-char (allout-current-bullet-pos)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3941 (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
3942 ;;;_ > 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
3943 (defun allout-rebullet-heading (&optional solicit
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3944 new-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3945 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3946 index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3947 do-successors)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3948
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3949 "Adjust bullet of current topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3950
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3951 All args are optional.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3952
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3953 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
3954 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
3955 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
3956 distinction or depth) is offered. If non-nil, then the
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
3957 context-specific bullet is just used.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3958
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3959 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
3960 of the topic's current depth.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3961
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3962 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
3963 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
3964 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
3965 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
3966 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
3967
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
3968 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
3969 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
3970 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
3971 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
3972 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
3973 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
3974 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
3975
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3976 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
3977 siblings.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3978
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3979 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
3980 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
3981 this function."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3982
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
3983 (let* ((current-depth (allout-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3984 (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
3985 (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
3986 (me allout-recent-prefix-end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
3987 (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
3988 (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
3989 (new-prefix (allout-make-topic-prefix current-bullet
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3990 nil
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3991 new-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3992 solicit
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3993 number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3994 index)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3995
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
3996 ;; Is new one is identical to old?
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3997 (if (and (= current-depth new-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3998 (string= current-bullet
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3999 (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
4000 ;; Nothing to do:
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4001 t
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4002
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4003 ;; New prefix probably different from old:
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4004 ; 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
4005 (allout-unprotected (delete-region mb me))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4006 (goto-char mb)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4007 ; Dispense with number if
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4008 ; numbered-bullet prefix:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4009 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4010 (if (and allout-numbered-bullet
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4011 (string= allout-numbered-bullet current-bullet)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4012 (looking-at "[0-9]+"))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4013 (allout-unprotected
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4014 (delete-region (match-beginning 0)(match-end 0)))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4015
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4016 ;; 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
4017 (if has-annotation
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4018 (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
4019 new-prefix))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4020
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4021 ; 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
4022 (allout-unprotected (insert new-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4023
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4024 ;; 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
4025 (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
4026 (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
4027 (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
4028 (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
4029
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4030 ;; 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
4031 ;; caller elected for it:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4032 (if do-successors
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4033 (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
4034 (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
4035 (setq index
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4036 (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
4037 ((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
4038 (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
4039 (allout-rebullet-heading nil ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4040 new-depth ;;; new-depth
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4041 number-control;;; number-control
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4042 index ;;; index
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4043 nil))))) ;;;(dont!)do-successors
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4044 ) ; (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
4045 ) ; let* ((current-depth (allout-depth))...)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4046 ) ; 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
4047 ;;;_ > allout-rebullet-topic (arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4048 (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
4049 "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
4050
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4051 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
4052
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4053 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
4054 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
4055 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
4056 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
4057 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
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4059 With repeat count, shift topic depth by that amount."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4060 (interactive "P")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4061 (let ((start-col (current-column)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4062 (save-excursion
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4063 ;; Normalize arg:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4064 (cond ((null arg) (setq arg 0))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4065 ((listp arg) (setq arg (car arg))))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4066 ;; 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
4067 (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
4068 (allout-back-to-current-heading)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4069 (if (<= (+ allout-recent-depth arg) 0)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4070 (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
4071 (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
4072 (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
4073 (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
4074 ;;;_ > 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
4075 (defun allout-rebullet-topic-grunt (&optional relative-depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4076 starting-depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4077 starting-point
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4078 index
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4079 do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4080 sans-offspring)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4081 "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
4082 \(visible or not).
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4083
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4084 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
4085
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4086 All arguments are optional.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4087
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4088 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
4089 topic that amount.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4090
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4091 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
4092 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
4093
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4094 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
4095 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
4096 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
4097 \"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
4098 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
4099
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4100 ;; 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
4101 ;; need simplification with refactoring.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4102
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4103 (if (and sans-offspring
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4104 relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4105 (< relative-depth 0))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4106 (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
4107 " would cause containment discontinuity.")))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4108
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4109 (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
4110 (new-depth (allout-depth))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4111 (starting-depth (or starting-depth new-depth))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4112 (on-starting-call (null starting-point))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4113 (index (or index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4114 ;; Leave index null on starting call, so rebullet-heading
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4115 ;; calculates it at what might be new depth:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4116 (and (or (zerop relative-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4117 (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
4118 (allout-sibling-index))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4119 (starting-index index)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4120 (moving-outwards (< 0 relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4121 (starting-point (or starting-point (point)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4122 (local-point (point)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4123
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4124 ;; Sanity check for excessive promotion done only on starting call:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4125 (and on-starting-call
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4126 moving-outwards
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4127 (> 0 (+ starting-depth relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4128 (error "Attempt to shift topic out beyond level 1"))
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 (cond ((= starting-depth new-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4131 ;; 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
4132
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4133 ;; 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
4134 ;; 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
4135 ;; 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
4136 (if (>= relative-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4137 (allout-rebullet-heading nil
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4138 (+ starting-depth relative-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4139 nil ;;; number
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4140 index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4141 nil)) ;;; do-successors
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4142 (when (not sans-offspring)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4143 ;; ... 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
4144 (setq index 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4145 (allout-next-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4146 (while (and (not (eobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4147 (< starting-depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4148 (setq index (1+ index))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4149 (allout-rebullet-topic-grunt relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4150 (1+ starting-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4151 starting-point
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4152 index)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4153 (when (< relative-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4154 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4155 (goto-char local-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4156 (allout-rebullet-heading nil ;;; solicit
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4157 (+ starting-depth relative-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4158 nil ;;; number
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4159 starting-index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4160 nil)))) ;;; do-successors
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4161
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4162 ((< starting-depth new-depth)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4163 ;; Rare case - subtopic more than one level deeper than parent.
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4164 ;; 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
4165 (allout-rebullet-topic-grunt relative-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4166 new-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4167 starting-point
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4168 index
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4169 sans-offspring)))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4170
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4171 (if on-starting-call
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4172 (progn
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4173 ;; Rectify numbering of former siblings of the adjusted topic,
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4174 ;; if topic has changed depth
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4175 (if (or do-successors
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4176 (and (not (zerop relative-depth))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4177 (or (= allout-recent-depth starting-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4178 (= allout-recent-depth (+ starting-depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4179 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
4180 (allout-rebullet-heading nil nil nil nil t))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4181 ;; Now rectify numbering of new siblings of the adjusted topic,
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4182 ;; if depth has been changed:
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4183 (progn (goto-char starting-point)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4184 (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
4185 (allout-rebullet-heading nil nil nil nil t)))))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4186 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4187 )
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4188 ;;;_ > 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
4189 (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
4190 "Renumber siblings at current depth.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4191
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4192 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
4193
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4194 Returns final depth."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4195
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4196 ;; 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
4197 ;; 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
4198
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4199 (let ((ascender (allout-depth))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4200 was-eobp)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4201 (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
4202 (allout-depth)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4203 (>= allout-recent-depth depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4204 (>= ascender depth))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4205 ; Skip over all topics at
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4206 ; lesser depths, which can not
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4207 ; have been disturbed:
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4208 (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
4209 (> 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
4210 (allout-next-heading))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4211 ; Prime ascender for ascension:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4212 (setq ascender (1- allout-recent-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4213 (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
4214 (allout-rebullet-heading nil ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4215 nil ;;; depth
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4216 nil ;;; number-control
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4217 nil ;;; index
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4218 t)) ;;; do-successors
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4219 (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
4220 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
4221 ;;;_ > 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
4222 (defun allout-number-siblings (&optional denumber)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4223 "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
4224
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4225 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
4226 topic and its siblings.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4227
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4228 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
4229 rebulleting each topic at this level."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4230
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4231 (interactive "P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4232
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4233 (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
4234 (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
4235 (allout-beginning-of-level)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4236 (let ((depth allout-recent-depth)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4237 (index (if (not denumber) 1))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4238 (use-bullet (equal '(16) denumber))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4239 (more t))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4240 (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
4241 (allout-rebullet-heading use-bullet ;;; solicit
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4242 depth ;;; depth
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4243 t ;;; number-control
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4244 index ;;; index
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4245 nil) ;;; do-successors
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4246 (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
4247 (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
4248 ;;;_ > 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
4249 (defun allout-shift-in (arg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4250 "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
4251
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4252 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
4253 `allout-shift-out', instead.
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 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
4256 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
4257 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
4258
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4259 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
4260 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
4261 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
4262 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
4263 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
4264
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-out (* arg -1))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4268 ;; refuse to create a containment discontinuity:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4269 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4270 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4271 (if (not (bobp))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4272 (let* ((current-depth allout-recent-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4273 (start-point (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4274 (predecessor-depth (progn
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4275 (forward-char -1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4276 (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4277 (if (< (point) start-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4278 allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4279 0))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4280 (if (and (> predecessor-depth 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4281 (> (1+ current-depth)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4282 (1+ predecessor-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4283 (error (concat "Disallowed shift deeper than"
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4284 " containing topic's children."))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4285 (allout-back-to-current-heading)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4286 (if (< allout-recent-depth (1+ current-depth))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
4287 (allout-show-children))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4288 (let ((where (point)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4289 (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
4290 (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
4291 ;;;_ > 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
4292 (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
4293 "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
4294 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
4295
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4296 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
4297 `allout-shift-in', instead.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4298
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4299 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
4300 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
4301 the item.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4302
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4303 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
4304 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
4305 subtopics into siblings of the item."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4306 (interactive "p")
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4307 (if (< arg 0)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4308 (allout-shift-in (* arg -1))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4309 ;; Get proper exposure in this area:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4310 (save-excursion (if (allout-ascend)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4311 (allout-show-children)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4312 ;; 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
4313 ;; their sibling:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4314 (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
4315 (save-excursion (allout-next-sibling)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4316 (allout-show-children))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4317 (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
4318 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4319 (if (> arg 1)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4320 ;; 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
4321 (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
4322 (if (listp (car children-chart))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4323 ;; whoops:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4324 (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
4325 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4326 (dolist (child-point children-chart)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4327 (goto-char child-point)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4328 (allout-shift-out 1))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4329 (allout-rebullet-topic (* arg -1))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4330 (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
4331 ;;;_ : 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
4332 ;;;_ > 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
4333 (defun allout-kill-line (&optional arg)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4334 "Kill line, adjusting subsequent lines suitably for outline mode."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4335
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4336 (interactive "*P")
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4337
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4338 (if (or (not (allout-mode-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4339 (not (bolp))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4340 (not (save-match-data (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
4341 ;; Just do a regular kill:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4342 (kill-line arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4343 ;; Ah, have to watch out for adjustments:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4344 (let* ((beg (point))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4345 end
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4346 (beg-hidden (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4347 (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
4348 (setq end (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4349 (allout-hidden-p)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4350 (depth (allout-depth)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4351
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4352 (allout-annotate-hidden beg end)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4353 (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
4354 (allout-unprotected (kill-line arg))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4355 (kill-line arg))
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4356 (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
4357
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4358 (if allout-numbered-bullet
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4359 (save-excursion ; Renumber subsequent topics if needed:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4360 (if (not (save-match-data (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
4361 (allout-next-heading))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4362 (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
4363 (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
4364 ;;;_ > 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
4365 (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
4366 "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
4367 (interactive)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4368 (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
4369 (condition-case nil
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4370 (allout-kill-line)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4371 (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
4372 ;;;_ > 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
4373 (defun allout-kill-topic ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4374 "Kill topic together with subtopics.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4375
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4376 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
4377
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4378 - 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
4379 - 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
4380 - 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
4381 previous one.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4382
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4383 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
4384 allout-yank-processing for exposure recovery."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4385
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4386 (interactive)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4387 (let* ((inhibit-field-text-motion t)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4388 (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
4389 end
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4390 (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
4391 (allout-end-of-current-subtree)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4392 (if (and (/= (current-column) 0) (not (eobp)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4393 (forward-char 1))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4394 (if (not (eobp))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4395 (if (and (save-match-data (looking-at "\n"))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4396 (or (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4397 (or (not (allout-next-heading))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4398 (= depth allout-recent-depth)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4399 (and (> (- beg (point-min)) 3)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4400 (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
4401 (forward-char 1)))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4402
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4403 (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
4404 (unwind-protect
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4405 (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
4406 (if buffer-read-only
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4407 ;; 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
4408 (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
4409
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4410 (save-excursion
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4411 (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
4412 (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
4413 ;;;_ > 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
4414 (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
4415 "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
4416 (interactive)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4417 (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
4418 (condition-case nil
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4419 (allout-kill-topic)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4420 (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
4421 ;;;_ > allout-annotate-hidden (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4422 (defun allout-annotate-hidden (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4423 "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
4424
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4425 (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
4426 (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
4427 (allout-deannotate-hidden begin end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4428 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4429 (goto-char begin)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4430 (let (done next prev overlay)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4431 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4432 ;; 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
4433 (if (not (allout-hidden-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4434 (setq next
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4435 (max (1+ (point))
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4436 (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
4437 'invisible
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
4438 nil end))))
72873
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 ;; 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
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 (allout-hidden-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4445 ;; 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
4446 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4447 (setq overlay (allout-get-invisibility-overlay))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4448 (setq next (overlay-end overlay)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4449 prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4450 ;; 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
4451 (when next
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4452 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4453 (allout-unprotected
73660
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4454 (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
4455 (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
4456 'allout-was-hidden t)))))))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4457 (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
4458 ;;;_ > 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
4459 (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
4460 "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
4461
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4462 (allout-unprotected
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4463 (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
4464 (buffer-undo-list t))
4a5c7b0a29cc 2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents: 73315
diff changeset
4465 ;(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
4466 )))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4467 ;;;_ > allout-hide-by-annotation (begin end)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4468 (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
4469 "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
4470 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4471 (goto-char begin)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4472 (let ((was-modified (buffer-modified-p))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4473 done next prev)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4474 (while (not done)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4475 ;; 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
4476 (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
4477 (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
4478 'allout-was-hidden
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4479 nil end)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4480 (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
4481 ;; 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
4482 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4483 (goto-char next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4484 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4485 (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
4486 ;; still not at start of annotation.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4487 (setq done t)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4488 ;; 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
4489 (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
4490 'allout-was-hidden
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4491 nil end))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4492 (overlay-put (make-overlay prev next nil 'front-advance)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4493 '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
4494 (allout-deannotate-hidden prev next)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4495 (setq prev next)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4496 (if next (goto-char next)))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4497 (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
4498 ;;;_ > 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
4499 (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
4500
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4501 "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
4502
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4503 Does depth adjustment of yanked topics, when:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4504
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4505 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
4506 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
4507 topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4508
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4509 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
4510
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4511 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
4512 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
4513 header into which it's being yanked.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4514
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4515 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
4516 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
4517 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
4518
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4519 (interactive "*P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4520 ; Get to beginning, leaving
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4521 ; region around subject:
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4522 (if (< (allout-mark-marker t) (point))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4523 (exchange-point-and-mark))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4524 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4525 (let* ((subj-beg (point))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4526 (into-bol (bolp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4527 (subj-end (allout-mark-marker t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4528 ;; 'resituate' if yanking an entire topic into topic header:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4529 (resituate (and (let ((allout-inhibit-aberrance-doublecheck t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4530 (allout-e-o-prefix-p))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4531 (looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4532 (allout-prefix-data)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4533 ;; `rectify-numbering' if resituating (where several topics may
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4534 ;; be resituating) or yanking a topic into a topic slot (bol):
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4535 (rectify-numbering (or resituate
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4536 (and into-bol
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4537 (looking-at allout-regexp)))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4538 (if resituate
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4539 ;; Yanking a topic into the start of a topic - reconcile to fit:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4540 (let* ((inhibit-field-text-motion t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4541 (prefix-len (if (not (match-end 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4542 1
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4543 (- (match-end 1) subj-beg)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4544 (subj-depth allout-recent-depth)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4545 (prefix-bullet (allout-recent-bullet))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4546 (adjust-to-depth
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4547 ;; Nil if adjustment unnecessary, otherwise depth to which
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4548 ;; adjustment should be made:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4549 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4550 (and (goto-char subj-end)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4551 (eolp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4552 (goto-char subj-beg)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4553 (and (looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4554 (progn
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4555 (beginning-of-line)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4556 (not (= (point) subj-beg)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4557 (looking-at allout-regexp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4558 (allout-prefix-data))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4559 allout-recent-depth)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4560 (more t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4561 (setq rectify-numbering allout-numbered-bullet)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4562 (if adjust-to-depth
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4563 ; Do the adjustment:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4564 (progn
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4565 (save-restriction
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4566 (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
4567 ; Trim off excessive blank
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4568 ; line at end, if any:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4569 (goto-char (point-max))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4570 (if (looking-at "^$")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4571 (allout-unprotected (delete-char -1)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4572 ; Work backwards, with each
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4573 ; shallowest level,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4574 ; successively excluding the
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4575 ; last processed topic from
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4576 ; the narrow region:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4577 (while more
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4578 (allout-back-to-current-heading)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4579 ; go as high as we can in each bunch:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4580 (while (allout-ascend t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4581 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4582 (allout-unprotected
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4583 (allout-rebullet-topic-grunt (- adjust-to-depth
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4584 subj-depth)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4585 (allout-depth))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4586 (if (setq more (not (bobp)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4587 (progn (widen)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4588 (forward-char -1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4589 (narrow-to-region subj-beg (point))))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4590 ;; Preserve new bullet if it's a distinctive one, otherwise
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4591 ;; use old one:
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4592 (if (string-match (regexp-quote prefix-bullet)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4593 allout-distinctive-bullets-string)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4594 ; Delete from bullet of old to
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4595 ; before bullet of new:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4596 (progn
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4597 (beginning-of-line)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4598 (allout-unprotected
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4599 (delete-region (point) subj-beg))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4600 (set-marker (allout-mark-marker t) subj-end)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4601 (goto-char subj-beg)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4602 (allout-end-of-prefix))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4603 ; Delete base subj prefix,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4604 ; leaving old one:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4605 (allout-unprotected
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4606 (progn
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4607 (delete-region (point) (+ (point)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4608 prefix-len
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4609 (- adjust-to-depth
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4610 subj-depth)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4611 ; and delete residual subj
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4612 ; prefix digits and space:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4613 (while (looking-at "[0-9]") (delete-char 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4614 (if (looking-at " ")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4615 (delete-char 1))))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4616 (exchange-point-and-mark))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4617 (if rectify-numbering
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4618 (progn
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4619 (save-excursion
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4620 ; Give some preliminary feedback:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4621 (message "... reconciling numbers")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4622 ; ... and renumber, in case necessary:
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4623 (goto-char subj-beg)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4624 (if (allout-goto-prefix-doublechecked)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4625 (allout-unprotected
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4626 (allout-rebullet-heading nil ;;; solicit
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4627 (allout-depth) ;;; depth
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4628 nil ;;; number-control
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4629 nil ;;; index
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4630 t)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4631 (message ""))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4632 (if (or into-bol resituate)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4633 (allout-hide-by-annotation (point) (allout-mark-marker t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4634 (allout-deannotate-hidden (allout-mark-marker t) (point)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4635 (if (not resituate)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4636 (exchange-point-and-mark))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4637 (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
4638 ;;;_ > 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
4639 (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
4640 "`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
4641
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4642 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
4643
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4644 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
4645 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
4646
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4647 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
4648 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
4649 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
4650 topic prefix.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4651
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4652 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
4653 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
4654 header into which it's being yanked.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4655
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4656 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
4657 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
4658 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
4659 exactly like normal yanks.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4660
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
4661 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
4662 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
4663
64283
d57ad48e7901 (my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
4664 `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
4665 works with normal `yank' in non-outline buffers."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4666
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4667 (interactive "*P")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4668 (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
4669 (allout-unprotected
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4670 (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
4671 (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
4672 (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
4673 ;;;_ > 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
4674 (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
4675 "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
4676
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4677 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
4678
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4679 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
4680 by pops to non-distinctive yanks. Bug..."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4681
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4682 (interactive "*p")
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4683 (setq this-command 'yank)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4684 (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
4685 (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
4686 (allout-yank-processing)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4687
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4688 ;;;_ - Specialty bullet functions
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4689 ;;;_ : 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
4690 ;;;_ > 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
4691 (defun allout-resolve-xref ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4692 "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
4693
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4694 \(Works according to setting of `allout-file-xref-bullet')."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4695 (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
4696 (if (not allout-file-xref-bullet)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4697 (error
64428
e55dd693f95b (allout-resolve-xref): Fix typos in error strings.
Juanma Barranquero <lekktu@gmail.com>
parents: 64400
diff changeset
4698 "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
4699 (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
4700 (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
4701 allout-file-xref-bullet)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4702 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4703 file-name)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4704 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4705 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4706 (let* ((text-start allout-recent-prefix-end)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4707 (heading-end (progn (end-of-line) (point))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4708 (goto-char text-start)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4709 (setq file-name
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4710 (if (re-search-forward "\\s-\\(\\S-*\\)" heading-end t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4711 (buffer-substring (match-beginning 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4712 (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
4713 (setq file-name (expand-file-name file-name))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4714 (if (or (file-exists-p file-name)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4715 (if (file-writable-p file-name)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4716 (y-or-n-p (format "%s not there, create one? "
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4717 file-name))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4718 (error "%s not found and can't be created" file-name)))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4719 (condition-case failure
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4720 (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
4721 (error failure))
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4722 (error "%s not found" file-name))
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4723 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4724 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4725 )
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4726 )
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4727
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4728 ;;;_ #6 Exposure Control
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4729
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4730 ;;;_ - Fundamental
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4731 ;;;_ > 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
4732 (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
4733 "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
4734
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4735 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
4736 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
4737 `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
4738 invoked.)"
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
4739
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4740 ;; 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
4741 (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
4742 (when flag
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4743 (let ((o (make-overlay from to nil 'front-advance)))
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4744 (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
4745 (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
4746 (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
4747 (while props
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4748 (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
4749 (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
4750 (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
4751 ;;;_ > 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
4752 (defun allout-flag-current-subtree (flag)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4753 "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
4754
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4755 (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
4756 (allout-back-to-current-heading)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4757 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4758 (end-of-line))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4759 (allout-flag-region (point)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4760 ;; Exposing must not leave trailing blanks hidden,
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4761 ;; 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
4762 ;; can use flag's inverse as the
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4763 ;; include-trailing-blank cue:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4764 (allout-end-of-current-subtree (not flag))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4765 flag)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4766
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4767 ;;;_ - Topic-specific
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4768 ;;;_ > allout-show-entry ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
4769 (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
4770 "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
4771
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4772 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
4773 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
4774 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
4775 the exposure."
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4776
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4777 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4778 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4779 (let (beg end)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4780 (allout-goto-prefix-doublechecked)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4781 (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
4782 (setq end (allout-pre-next-prefix))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4783 (allout-flag-region beg end nil)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
4784 (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
4785 ;;;_ > 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
4786 (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
4787
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4788 "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
4789
48857
8641226163f1 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48856
diff changeset
4790 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
4791
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4792 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
4793 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
4794
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4795 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
4796 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
4797 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
4798 it.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4799
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4800 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
4801 point of non-opened subtree?)"
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4802
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4803 (interactive "p")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4804 (let ((start-point (point)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4805 (if (and (not strict)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4806 (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4807
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4808 (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
4809 ; expose it.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4810 ;; 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
4811 ;; infinite regress:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4812 (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
4813
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4814 (save-excursion
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4815 (allout-beginning-of-current-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4816 (save-restriction
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4817 (let* (depth
73201
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4818 ;; 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
4819 ;; 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
4820 (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
4821 ((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
4822 (t level)))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4823 (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
4824 (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
4825 ;; interactive, show discontinuous children:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4826 (and chart
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4827 (interactive-p)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4828 (save-excursion
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4829 (allout-back-to-current-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4830 (setq depth (allout-current-depth))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4831 (and (allout-next-heading)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4832 (> allout-recent-depth
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4833 (1+ depth))))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4834 (message
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4835 "Discontinuous offspring; use `%s %s'%s."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4836 (substitute-command-keys
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4837 "\\[universal-argument]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4838 (substitute-command-keys
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4839 "\\[allout-shift-out]")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4840 " to elevate them.")
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4841 (allout-chart-to-reveal
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4842 chart (- allout-recent-depth depth))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4843 (goto-char start-point)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4844 (when (and strict (allout-hidden-p))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4845 ;; 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
4846 ;; unless strict was set.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4847 (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
4848 (when allout-show-bodies
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4849 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4850 (allout-show-current-entry)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4851 (while to-reveal
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4852 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4853 (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
4854 (progn (search-forward "\n" nil t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4855 (1- (point)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4856 nil)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4857 (when allout-show-bodies
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4858 (goto-char (car to-reveal))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4859 (allout-show-current-entry))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4860 (setq to-reveal (cdr to-reveal)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4861 ;; 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
4862 ;; within invisible text:
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4863 (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
4864 ;;;_ > 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
4865 (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
4866 "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
4867
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4868 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
4869 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4870 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4871 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4872 (orig-pt (point))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4873 (orig-pref (allout-goto-prefix-doublechecked))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4874 (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
4875 (bag-it 0))
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
4876 (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
4877 (while (allout-hidden-p)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4878 (move-beginning-of-line 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4879 (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
4880 (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
4881 ;; 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
4882 ;; 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
4883 (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
4884 (allout-show-current-subtree)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4885 (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
4886 (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
4887 (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
4888 (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
4889 "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
4890 (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
4891 (allout-show-children)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4892 (goto-char orig-pref)))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4893 (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
4894 (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
4895 (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
4896 ;;;_ > 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
4897 (defun allout-hide-current-entry ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4898 "Hide the body directly following this heading."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4899 (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
4900 (allout-back-to-current-heading)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4901 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4902 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4903 (end-of-line))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4904 (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
4905 (progn (allout-end-of-entry) (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4906 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
4907 ;;;_ > 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
4908 (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
4909 "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
4910
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4911 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4912 (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
4913 (allout-hide-current-entry)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4914 (save-excursion (allout-show-to-offshoot))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4915 (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
4916 (allout-flag-region (point)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4917 (progn (allout-end-of-entry t) (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4918 nil)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
4919 )))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
4920 ;;;_ > 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
4921 (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
4922 "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
4923 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
4924 (interactive "P")
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4925 (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
4926 (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
4927 ;; 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
4928 (if (not (allout-next-heading))
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
4929 (error "No topics")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4930 ;; 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
4931 (message "Above outermost topic - exposing all.")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4932 (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
4933 (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
4934 (if (not arg)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4935 (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
4936 (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
4937 (allout-expose-topic '(* :))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4938 ;;;_ > 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
4939 (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
4940 "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
4941
70673
798fa39b6207 2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70616
diff changeset
4942 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
4943 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
4944 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
4945 default, they are treated as being uncollapsed."
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4946 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4947 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4948 (and
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4949 ;; Is the topic all on one line (allowing for trailing blank line)?
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4950 (>= (progn (allout-back-to-current-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4951 (move-end-of-line 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4952 (point))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4953 (allout-end-of-current-subtree (not (looking-at "\n\n"))))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4954
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4955 (or include-single-liners
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4956 (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
4957 ;;;_ > 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
4958 (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
4959 "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
4960
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4961 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
4962 and its siblings.
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
4963
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4964 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
4965 siblings, even if the target topic is already closed."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4966
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4967 (interactive)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4968 (let* ((from (point))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4969 (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
4970 (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
4971 (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
4972 (just-close nil)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4973 ((allout-ascend) (allout-hide-current-subtree))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4974 (t (goto-char 0)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4975 (message sibs-msg)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
4976 (allout-goto-prefix-doublechecked)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4977 (allout-expose-topic '(0 :))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4978 (message (concat sibs-msg " Done."))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
4979 (goto-char from)))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4980 ;;;_ > allout-toggle-current-subtree-exposure
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4981 (defun allout-toggle-current-subtree-exposure ()
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4982 "Show or hide the current subtree depending on its current state."
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4983 ;; thanks to tassilo for suggesting this.
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4984 (interactive)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4985 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4986 (allout-back-to-heading)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4987 (if (allout-hidden-p (point-at-eol))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4988 (allout-show-current-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
4989 (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
4990 ;;;_ > 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
4991 (defun allout-show-current-branches ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
4992 "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
4993 (interactive)
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4994 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
4995 (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
4996 (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
4997 ;;;_ > 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
4998 (defun allout-hide-current-leaves ()
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
4999 "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
5000 (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
5001 (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
5002 (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
5003 (point))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5004
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5005 ;;;_ - 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
5006 ;;;_ > 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
5007 (defun allout-show-all ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5008 "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
5009 (interactive)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5010 (message "Exposing entire buffer...")
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5011 (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
5012 (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
5013 ;;;_ > 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
5014 (defun allout-hide-bodies ()
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5015 "Hide all of buffer except headings."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5016 (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
5017 (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
5018 ;;;_ > 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
5019 (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
5020 "Hide all body lines in the region, but not headings."
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5021 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5022 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5023 (save-restriction
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5024 (narrow-to-region start end)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5025 (goto-char (point-min))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5026 (let ((inhibit-field-text-motion t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5027 (while (not (eobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5028 (end-of-line)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5029 (allout-flag-region (point) (allout-end-of-entry) t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5030 (if (not (eobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5031 (forward-char
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5032 (if (looking-at "\n\n")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5033 2 1)))))))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5034
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5035 ;;;_ > 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
5036 (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
5037 "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
5038
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5039 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
5040 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
5041 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
5042 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
5043
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5044 Cursor is left at start position.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5045
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5046 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
5047
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5048 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
5049
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5050 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
5051 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
5052
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5053 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
5054 subtopics of the current topic.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5055
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5056 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
5057 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
5058 explicit specs following the `:'.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5059
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5060 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
5061
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5062 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
5063 - 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
5064 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
5065 that level.
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5066 - 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
5067 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
5068 - 0 means to close topic - hide all offspring.
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5069 : - `repeat'
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5070 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
5071 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
5072 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
5073 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
5074 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
5075 * - 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
5076 + - 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
5077 - - 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
5078
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5079 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
5080 \(allout-expose-topic '(-1 : 0))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5081 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
5082 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
5083 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
5084 \(allout-expose-topic '(-1 () : 1 0))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5085 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
5086 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
5087 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
5088 \(allout-expose-topic '(-2 : -1 *))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5089 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
5090 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
5091 last and completely open the last one."
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5092
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5093 (interactive "xExposure spec: ")
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5094 (if (not (listp spec))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5095 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
5096 (let ((depth (allout-depth))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5097 (max-pos 0)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5098 prev-elem curr-elem
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5099 stay)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5100 (while spec
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5101 (setq prev-elem curr-elem
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5102 curr-elem (car spec)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5103 spec (cdr spec))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5104 (cond ; Do current element:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5105 ((null curr-elem) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5106 ((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
5107 (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
5108 (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
5109 (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
5110 ((eq curr-elem '+)
16a7031b0447 (allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents: 73003
diff changeset
5111 (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
5112 (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
5113 (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
5114 (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
5115 (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
5116 ((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
5117 ((eq curr-elem ':)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5118 (setq stay t)
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5119 ;; 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
5120 ;; w.r.t. remaining siblings:
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5121 (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
5122 ;; 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
5123 (- (length (allout-chart-siblings))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5124 (length spec))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5125 (if (< 0 residue)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5126 ;; 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
5127 (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
5128 spec)))))))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5129 ((numberp curr-elem)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5130 (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
5131 (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
5132 (if (> 0 curr-elem)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5133 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
5134 (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
5135 (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
5136 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
5137 (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
5138 (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
5139 (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
5140 (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
5141 ((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
5142 (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
5143 (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
5144 (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
5145 (cond (stay (setq stay nil))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5146 ((listp (car spec)) nil)
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5147 ((> max-pos (point))
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5148 ;; 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
5149 (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
5150 (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
5151 ((allout-next-sibling depth))))
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
5152 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
5153 ;;;_ > 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
5154 (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
5155
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5156 "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
5157 format) instead.
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5158
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5159 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
5160
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5161 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
5162 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
5163
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5164 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
5165 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
5166 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
5167 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
5168 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
5169
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5170 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
5171
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5172 - 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
5173 - 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
5174 absolute value of the number.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5175 - 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
5176 - 0 just closes
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5177 - `*' completely opens the topic, including bodies.
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5178 - `+' shows all the sub headers, but not the bodies
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
5179 - `-' 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
5180
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5181 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
5182 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
5183 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
5184 for the corresponding offspring of the topic.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5185
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5186 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
5187
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5188 (interactive "xExposure spec: ")
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5189 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5190 (depth (allout-current-depth))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5191 max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5192 (cond ((null spec) nil)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5193 ((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
5194 (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
5195 (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
5196 (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
5197 ((numberp spec)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5198 (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
5199 (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
5200 (end-of-line)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5201 (if (or (not max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5202 (> (point) max-pos))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5203 (setq max-pos (point)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5204 (if (> 0 spec)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5205 (setq spec (* -1 spec)))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5206 (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
5207 (allout-show-children spec)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5208 ((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
5209 ;(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
5210 ; (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
5211 ; (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
5212 (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
5213 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
5214 (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
5215 (setq spec (cdr spec))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5216 (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
5217 (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
5218 (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
5219 (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
5220 (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
5221 (setq max-pos got)))))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5222 (while (and followers
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5223 (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
5224 (progn (goto-char max-pos)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5225 (setq max-pos nil)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5226 (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
5227 (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
5228 (allout-old-expose-topic (car followers))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5229 (setq followers (cdr followers)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5230 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
5231 ;;;_ > 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
5232 (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
5233 "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
5234 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
5235 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
5236
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5237 Cursor is left at start position.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5238
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5239 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
5240
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5241 Examples:
61969
38ca28ee68d6 (allout-exposure): Remove macro and obsolete declaration.
Nick Roberts <nickrob@snap.net.nz>
parents: 59996
diff changeset
5242 \(allout-new-exposure (-1 () () () 1) 0)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5243 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
5244 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
5245 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
5246 \(allout-new-exposure : -1 0)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5247 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
5248 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
5249 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
5250 \(allout-new-exposure -2 : -1 *)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5251 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
5252 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
5253 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
5254 (list 'save-excursion
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5255 '(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
5256 (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
5257 (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
5258 (list 'allout-expose-topic (list 'quote spec))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5259
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5260 ;;;_ #7 Systematic outline presentation - copying, printing, flattening
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5261
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5262 ;;;_ - Mapping and processing of topics
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5263 ;;;_ ( 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
5264 ;;;_ > 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
5265 (defun allout-stringify-flat-index (flat-index &optional context)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5266 "Convert list representing section/subsection/... to document string.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5267
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5268 Optional arg CONTEXT indicates interior levels to include."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5269 (let ((delim ".")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5270 result
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5271 numstr
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5272 (context-depth (or (and context 2) 1)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5273 ;; Take care of the explicit context:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5274 (while (> context-depth 0)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5275 (setq numstr (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5276 flat-index (cdr flat-index)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5277 result (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5278 (cons delim (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5279 (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5280 context-depth (if flat-index (1- context-depth) 0)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5281 (setq delim " ")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5282 ;; Take care of the indentation:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5283 (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5284 (progn
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5285 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5286 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5287 (cons delim
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5288 (cons (make-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5289 (1+ (truncate (if (zerop (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5290 1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5291 (log10 (car flat-index)))))
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 result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5294 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5295 ;; Dispose of single extra delim:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5296 (setq result (cdr result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5297 (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
5298 ;;;_ > 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
5299 (defun allout-stringify-flat-index-plain (flat-index)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5300 "Convert list representing section/subsection/... to document string."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5301 (let ((delim ".")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5302 result)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5303 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5304 (setq result (cons (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5305 (if result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5306 (cons delim result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5307 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5308 (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
5309 ;;;_ > 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
5310 (defun allout-stringify-flat-index-indented (flat-index)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5311 "Convert list representing section/subsection/... to document string."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5312 (let ((delim ".")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5313 result
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5314 numstr)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5315 ;; Take care of the explicit context:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5316 (setq numstr (int-to-string (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5317 flat-index (cdr flat-index)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5318 result (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5319 (cons delim (cons numstr result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5320 (cons numstr result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5321 (setq delim " ")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5322 ;; Take care of the indentation:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5323 (if flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5324 (progn
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5325 (while flat-index
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5326 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5327 (cons delim
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5328 (cons (make-string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5329 (1+ (truncate (if (zerop (car flat-index))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5330 1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5331 (log10 (car flat-index)))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5332 ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5333 result)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5334 (setq flat-index (cdr flat-index)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5335 ;; Dispose of single extra delim:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5336 (setq result (cdr result))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5337 (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
5338 ;;;_ > 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
5339 (defun allout-listify-exposed (&optional start end format)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5340
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5341 "Produce a list representing exposed topics in current region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5342
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5343 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
5344 the subject region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5345
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5346 Optional START and END indicate bounds of region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5347
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5348 optional arg, FORMAT, designates an alternate presentation form for
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5349 the prefix:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5350
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5351 list - Present prefix as numeric section.subsection..., starting with
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5352 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
5353 `indent' (symbol) - Convert header prefixes to all white space,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5354 except for distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5355
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5356 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
5357 header and body. The elements of that list are:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5358
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5359 - a number representing the depth of the topic,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5360 - a string representing the header-prefix, including trailing whitespace and
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5361 bullet.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5362 - a string representing the bullet character,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5363 - 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
5364 portion of the topic entry."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5365
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5366 (interactive "r")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5367 (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5368 (let*
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5369 ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5370 ;; state vars:
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5371 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
5372 next done)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5373
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5374 (goto-char start)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5375 (beginning-of-line)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5376 ;; 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
5377 (if (> (allout-goto-prefix-doublechecked) start)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5378 ;; First topic follows beginning point - register preliminary stuff:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5379 (setq result (list (list 0 "" nil
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5380 (buffer-substring start (1- (point)))))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5381 (while (and (not done)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5382 (not (eobp)) ; Loop until we've covered the region.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5383 (not (> (point) end)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5384 (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
5385 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
5386 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
5387 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
5388 (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
5389 (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
5390 (setq new-depth allout-recent-depth)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5391 (setq gone-out out
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5392 out (< new-depth depth))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5393 (beginning-of-line)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5394 (setq next (point))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5395 (goto-char beg)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5396 (setq strings nil)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5397 (while (> next (point)) ; Get all the exposed text in
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5398 (setq strings
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5399 (cons (buffer-substring
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5400 beg
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5401 ;To hidden text or end of line:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5402 (progn
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5403 (end-of-line)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5404 (allout-back-to-visible-text)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5405 strings))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5406 (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
5407 (line-move 1)
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
5408 (beginning-of-line))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5409 (setq beg (point)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5410 ;; Accumulate list for this topic:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5411 (setq strings (nreverse strings))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5412 (setq result
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5413 (cons
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5414 (if format
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5415 (let ((special (if (string-match
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5416 (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
5417 allout-distinctive-bullets-string)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5418 bullet)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5419 (cond ((listp format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5420 (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
5421 (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
5422 (allout-stringify-flat-index format
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5423 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
5424 (allout-stringify-flat-index-plain
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5425 format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5426 strings
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5427 special))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5428 ((eq format 'indent)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5429 (if special
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5430 (list depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5431 (concat (make-string (1+ depth) ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5432 (substring prefix -1))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5433 strings)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5434 (list depth
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5435 (make-string depth ? )
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5436 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
5437 (t (error "allout-listify-exposed: %s %s"
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5438 "invalid format" format))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5439 (list depth prefix strings))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5440 result))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5441 ;; Reasses format, if any:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5442 (if (and format (listp format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5443 (cond ((= new-depth depth)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5444 (setq format (cons (1+ (car format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5445 (cdr format))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5446 ((> new-depth depth) ; descending - assume by 1:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5447 (setq format (cons 1 format)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5448 (t
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5449 ; Pop the residue:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5450 (while (< new-depth depth)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5451 (setq format (cdr format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5452 (setq depth (1- depth)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5453 ; And increment the current one:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5454 (setq format
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5455 (cons (1+ (or (car format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5456 -1))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5457 (cdr format)))))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5458 ;; 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
5459 (nreverse result))))
87407
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
5460 ;;;_ > allout-region-active-p ()
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
5461 (defmacro allout-region-active-p ()
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
5462 (if (fboundp 'use-region-p)
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
5463 '(use-region-p)
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
5464 '(region-active-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
5465 ;;;_ > allout-process-exposed (&optional func from to frombuf
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5466 ;;; 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
5467 (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
5468 format start-num)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5469 "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
5470
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5471 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
5472
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5473 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
5474 FROMBUF to buffer TOBUF. Sixth optional arg, FORMAT, designates an
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5475 alternate presentation form:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5476
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5477 `flat' - Present prefix as numeric section.subsection..., starting with
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5478 section indicated by the start-num, innermost nesting first.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5479 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
5480 X level, but subsequent topics have only leaf topic
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5481 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
5482 `indent' (symbol) - Convert header prefixes to all white space,
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5483 except for distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5484
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5485 Defaults:
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5486 FUNCTION: `allout-insert-listified'
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5487 FROM: region start, if region active, else start of buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5488 TO: region end, if region active, else end of buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5489 FROMBUF: current buffer
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5490 TOBUF: buffer name derived: \"*current-buffer-name exposed*\"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5491 FORMAT: nil"
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5492
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5493 ; Resolve arguments,
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5494 ; 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
5495 (if (not func) (setq func 'allout-insert-listified))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5496 (if (not (and from to))
87407
25c8924964c6 (allout-region-active-p): Renamed from my-region-active-p. Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87160
diff changeset
5497 (if (allout-region-active-p)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5498 (setq from (region-beginning) to (region-end))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5499 (setq from (point-min) to (point-max))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5500 (if frombuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5501 (if (not (bufferp frombuf))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5502 ;; Specified but not a buffer - get it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5503 (let ((got (get-buffer frombuf)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5504 (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
5505 (error (concat "allout-process-exposed: source buffer "
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5506 frombuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5507 " not found."))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5508 (setq frombuf got))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5509 ;; not specified - default it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5510 (setq frombuf (current-buffer)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5511 (if tobuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5512 (if (not (bufferp tobuf))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5513 (setq tobuf (get-buffer-create tobuf)))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5514 ;; not specified - default it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5515 (setq tobuf (concat "*" (buffer-name frombuf) " exposed*")))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5516 (if (listp format)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5517 (nreverse format))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5518
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5519 (let* ((listified
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5520 (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
5521 (allout-listify-exposed from to format))))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5522 (set-buffer tobuf)
84855
5b7295004fd1 (produce-allout-mode-map, allout-process-exposed):
Juanma Barranquero <lekktu@gmail.com>
parents: 78492
diff changeset
5523 (mapc func listified)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5524 (pop-to-buffer tobuf)))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5525
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5526 ;;;_ - 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
5527 ;;;_ > 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
5528 (defun allout-insert-listified (listified)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5529 "Insert contents of listified outline portion in current buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5530
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5531 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
5532
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5533 \`(depth prefix text)'
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5534
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5535 or \`(depth prefix text bullet-plus)'
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5536
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5537 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
5538 (setq listified (cdr listified))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5539 (let ((prefix (prog1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5540 (car listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5541 (setq listified (cdr listified))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5542 (text (prog1
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5543 (car listified)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5544 (setq listified (cdr listified))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5545 (bullet-plus (car listified)))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5546 (insert prefix)
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5547 (if bullet-plus (insert (concat " " bullet-plus)))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5548 (while text
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5549 (insert (car text))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5550 (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
5551 (insert "\n")))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5552 (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
5553 ;;;_ > 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
5554 (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
5555 "Duplicate exposed portions of current outline to another buffer.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5556
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5557 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
5558
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5559 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
5560
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5561 Optional second arg TOBUF is target buffer name.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5562
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5563 Optional third arg FORMAT, if non-nil, symbolically designates an
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5564 alternate presentation format for the outline:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5565
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5566 `flat' - Convert topic header prefixes to numeric
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5567 section.subsection... identifiers.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5568 `indent' - Convert header prefixes to all white space, except for
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5569 distinctive bullets.
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5570 `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
5571 the full path, the rest have only the section number
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5572 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
5573
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5574 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5575 (if (not tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5576 (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
5577 (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
5578 (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
5579 (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
5580 (buf (current-buffer))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5581 (start-list ()))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5582 (if (eq format 'flat)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5583 (setq format (if arg (save-excursion
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5584 (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
5585 (allout-topic-flat-index))
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5586 '(1))))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5587 (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
5588 (allout-process-exposed 'allout-insert-listified
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5589 beg
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5590 end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5591 (current-buffer)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5592 tobuf
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5593 format start-list)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5594 (goto-char (point-min))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5595 (pop-to-buffer buf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5596 (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
5597 ;;;_ > 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
5598 (defun allout-flatten-exposed-to-buffer (&optional arg tobuf)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5599 "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
5600
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5601 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
5602 `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
5603
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5604 Use `allout-indented-exposed-to-buffer' for indented presentation.
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5605
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5606 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
5607
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5608 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
5609 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
5610 used verbatim."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5611 (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
5612 (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
5613 ;;;_ > 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
5614 (defun allout-indented-exposed-to-buffer (&optional arg tobuf)
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5615 "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
5616
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5617 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
5618 `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
5619
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5620 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
5621
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5622 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
5623
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5624 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
5625 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
5626 used verbatim."
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5627 (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
5628 (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
5629
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5630 ;;;_ - 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
5631 ;;;_ > 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
5632 (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
5633 "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
5634 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
5635 string across LaTeX processing."
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5636 (mapconcat (function
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5637 (lambda (char)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5638 (cond ((memq char '(?\\ ?$ ?% ?# ?& ?{ ?} ?_ ?^ ?- ?*))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5639 (concat "\\char" (number-to-string char) "{}"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5640 ((= char ?\n) "\\\\")
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5641 (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
5642 string
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5643 ""))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5644 ;;;_ > 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
5645 (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
5646 "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
5647
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
5648 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
5649 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
5650 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
5651 (let ((inhibit-field-text-motion t))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5652 (beginning-of-line)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5653 (let ((beg (point))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5654 (end (progn (end-of-line)(point))))
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
5655 (goto-char beg)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5656 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5657 (while (re-search-forward "\\\\"
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5658 ;;"\\\\\\|\\{\\|\\}\\|\\_\\|\\$\\|\\\"\\|\\&\\|\\^\\|\\-\\|\\*\\|#"
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5659 end ; bounded by end-of-line
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5660 1) ; no matches, move to end & return nil
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5661 (goto-char (match-beginning 2))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5662 (insert "\\")
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5663 (setq end (1+ end))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
5664 (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
5665 ;;;_ > 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
5666 (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
5667 "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
5668 ;; 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
5669 ;; 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
5670 (set-buffer buffer)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5671 (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
5672 "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
5673 (page-numbering (if allout-number-pages
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5674 "\\pagestyle{empty}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5675 ""))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5676 (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
5677 allout-title-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5678 (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
5679 allout-label-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5680 (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
5681 allout-head-line-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5682 (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
5683 allout-body-line-style))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5684 (setlength (format "%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5685 "\\newlength{\\stepsize}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5686 "\\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
5687 allout-indent
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5688 "}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5689 (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
5690 "\\newcommand{\\OneHeadLine}[3]{%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5691 "\\noindent%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5692 "\\hspace*{#2\\stepsize}%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5693 "\\labelcmd{#1}\\hspace*{.2cm}"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5694 "\\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
5695 allout-line-skip
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5696 "]\n}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5697 (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
5698 "\\newcommand{\\OneBodyLine}[2]{%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5699 "\\noindent%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5700 "\\hspace*{#1\\stepsize}%\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5701 "\\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
5702 allout-line-skip
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5703 "]\n}\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5704 (begindoc "\\begin{document}\n\\begin{center}\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5705 (title (format "%s%s%s%s"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5706 "\\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
5707 (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
5708 (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
5709 (eval allout-title)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5710 (error "<unnamed buffer>"))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5711 "Unnamed Outline"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5712 "}\n"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5713 "\\end{center}\n\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5714 (hsize "\\hsize = 7.5 true in\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5715 (hoffset "\\hoffset = -1.5 true in\n")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5716 (vspace "\\vspace{.1cm}\n\n"))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5717 (insert (concat doc-style
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5718 page-numbering
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5719 titlecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5720 labelcmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5721 headlinecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5722 bodylinecmd
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5723 setlength
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5724 oneheadline
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5725 onebodyline
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5726 begindoc
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5727 title
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5728 hsize
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5729 hoffset
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5730 vspace)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5731 )))
55717
50b099e608af (allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents: 54952
diff changeset
5732 ;;;_ > 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
5733 (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
5734 "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
5735 (set-buffer buffer)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5736 (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
5737 ;;;_ > 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
5738 (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
5739 "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
5740
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
5741 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
5742 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
5743 (let* ((head-line (if text (car text)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5744 (body-lines (cdr text))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5745 (curr-line)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5746 body-content bop)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5747 ; Do the head line:
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48859
diff changeset
5748 (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
5749 (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
5750 "\1}{"
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5751 depth
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5752 "}{\\verb\1 "
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5753 (if head-line
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5754 (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
5755 "")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5756 "\1}\n"))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5757 (if (not body-lines)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5758 nil
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5759 ;;(insert "\\beginlines\n")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5760 (insert "\\begin{verbatim}\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5761 (while body-lines
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5762 (setq curr-line (car body-lines))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5763 (if (and (not body-content)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5764 (not (string-match "^\\s-*$" curr-line)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5765 (setq body-content t))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5766 ; Mangle any occurrences of
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5767 ; "\end{verbatim}" in text,
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5768 ; it's special:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5769 (if (and body-content
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5770 (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
5771 (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
5772 ">"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5773 (substring curr-line bop))))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5774 ;;(insert "|" (car body-lines) "|")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5775 (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
5776 (allout-latex-verbatim-quote-curr-line)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5777 (insert "\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5778 (setq body-lines (cdr body-lines)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5779 (if body-content
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5780 (setq body-content nil)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5781 (forward-char -1)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5782 (insert "\\ ")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5783 (forward-char 1))
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5784 ;;(insert "\\endlines\n")
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
5785 (insert "\\end{verbatim}\n")
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5786 )))
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
5787 ;;;_ > 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
5788 (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
5789 "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
5790 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
5791 with \"*\" prepended and \" latex-formed*\" appended.
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5792
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5793 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
5794
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5795 (interactive "P")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5796 (if (not tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5797 (setq tobuf
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5798 (get-buffer-create (concat "*" (buffer-name) " latexified*"))))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5799 (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
5800 (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
5801 (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
5802 (buf (current-buffer)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5803 (set-buffer tobuf)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5804 (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
5805 (allout-insert-latex-header tobuf)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5806 (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
5807 (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
5808 beg
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5809 end
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5810 buf
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5811 tobuf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5812 (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
5813 (allout-insert-latex-trailer tobuf)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5814 (goto-char (point-min))
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5815 (pop-to-buffer buf)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5816 (goto-char start-pt)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
5817
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5818 ;;;_ #8 Encryption
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5819 ;;;_ > 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
5820 (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
5821 "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
5822
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5823 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
5824 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
5825 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
5826 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
5827 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
5828
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5829 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
5830
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5831 \*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
5832 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
5833
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5834 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
5835 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
5836
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5837 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
5838 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
5839 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
5840 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
5841 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
5842 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
5843 auto-encryption specifics.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5844
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5845 \*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
5846 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
5847 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
5848
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5849 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
5850 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
5851 \\[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
5852
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5853 Passphrase Caching
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5854
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5855 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
5856 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
5857
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
5858 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
5859 `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
5860
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5861 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
5862
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5863 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
5864 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
5865 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
5866 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
5867 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
5868 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
5869 keys.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5870
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5871 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
5872 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
5873 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
5874 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
5875 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
5876
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5877 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
5878 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
5879 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
5880 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
5881 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
5882 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
5883 (interactive "P")
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5884 (save-excursion
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5885 (allout-back-to-current-heading)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5886 (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
5887 )
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5888 )
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5889 ;;;_ > 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
5890 (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
5891 "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
5892
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5893 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
5894 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
5895 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
5896 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
5897 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
5898
74864
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
5899 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
5900 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
5901
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5902 \**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
5903 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
5904
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
5905 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
5906
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5907 (interactive "P")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5908 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5909 (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
5910
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5911 (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
5912 (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
5913 " 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
5914
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5915 (let* ((allout-buffer (current-buffer))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5916 ;; Assess location:
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
5917 (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
5918 (after-bullet-pos (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5919 (was-encrypted
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5920 (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
5921 (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
5922 (allout-encrypted-topic-p)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5923 (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
5924 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5925 (backward-char 1)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5926 (allout-hidden-p)))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5927 (subtree-beg (1+ (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5928 (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
5929 (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
5930 subtree-end))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5931 (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
5932 (subtree-trailing-char (char-after subtree-end))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5933 ;; 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
5934 ;; check for the error condition
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5935 (result-text (if (or (string= "" subject-text)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5936 (string= "\n" subject-text))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5937 (error "No topic contents to %scrypt"
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5938 (if was-encrypted "de" "en"))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5939 nil))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5940 ;; Assess key parameters:
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5941 (key-info (or
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5942 ;; 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
5943 (and was-encrypted
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5944 (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
5945 (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
5946 '(keypair nil))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5947 '(symmetric nil)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5948 (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
5949 (for-key-identity (cadr key-info))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5950 (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
5951 (was-coding-system buffer-file-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5952
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5953 (when (not was-encrypted)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5954 ;; 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
5955 ;; 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
5956 ;; them.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5957 (setq buffer-file-coding-system
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5958 (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
5959 ;; 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
5960 ;; 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
5961 ;; 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
5962 ;; 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
5963 ;; local variable.
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5964 (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
5965 was-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5966 (yes-or-no-p
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5967 (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
5968 " var? Necessary when only encrypted text"
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5969 " is in that coding system. ")
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5970 buffer-file-coding-system)))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
5971 (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
5972 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
5973
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5974 (setq result-text
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5975 (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
5976 (current-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
5977 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
5978
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5979 ;; 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
5980 (allout-unprotected
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5981 (progn
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5982 (set-buffer allout-buffer)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5983 (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
5984 (insert result-text)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5985 (if was-collapsed
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5986 (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
5987 ;; 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
5988 (if (not was-encrypted)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5989 (if (and (= subtree-end-char ?\n)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5990 (= subtree-trailing-char ?\n))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
5991 (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
5992 ;; 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
5993 (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
5994 (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
5995 allout-topic-encryption-bullet))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5996 (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
5997 (delete-char 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
5998 (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
5999 (if was-encrypted
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6000 ;; 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
6001 (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
6002 (delete-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6003 ;; 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
6004 (goto-char after-bullet-pos)
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6005 (insert "*"))))
73003
ec72ab6f5541 * allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents: 72917
diff changeset
6006 (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
6007 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
6008 ;;;_ > 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
6009 ;;; 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
6010 ;;; passphrase)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6011 (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
6012 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
6013 verifying passphrase)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6014 "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
6015
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6016 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
6017
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6018 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
6019
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6020 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
6021
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6022 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
6023 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
6024
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6025 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
6026 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
6027
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6028 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
6029 for verification purposes.
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6030
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6031 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
6032 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
6033 `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
6034 `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
6035
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6036 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
6037
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6038 (require 'pgg)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6039
67262
c3cfae9a5571 (eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents: 66319
diff changeset
6040 (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
6041 (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
6042
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6043 (let* ((scheme (upcase
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6044 (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
6045 (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
6046 (or for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6047 (split-string (read-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6048 (format "%s message recipients: "
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6049 scheme))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6050 "[ \t,]+"))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6051 (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
6052 (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
6053 (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
6054 (buffer-name allout-buffer)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6055 (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
6056 key-type
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6057 (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
6058 target-prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6059 (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
6060 target-prompt-id))))
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6061 (encoding (with-current-buffer allout-buffer
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6062 buffer-file-coding-system))
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6063 (multibyte (with-current-buffer allout-buffer
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6064 enable-multibyte-characters))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6065 (strip-plaintext-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6066 (if (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6067 (allout-get-configvar-values
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6068 '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
6069 (reject-ciphertext-regexps
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6070 (if (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6071 (allout-get-configvar-values
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6072 '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
6073 (rejected (or rejected 0))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6074 (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
6075 rejected))
74864
e97d916ee47b (allout-encrypt-string): Inhibit use of agent within
Chong Yidong <cyd@stupidchicken.com>
parents: 74381
diff changeset
6076 result-text status
76204
b5b902938a0a (allout-encrypt-string): Remove inhibition
Nick Roberts <nickrob@snap.net.nz>
parents: 75347
diff changeset
6077 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6078
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6079 (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
6080 ;; 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
6081 (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
6082
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6083 (catch 'encryption-failed
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6084
74987
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6085 ;; 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
6086 (if (and (not passphrase)
3a115c11d329 (allout-encrypt-string): Handle symmetric-key passphrase caching but leave
Eli Zaretskii <eliz@gnu.org>
parents: 74864
diff changeset
6087 (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
6088 (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
6089 target-cache-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6090 target-prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6091 key-type
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6092 allout-buffer
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6093 retried fetch-pass)))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6094
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6095 (with-temp-buffer
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6096
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6097 (insert text)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6098
74011
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6099 ;; 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
6100 (set-buffer-multibyte multibyte)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6101 (when encoding
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6102 (set-buffer-file-coding-system encoding)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6103 (if (not decrypt)
cce8c092567f (allout-doublecheck-at-and-shallower): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 73763
diff changeset
6104 (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
6105
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6106 (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
6107 (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
6108 (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
6109 (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
6110 (goto-char (point-min))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6111 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6112 (while (re-search-forward re nil t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6113 (replace-match replacement nil nil))))))
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6114
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6115 (cond
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6116
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6117 ;; symmetric:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6118 ((equal key-type 'symmetric)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6119 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6120 (if decrypt
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6121
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6122 (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
6123
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6124 (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
6125 passphrase)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6126
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6127 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6128 (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
6129 ;; failed - handle passphrase caching
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6130 (if verifying
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6131 (throw 'encryption-failed nil)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6132 (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
6133 (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
6134 (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
6135 "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
6136
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6137 ;; encrypt 'keypair:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6138 ((not decrypt)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6139
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6140 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6141
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6142 (pgg-encrypt for-key
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6143 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
6144
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6145 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6146 (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
6147 (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
6148 (error "encryption failed"))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6149
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6150 ;; decrypt 'keypair:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6151 (t
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6152
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6153 (setq status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6154 (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
6155
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6156 (if status
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6157 (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
6158 (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
6159 (error "decryption failed")))))
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6160
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6161 (setq result-text
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6162 (buffer-substring-no-properties
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6163 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
6164 )
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6165
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6166 ;; validate result - non-empty
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6167 (cond ((not result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6168 (if verifying
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6169 nil
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6170 ;; 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
6171 (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
6172 (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
6173 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
6174 (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
6175 rejected verifying nil)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6176
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6177 ;; 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
6178 ((and (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6179 ;; 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
6180 (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
6181 reject-it)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6182 (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
6183 (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
6184 result-text))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6185 (pop regexps))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6186 reject-it))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6187 (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
6188 (if (<= rejections-left 0)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6189 (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
6190 " (%s), per `%s'")
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6191 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
6192 '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
6193 (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
6194 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
6195 retried (1+ rejected)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6196 verifying passphrase)))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6197 ;; 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
6198 ((and (not decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6199 (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
6200 result-text))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6201 (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
6202 "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
6203
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6204 ;; 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
6205 ((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
6206 (if (or verifying decrypt)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6207 (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
6208 passphrase t))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6209 result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6210
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6211 ;; 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
6212 ;; 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
6213 (t
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6214 (set-buffer allout-buffer)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6215 (if passphrase
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6216 (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
6217 passphrase t))
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6218 (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
6219 allout-buffer)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6220 result-text)
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6221 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6222 )
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6223 )
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6224 )
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6225 ;;;_ > 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
6226 ;;; 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
6227 (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
6228 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
6229 "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
6230
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6231 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
6232 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
6233 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
6234 user for corroboration.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6235
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6236 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
6237
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6238 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
6239
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6240 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
6241
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6242 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
6243
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6244 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
6245
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6246 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
6247
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6248 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
6249 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
6250
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6251 (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
6252 ;; 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
6253 (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
6254 (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
6255 pgg-default-scheme
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6256 "GPG")))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6257 (if prompt-id
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6258 (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
6259 ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6260 cache-id t)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6261
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6262 ;; Symmetric hereon:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6263
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6264 (save-excursion
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6265 (set-buffer allout-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6266 (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
6267 (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
6268 (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
6269 'needed)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6270 retried)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6271 (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
6272 ""))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6273 (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
6274 (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
6275 prompt-id retry-message))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6276 (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
6277 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
6278 (prompt full-prompt)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6279 (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
6280
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6281 (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
6282 (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
6283 (got-pass (or cached
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6284 (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
6285 confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6286
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6287 (if (not got-pass)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6288 nil
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6289
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6290 ;; 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
6291 ;; 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
6292 (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
6293
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6294 (cond (verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6295 (save-window-excursion
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6296 (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
6297 allout-buffer 'symmetric
72367
12fa9bdadf0a (allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents: 72050
diff changeset
6298 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
6299 (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
6300 (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
6301
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6302 (if (and (not confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6303 (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
6304 (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
6305 " - use new one instead? "))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6306 ;; deactivate password for subsequent
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6307 ;; confirmation:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6308 (progn
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6309 (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
6310 (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
6311 nil)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6312 t))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6313 (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
6314 (error "Wrong passphrase."))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6315 ;; 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
6316 ;; (new) passphrase:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6317 ((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
6318 (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
6319 ;; 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
6320 ;; 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
6321 (if (not confirmation)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6322 (setq confirmation
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6323 (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
6324 " ... confirm spelling: ")
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6325 cache-id t)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6326 (prog1
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6327 (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
6328 confirmation
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6329 (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
6330 " confirmation differ - retry? "))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6331 (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
6332 (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
6333 ;; recurse to this routine:
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6334 (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
6335 (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
6336 (error "Confirmation failed."))))))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6337 ;;;_ > allout-encrypted-topic-p ()
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6338 (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
6339 "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
6340 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6341 (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
6342 (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
6343 allout-topic-encryption-bullet)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6344 (save-match-data (looking-at "\\*")))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6345 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6346 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6347 ;;;_ > 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
6348 ;; XXX gpg-specific, alas
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6349 (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
6350 "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
6351
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6352 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
6353
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6354 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
6355 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
6356 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
6357
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6358 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
6359 (require 'pgg-parse)
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6360 (save-excursion
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6361 (with-temp-buffer
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6362 (insert text)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6363 (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
6364 (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
6365 'symmetric
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6366 'keypair))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6367 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
6368 (if (equal type 'keypair)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6369 (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
6370 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
6371 secret-keys)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6372 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
6373 (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
6374 first-secret-key))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6375 (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
6376 )
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6377 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6378 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6379 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6380 ;;;_ > 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
6381 (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
6382 "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
6383 ;; 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
6384 (random t)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6385 (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
6386 (dotimes (i (length spew))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6387 (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
6388 (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
6389 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
6390 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6391 ;;;_ > 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
6392 ;;; outline-buffer)
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6393 (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
6394 outline-buffer)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6395 "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
6396
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6397 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
6398 settings.
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6399
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6400 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
6401
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6402 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
6403
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6404 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
6405 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
6406
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6407 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
6408 `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
6409 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
6410 `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
6411
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6412 ;; 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
6413 ;; - adjust the verifier
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6414 ;; - 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
6415 ;; - 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
6416
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6417 (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
6418 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
6419 (new-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6420 (if new-verifier-needed
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6421 ;; 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
6422 (subst-char-in-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6423 ?\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
6424 passphrase))))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6425 new-hint)
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6426 (when new-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6427 ;; 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
6428 (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
6429 (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
6430 (setq new-hint
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6431 (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
6432 allout-passphrase-hint-string))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6433 (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
6434 (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
6435 (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
6436 allout-passphrase-hint-string)))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6437 (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
6438 (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
6439 (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
6440 allout-passphrase-verifier-string))
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6441 )
66230
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 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6444 ;;;_ > 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
6445 (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
6446 "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
6447
69481
be6a0491d438 * allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69250
diff changeset
6448 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
6449
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6450 (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
6451 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
6452 (if verifier-string
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6453 ;; Return it uncollapsed
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6454 (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
6455 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6456 )
66319
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6457 ;;;_ > 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
6458 (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
6459 "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
6460
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6461 \"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
6462 (save-excursion
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6463 (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
6464 (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
6465 allout-passphrase-verifier-string
4b40c48a16ad Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents: 66230
diff changeset
6466 (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
6467 '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
6468 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
6469 t)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6470 ;;;_ > 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
6471 (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
6472 "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
6473
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6474 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
6475 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
6476 `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
6477
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6478 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
6479 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
6480 must also have content."
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6481 (let (done got content-beg)
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6482 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6483 (while (not done)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6484
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6485 (if (not (re-search-forward
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6486 (format "\\(\\`\\|\n\\)%s *%s[^*]"
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6487 (regexp-quote allout-header-prefix)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6488 (regexp-quote allout-topic-encryption-bullet))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6489 nil t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6490 (setq got nil
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6491 done t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6492 (goto-char (setq got (match-beginning 0)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6493 (if (save-match-data (looking-at "\n"))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6494 (forward-char 1))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6495 (setq got (point)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6496
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6497 (cond ((not got)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6498 (setq done t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6499
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6500 ((not (search-forward "\n"))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6501 (setq got nil
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6502 done t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6503
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6504 ((eobp)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6505 (setq got nil
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6506 done t))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6507
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6508 (t
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6509 (setq content-beg (point))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6510 (backward-char 1)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6511 (allout-end-of-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6512 (if (or (<= (point) content-beg)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6513 (and except-mark
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6514 (<= content-beg except-mark)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6515 (>= (point) except-mark)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6516 ;; Continue looking
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6517 (setq got nil)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6518 ;; Got it!
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6519 (setq done t)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6520 )
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6521 )
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6522 (if got
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6523 (goto-char got))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6524 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6525 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6526 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6527 ;;;_ > 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
6528 (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
6529 "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
6530
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6531 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
6532 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
6533 `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
6534
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6535 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
6536 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
6537 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
6538 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
6539 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
6540
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6541 (interactive "p")
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6542 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6543 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6544 (let* ((current-mark (point-marker))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6545 (current-mark-position (marker-position current-mark))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6546 was-modified
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6547 bo-subtree
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6548 editing-topic editing-point)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6549 (goto-char (point-min))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6550 (while (allout-next-topic-pending-encryption except-mark)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6551 (setq was-modified (buffer-modified-p))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6552 (when (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6553 (and (boundp 'allout-encrypt-unencrypted-on-saves)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6554 allout-encrypt-unencrypted-on-saves
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6555 (setq bo-subtree (re-search-forward "$"))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6556 (not (allout-hidden-p))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6557 (>= current-mark (point))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6558 (allout-end-of-current-subtree)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6559 (<= current-mark (point))))
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6560 (setq editing-topic (point)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6561 ;; 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
6562 ;; 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
6563 editing-point (- current-mark-position
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6564 (count-trailing-whitespace-region
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6565 bo-subtree current-mark-position))))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6566 (allout-toggle-subtree-encryption)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6567 (if (not was-modified)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6568 (set-buffer-modified-p nil))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6569 )
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6570 (if (not was-modified)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6571 (set-buffer-modified-p nil))
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6572 (if editing-topic (list 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
6573 )
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 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6576 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6577
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6578 ;;;_ #9 miscellaneous
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6579 ;;;_ : Mode:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6580 ;;;_ > outlineify-sticky ()
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6581 ;; 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
6582 ;;;###autoload
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6583 (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
6584 ;;;###autoload
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6585 (defun outlineify-sticky (&optional arg)
13964
4de229297f1f (outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
6586 "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
6587
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6588 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
6589 setup for auto-startup."
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6590
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6591 (interactive "P")
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6592
48856
e7aab76fa215 Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47127
diff changeset
6593 (allout-mode t)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6594
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6595 (save-excursion
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6596 (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
6597 (if (allout-goto-prefix)
7416
4996c50431de (outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents: 7218
diff changeset
6598 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
6599 (allout-open-topic 2)
41571
2902b21d2034 (outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents: 38431
diff changeset
6600 (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
6601 "`allout-mode' docstring: `^Hm'."))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6602 (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
6603 "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
6604 ;;;_ > 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
6605 (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
6606 "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
6607
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6608 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
6609 ;; 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
6610 (let (beg prefix suffix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6611 (save-excursion
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6612 (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
6613 (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
6614 (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
6615 (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
6616 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6617 (setq beg (- (point) 16))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6618 (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
6619 (point)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6620 (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
6621 (forward-char -1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6622 (point))))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6623 (setq prefix (buffer-substring-no-properties
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6624 (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
6625 (forward-char 1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6626 (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6627 beg))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6628 (list beg prefix suffix))
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-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
6633 (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
6634 "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
6635
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6636 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
6637 `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
6638
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6639 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
6640 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
6641 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
6642 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
6643 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
6644
73763
89b9e8184350 (allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents: 73660
diff changeset
6645 `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
6646 (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
6647 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
6648 nil
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6649 (save-excursion
72050
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
6650 (let ((inhibit-field-text-motion t)
d79208e62ea9 (allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents: 71915
diff changeset
6651 (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
6652 beg prefix suffix)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6653 (if section-data
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6654 (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
6655 prefix (cadr section-data)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6656 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
6657 ;; create the section
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6658 (goto-char (point-max))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6659 (open-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6660 (allout-open-topic 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6661 (end-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6662 (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
6663 (allout-open-topic 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6664 (setq beg (point)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6665 suffix ""
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6666 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
6667 (beginning-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6668 (point))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6669 beg))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6670 (goto-char beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6671 (insert "Local variables:\n")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6672 (allout-open-topic 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6673 (insert "End:\n")
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6674 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6675 ;; 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
6676 ;; of new value:
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6677 (goto-char beg)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6678 (allout-show-to-offshoot)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6679 (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
6680 (let* ((value-beg (point))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6681 (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
6682 (forward-char -1))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6683 (point)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6684 (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
6685 (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
6686 (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
6687 (end-of-line)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6688 (open-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6689 (forward-line 1)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6690 (insert (concat prefix varname ":")))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6691 (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
6692 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6693 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6694 )
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6695 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6696 ;;;_ > allout-get-configvar-values (varname)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6697 (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
6698 "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
6699
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6700 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
6701 otherwise are ignored.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6702
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6703 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
6704 not its value."
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6705
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6706 (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
6707 got)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6708 (dolist (sym configvar-value)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6709 (if (not (boundp sym))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6710 (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
6711 configvar-name sym))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6712 (delq sym (symbol-value configvar-name)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6713 (push (symbol-value sym) got)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6714 (reverse got)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6715 ;;;_ : Topics:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6716 ;;;_ > allout-mark-topic ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6717 (defun allout-mark-topic ()
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6718 "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
6719 (interactive)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6720 (let ((inhibit-field-text-motion t))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6721 (beginning-of-line))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6722 (allout-goto-prefix-doublechecked)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6723 (push-mark (point))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6724 (allout-end-of-current-subtree)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6725 (exchange-point-and-mark))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6726 ;;;_ : UI:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6727 ;;;_ > solicit-char-in-string (prompt string &optional do-defaulting)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6728 (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
6729 "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
6730
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6731 Optional arg DO-DEFAULTING indicates to accept empty input (CR)."
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6732
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6733 (let ((new-prompt prompt)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6734 got)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6735
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6736 (while (not got)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6737 (message "%s" new-prompt)
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6738
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6739 ;; 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
6740 ;; treatment for `?' character. (Oughta use minibuffer keymap instead.)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6741 (setq got
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6742 (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
6743
29490
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6744 (setq got
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6745 (cond ((string-match (regexp-quote got) string) got)
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6746 ((and do-defaulting (string= got "\r"))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6747 ;; Return empty string to default:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6748 "")
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6749 ((string= got "\C-g") (signal 'quit nil))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6750 (t
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6751 (setq new-prompt (concat prompt
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6752 got
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6753 " ...pick from: "
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6754 string
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6755 ""))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6756 nil))))
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6757 ;; got something out of loop - return it:
81725432199b New version from Manheimer.
Dave Love <fx@gnu.org>
parents: 27269
diff changeset
6758 got)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6759 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6760 ;;;_ : Strings:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6761 ;;;_ > regexp-sans-escapes (string)
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6762 (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
6763 "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
6764
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6765 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
6766 single backslash.
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6767
66230
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6768 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
6769
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6770 (if (string= regexp "")
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6771 ""
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6772 ;; 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
6773 ;; backslash, or else to nil:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6774 (setq successive-backslashes
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6775 (if (= (aref regexp 0) ?\\)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6776 (if successive-backslashes (1+ successive-backslashes) 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6777 nil))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6778 (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
6779 ;; Include first char:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6780 (concat (substring regexp 0 1)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6781 (regexp-sans-escapes (substring regexp 1)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6782 ;; Exclude first char, but maintain count:
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6783 (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
6784 ;;;_ > count-trailing-whitespace-region (beg end)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6785 (defun count-trailing-whitespace-region (beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6786 "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
6787
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6788 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
6789 (if (> beg end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6790 0
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6791 (save-match-data
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6792 (save-excursion
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6793 (goto-char beg)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6794 (let ((count 0))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6795 (while (re-search-forward "[ ][ ]*$" end t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6796 (goto-char (1+ (match-beginning 2)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6797 (setq count (1+ count)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6798 count)))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6799 ;;;_ > allout-format-quote (string)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6800 (defun allout-format-quote (string)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6801 "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
6802 (apply 'concat
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6803 (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
6804 string)))
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6805 ;;;_ : lists
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6806 ;;;_ > allout-flatten (list)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6807 (defun allout-flatten (list)
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6808 "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
6809 ;; classic.
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6810 (cond ((null list) nil)
72917
17942cb3949e (allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents: 72873
diff changeset
6811 ((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
6812 (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
6813 ;;;_ : Compatability:
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6814 ;;;_ > 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
6815 (defun allout-mark-marker (&optional force buffer)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6816 "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
6817
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6818 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
6819 so pass them along when appropriate."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6820 (if (featurep 'xemacs)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6821 (apply 'mark-marker force buffer)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6822 (mark-marker)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6823 ;;;_ > 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
6824 (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
6825 (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
6826 "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
6827 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
6828 (let ((i (length string))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6829 (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
6830 (while (> i 0)
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6831 (setq i (1- i))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6832 (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
6833 (aset newstr i tochar)))
4344fd52a670 Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents: 64762
diff changeset
6834 newstr)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6835 ;;;_ > wholenump if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6836 (if (not (fboundp 'wholenump))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6837 (defalias 'wholenump 'natnump))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6838 ;;;_ > remove-overlays if necessary
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6839 (if (not (fboundp 'remove-overlays))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6840 (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
6841 "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
6842 Overlays might be moved and/or split.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6843 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
6844 (unless beg (setq beg (point-min)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6845 (unless end (setq end (point-max)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6846 (if (< end beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6847 (setq beg (prog1 end (setq end beg))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6848 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6849 (dolist (o (overlays-in beg end))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6850 (when (eq (overlay-get o name) val)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6851 ;; Either push this overlay outside beg...end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6852 ;; or split it to exclude beg...end
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6853 ;; 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
6854 (if (< (overlay-start o) beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6855 (if (> (overlay-end o) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6856 (progn
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6857 (move-overlay (copy-overlay o)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6858 (overlay-start o) beg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6859 (move-overlay o end (overlay-end o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6860 (move-overlay o (overlay-start o) beg))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6861 (if (> (overlay-end o) end)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6862 (move-overlay o end (overlay-end o))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6863 (delete-overlay o)))))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6864 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6865 ;;;_ > 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
6866 (if (not (fboundp 'copy-overlay))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6867 (defun copy-overlay (o)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6868 "Return a copy of overlay O."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6869 (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
6870 ;; 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
6871 ;; insertion-type of the two markers.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6872 (overlay-buffer o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6873 (props (overlay-properties o)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6874 (while props
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6875 (overlay-put o1 (pop props) (pop props)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6876 o1)))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6877 ;;;_ > 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
6878 (if (not (fboundp 'add-to-invisibility-spec))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6879 (defun add-to-invisibility-spec (element)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6880 "Add ELEMENT to `buffer-invisibility-spec'.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6881 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
6882 that can be added."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6883 (if (eq buffer-invisibility-spec t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6884 (setq buffer-invisibility-spec (list t)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6885 (setq buffer-invisibility-spec
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6886 (cons element buffer-invisibility-spec))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6887 ;;;_ > 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
6888 (if (not (fboundp 'remove-from-invisibility-spec))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6889 (defun remove-from-invisibility-spec (element)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6890 "Remove ELEMENT from `buffer-invisibility-spec'."
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6891 (if (consp buffer-invisibility-spec)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6892 (setq buffer-invisibility-spec (delete element
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6893 buffer-invisibility-spec)))))
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6894 ;;;_ > 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
6895 (if (not (fboundp 'move-beginning-of-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6896 (defun move-beginning-of-line (arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6897 "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
6898 \(This disregards invisible newlines such as those
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6899 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
6900
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6901 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
6902 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
6903 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
6904 (interactive "p")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6905 (or arg (setq arg 1))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6906 (if (/= arg 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6907 (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
6908
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6909 ;; 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
6910 (skip-chars-backward "^\n")
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6911 (while (and (not (bobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6912 (let ((prop
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6913 (get-char-property (1- (point)) 'invisible)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6914 (if (eq buffer-invisibility-spec t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6915 prop
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6916 (or (memq prop buffer-invisibility-spec)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6917 (assq prop buffer-invisibility-spec)))))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6918 (goto-char (if (featurep 'xemacs)
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6919 (previous-property-change (point))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6920 (previous-char-property-change (point))))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6921 (skip-chars-backward "^\n"))
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6922 (vertical-motion 0))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6923 )
72873
b42e98d06749 * allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents: 72367
diff changeset
6924 ;;;_ > 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
6925 (if (not (fboundp 'move-end-of-line))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6926 (defun move-end-of-line (arg)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6927 "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
6928 \(This disregards invisible newlines such as those
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6929 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
6930
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6931 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
6932 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
6933 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
6934 (interactive "p")
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6935 (or arg (setq arg 1))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6936 (let (done)
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6937 (while (not done)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6938 (let ((newpos
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6939 (save-excursion
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6940 (let ((goal-column 0))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6941 (and (condition-case nil
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6942 (or (line-move arg) t)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6943 (error nil))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6944 (not (bobp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6945 (progn
85769
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6946 (while
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6947 (and
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6948 (not (bobp))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6949 (let ((prop
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6950 (get-char-property (1- (point))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6951 'invisible)))
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6952 (if (eq buffer-invisibility-spec t)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6953 prop
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6954 (or (memq prop
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6955 buffer-invisibility-spec)
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6956 (assq prop
de8ef384c3ef * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85114
diff changeset
6957 buffer-invisibility-spec)))))
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6958 (goto-char
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6959 (previous-char-property-change (point))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6960 (backward-char 1)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6961 (point)))))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6962 (goto-char newpos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6963 (if (and (> (point) newpos)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6964 (eq (preceding-char) ?\n))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6965 (backward-char 1)
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6966 (if (and (> (point) newpos) (not (eobp))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6967 (not (eq (following-char) ?\n)))
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6968 ;; If we skipped something intangible
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6969 ;; 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
6970 ;; keep going.
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6971 (setq arg 1)
70244
ccd02e1ca0e3 Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70225
diff changeset
6972 (setq done t)))))))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6973 )
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6974
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6975 ;;;_ #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
6976 ;;;_ > 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
6977 (defun allout-bullet-isearch (&optional bullet)
74381
cba6f2b24720 Ken Manheimer <ken.manheimer@gmail.com>:
Kim F. Storm <storm@cua.dk>
parents: 74011
diff changeset
6978 "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
6979 (interactive)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6980 (if (not bullet)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6981 (setq bullet (solicit-char-in-string
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6982 "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
6983 (regexp-sans-escapes allout-bullets-string))))
15664
a50ebf4ac764 (outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents: 15663
diff changeset
6984
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6985 (let ((isearch-regexp t)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6986 (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
6987 allout-header-prefix
7218
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6988 "[ \t]*"
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6989 bullet)))
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6990 (isearch-repeat 'forward)
49f9f9a08b4c major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
6991 (isearch-mode t)))
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
6992
71893
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6993 ;;;_ #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
6994 ;;;_ > 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
6995 (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
6996 "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
6997 (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
6998 (allout-test-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
6999 (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
7000 (sit-for .5))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7001 ;;;_ : test resumptions:
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7002 ;;;_ > 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
7003 (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
7004 "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
7005 (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
7006 (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
7007 ;;;_ > allout-test-resumptions ()
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7008 (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
7009 "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
7010 (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
7011 "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
7012 (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
7013 "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
7014 (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
7015 "Exercise allout resumptions."
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7016 ;; 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
7017 ;; 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
7018
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7019 ;; 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
7020 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7021 (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
7022 (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
7023 (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
7024 (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
7025 (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
7026 (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
7027 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7028 (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
7029 (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
7030
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7031 ;; 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
7032 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7033 (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
7034 (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
7035 (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
7036 (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
7037 (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
7038 (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
7039 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7040 (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
7041 (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
7042 (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
7043
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7044 ;; 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
7045 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7046 (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
7047 (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
7048 (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
7049 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
7050 " 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
7051 (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
7052 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
7053 " 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
7054 (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
7055 (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
7056 (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
7057 (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
7058 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7059 (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
7060 (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
7061 (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
7062 (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
7063
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7064 ;; 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
7065 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7066 (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
7067 (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
7068 (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
7069 (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
7070 (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
7071 (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
7072 '(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
7073 '(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
7074 (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
7075 '(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
7076 '(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
7077 ;; 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
7078 (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
7079 (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
7080 (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
7081 (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
7082 (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
7083 (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
7084 (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
7085 (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
7086 (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
7087 (allout-do-resumptions)
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7088 (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
7089 (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
7090 (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
7091 (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
7092 (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
7093 (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
7094 (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
7095 (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
7096 (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
7097
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7098 ;; 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
7099 (with-temp-buffer
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7100 (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
7101 (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
7102 (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
7103 (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
7104 (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
7105 (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
7106 '(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
7107 '(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
7108 (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
7109 (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
7110 (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
7111 (allout-do-resumptions))
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7112 )
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7113 ;;;_ % 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
7114 (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
7115 (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
7116
bb3316be643e Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents: 71625
diff changeset
7117 ;;;_ #12 Provide
68953
0ddd5b380ffb Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents: 68651
diff changeset
7118 (provide 'allout)
3430
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7119
400db0ca934f entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7120 ;;;_* Local emacs vars.
69124
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7121 ;; The following `allout-layout' local variable setting:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7122 ;; - 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
7123 ;; - shows the children of the third to last (config vars)
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7124 ;; - and the second to last (code section),
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7125 ;; - and closes the last topic (this local-variables section).
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7126 ;;Local variables:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7127 ;;allout-layout: (0 : -1 -1 0)
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7128 ;;End:
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7129
f6b5ed4f7f58 Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68956
diff changeset
7130 ;; arch-tag: cf38fbc3-c044-450f-8bff-afed8ba5681c
38431
853c3674f20a Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38250
diff changeset
7131 ;;; allout.el ends here