Mercurial > emacs
annotate lisp/allout.el @ 73935:a1e6ec065b4f
(ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Restore `eval-when-compile'. It wasn't that unneeded after all.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 12 Nov 2006 17:11:31 +0000 |
parents | 89b9e8184350 |
children | cce8c092567f 02cf29720f31 |
rev | line source |
---|---|
38431
853c3674f20a
Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38250
diff
changeset
|
1 ;;; allout.el --- extensive outline mode for use alone and with other modes |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64474
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004, |
69124
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
4 ;; 2005, 2006 Free Software Foundation, Inc. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com> |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
7 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com> |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
8 ;; Created: Dec 1991 - first release to usenet |
69481
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
9 ;; Version: 2.2.1 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
10 ;; Keywords: outlines wp languages |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
11 ;; Website: http://myriadicity.net/Sundry/EmacsAllout |
3430 | 12 |
13 ;; This file is part of GNU Emacs. | |
14 | |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5310
diff
changeset
|
15 ;; GNU Emacs is free software; you can redistribute it and/or modify |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5310
diff
changeset
|
16 ;; it under the terms of the GNU General Public License as published by |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5310
diff
changeset
|
17 ;; the Free Software Foundation; either version 2, or (at your option) |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5310
diff
changeset
|
18 ;; any later version. |
3430 | 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 | 26 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 27 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
28 ;; Boston, MA 02110-1301, USA. | |
3430 | 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 | 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 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
48 ;; maintenance. (See allout-toggle-current-subtree-encryption docstring.) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
49 ;; - Automatic topic-number maintenance |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
50 ;; - "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
|
51 ;; 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
|
52 ;; - 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
|
53 ;; outline styles |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
54 ;; - 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
|
55 ;; 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
|
56 ;; 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
|
57 ;; indentation of their topic header. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
58 ;; |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
59 ;; and more. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
60 ;; |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
61 ;; 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
|
62 ;; mode. |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
63 ;; |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
64 ;; 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
|
65 ;; http://myriadicity.net/Sundry/EmacsAllout . |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
66 ;; |
29490 | 67 ;; 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
|
68 ;; 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
|
69 ;; 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
|
70 ;; activation of allout-mode. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
71 ;; |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
72 ;; 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
|
73 ;; `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
|
74 ;; `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
|
75 ;; 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
|
76 ;; |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
77 ;; Note - the lines beginning with `;;;_' are outline topic headers. |
71625 | 78 ;; 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
|
79 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
80 ;; 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
|
81 |
38431
853c3674f20a
Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38250
diff
changeset
|
82 ;;; Code: |
853c3674f20a
Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38250
diff
changeset
|
83 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
84 ;;;_* Dependency autoloads |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
85 (require 'overlay) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
86 (eval-when-compile |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
87 ;; 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
|
88 ;; 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
|
89 ;; "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
|
90 (progn |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
91 (require 'pgg) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
92 (require 'pgg-gpg) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
93 (require 'overlay) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
94 ;; `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
|
95 ;; 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
|
96 ;; 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
|
97 (require 'cl) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
98 )) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
99 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
100 ;;;_* USER CUSTOMIZATION VARIABLES: |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
101 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
102 ;;;_ > defgroup allout |
21088 | 103 (defgroup allout nil |
104 "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
|
105 :prefix "allout-" |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
106 :group 'outlines) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
107 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
108 ;;;_ + 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
|
109 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
110 ;;;_ = 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
|
111 (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
|
112 "*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
|
113 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
114 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
|
115 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
|
116 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
|
117 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
|
118 |
50855
31ce4fcda3d8
(allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents:
49966
diff
changeset
|
119 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
|
120 \(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
|
121 `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
|
122 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
123 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
|
124 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
|
125 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
126 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
|
127 auto-layout is not. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
128 |
50855
31ce4fcda3d8
(allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents:
49966
diff
changeset
|
129 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
|
130 enabled. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
131 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
132 See the docstring for `allout-init' for the proper interface to |
29490 | 133 this variable." |
134 :type '(choice (const :tag "On" t) | |
135 (const :tag "Ask about layout" "ask") | |
136 (const :tag "Mode only" "activate") | |
137 (const :tag "Off" nil)) | |
138 :group 'allout) | |
69481
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
139 ;;;_ = allout-default-layout |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
140 (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
|
141 "*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
|
142 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
143 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
|
144 `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
|
145 layout specifications. |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
146 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
147 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
|
148 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
|
149 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
|
150 `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
|
151 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
152 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
|
153 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
154 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
|
155 where: |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
156 - 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
|
157 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
|
158 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
|
159 - 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
|
160 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
|
161 - 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
|
162 : - 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
|
163 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
|
164 following the `:' on the list. Ie, apply to all topics at level but |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
165 trailing ones accounted for by trailing specs. \(Only the first of |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
166 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
|
167 * - 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
|
168 + - 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
|
169 - - 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
|
170 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
|
171 corresponding item(s) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
172 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
173 Examples: |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
174 '(-2 : 0) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
175 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
|
176 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
|
177 '(-1 () : 1 0) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
178 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
|
179 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
|
180 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
|
181 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
|
182 '(-2 : -1 *) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
183 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
|
184 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
|
185 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
|
186 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
187 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
|
188 |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
189 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
|
190 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
|
191 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
|
192 :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
|
193 :group 'allout) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
194 ;;;_ : allout-layout-type |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
195 (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
|
196 "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
|
197 :type '(repeat |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
198 (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
|
199 (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
|
200 (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
|
201 (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
|
202 (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
|
203 (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
|
204 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
205 ;;;_ = 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
|
206 (defcustom allout-show-bodies nil |
29490 | 207 "*If non-nil, show entire body when exposing a topic, rather than |
208 just the header." | |
209 :type 'boolean | |
210 :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
|
211 (make-variable-buffer-local 'allout-show-bodies) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
212 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
213 (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
|
214 (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
|
215 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
216 ;;;_ = 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
|
217 (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
|
218 "*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
|
219 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
220 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
|
221 follows a different command. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
222 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
223 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
|
224 advance as follows: |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
225 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
226 - 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
|
227 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
|
228 - 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
|
229 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
|
230 - 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
|
231 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
|
232 - if the cursor is on the start of the headline: |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
233 then it goes to the bullet character \(for hotspot navigation\) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
234 - if the cursor is on the bullet character: |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
235 then it goes to the first column of that line \(the headline\) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
236 - if the cursor is on the 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
|
237 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
|
238 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
239 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
|
240 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
|
241 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
|
242 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
243 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
|
244 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
|
245 repeated calls." |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
246 :type 'boolean :group 'allout) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
247 ;;;_ = 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
|
248 (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
|
249 "*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
|
250 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
251 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
|
252 follows a different command. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
253 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
254 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
|
255 advance as follows: |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
256 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
257 - 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
|
258 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
|
259 - 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
|
260 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
|
261 - 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
|
262 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
|
263 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
264 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
|
265 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
|
266 cycling back to start. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
267 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
268 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
|
269 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
|
270 calls." |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
271 :type 'boolean :group 'allout) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
272 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
273 ;;;_ = 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
|
274 (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
|
275 ;; 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
|
276 ;; 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
|
277 "*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
|
278 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
279 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
|
280 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
|
281 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
|
282 character, which is typically set to the `allout-primary-bullet'." |
21088 | 283 :type 'string |
284 :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
|
285 (make-variable-buffer-local 'allout-header-prefix) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
286 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
287 (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
|
288 ;;;_ = 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
|
289 (defcustom allout-primary-bullet "*" |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
290 "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
|
291 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
292 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
|
293 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
|
294 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
|
295 |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
296 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
|
297 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
|
298 and `allout-distinctive-bullets-string' for the range of available |
21088 | 299 bullets." |
300 :type 'string | |
301 :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
|
302 (make-variable-buffer-local 'allout-primary-bullet) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
303 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
304 (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
|
305 ;;;_ = 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
|
306 (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
|
307 "*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
|
308 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
309 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
|
310 bullets. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
311 |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
312 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
|
313 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
314 Outline mode has to be reactivated in order for changes to the value |
21088 | 315 of this var to take effect." |
316 :type 'string | |
317 :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
|
318 (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
|
319 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
320 (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
|
321 ;;;_ = 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
|
322 (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
|
323 "*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
|
324 |
29490 | 325 These bullets are used to distinguish topics from the run-of-the-mill |
326 ones. They are not used in the standard topic headers created by | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
327 the topic-opening, shifting, and rebulleting \(eg, on topic shift, |
29490 | 328 topic paste, blanket rebulleting) routines, but are offered among the |
329 choices for rebulleting. They are not altered by the above automatic | |
330 rebulleting, so they can be used to characterize topics, eg: | |
331 | |
332 `?' question topics | |
333 `\(' parenthetic comment \(with a matching close paren inside) | |
334 `[' meta-note \(with a matching close ] inside) | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
335 `\"' a quotation |
29490 | 336 `=' value settings |
337 `~' \"more or less\" | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
338 `^' see above |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
339 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
340 ... for example. (`#' typically has a special meaning to the software, |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
341 according to the value of `allout-numbered-bullet'.) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
342 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
343 See `allout-plain-bullets-string' for the selection of |
29490 | 344 alternating bullets. |
345 | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
346 You must run `set-allout-regexp' in order for outline mode to |
29490 | 347 reconcile to changes of this value. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
348 |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
349 DO NOT include the close-square-bracket, `]', on either of the bullet |
21088 | 350 strings." |
351 :type 'string | |
352 :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
|
353 (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
|
354 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
355 (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
|
356 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
357 ;;;_ = 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
|
358 (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
|
359 "*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
|
360 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
361 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
|
362 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
|
363 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
|
364 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
|
365 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
366 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
|
367 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
|
368 |
50855
31ce4fcda3d8
(allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents:
49966
diff
changeset
|
369 Value t means to first check for assoc value in `allout-mode-leaders' |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
370 alist, then use comment-start string, if any, then use default \(`.'). |
29490 | 371 \(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
|
372 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
373 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
|
374 `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
|
375 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
376 Value nil means to always use the default \(`.') and leave |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
377 `allout-primary-bullet' unaltered. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
378 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
379 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
|
380 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
|
381 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
|
382 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
|
383 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
|
384 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
|
385 `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
|
386 undesired.]" |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
387 :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
|
388 (const allout-mode-leaders) |
21088 | 389 (const comment-start)) |
390 :group 'allout) | |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
391 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
392 (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
|
393 '(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
|
394 (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
|
395 ;;;_ = 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
|
396 (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
|
397 "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
|
398 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
399 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
|
400 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
|
401 `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
|
402 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
403 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
|
404 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
|
405 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
|
406 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
|
407 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
408 ;;;_ = 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
|
409 (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
|
410 "*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
|
411 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
412 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
|
413 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
|
414 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
|
415 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
416 Whatever the setting of this variable, both old and new style prefixes |
21088 | 417 are always respected by the topic maneuvering functions." |
418 :type 'boolean | |
419 :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
|
420 (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
|
421 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
422 (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
|
423 (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
|
424 ;;;_ = 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
|
425 (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
|
426 "*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
|
427 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
428 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
|
429 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
|
430 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
|
431 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
|
432 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
433 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
|
434 prefixes: |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
435 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
436 * Top level |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
437 .* A topic |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
438 . + One level 3 subtopic |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
439 . . One level 4 subtopic |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
440 . . A second 4 subtopic |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
441 . + Another level 3 subtopic |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
442 . #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
|
443 . #2 Another |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
444 . ! 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
|
445 . #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
|
446 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
447 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
|
448 numbered and other distinctive bullets retained): |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
449 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
450 * Top level |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
451 .* A topic |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
452 . * One level 3 subtopic |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
453 . * One level 4 subtopic |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
454 . * A second 4 subtopic |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
455 . * Another level 3 subtopic |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
456 . #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
|
457 . #2 Another |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
458 . ! 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
|
459 . #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
|
460 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
461 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
|
462 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
|
463 this variable setting. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
464 |
48857
8641226163f1
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48856
diff
changeset
|
465 The setting of this var is not relevant when `allout-old-style-prefixes' |
21088 | 466 is non-nil." |
467 :type 'boolean | |
468 :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
|
469 (make-variable-buffer-local 'allout-stylish-prefixes) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
470 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
471 (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
|
472 (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
|
473 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
474 ;;;_ = 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
|
475 (defcustom allout-numbered-bullet "#" |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
476 "*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
|
477 |
13964
4de229297f1f
(outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
478 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
|
479 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
|
480 to \"#\", you can set it to a bullet of your choice. A nil value |
21088 | 481 disables numbering maintenance." |
482 :type '(choice (const nil) string) | |
483 :group 'allout) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
484 (make-variable-buffer-local 'allout-numbered-bullet) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
485 ;;;###autoload |
70673
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
486 (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
|
487 (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
|
488 'string-or-null-p |
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
489 '(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
|
490 ;;;_ = 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
|
491 (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
|
492 "*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
|
493 |
29490 | 494 Set this var to the bullet you want to use for file cross-references." |
21088 | 495 :type '(choice (const nil) string) |
496 :group 'allout) | |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
497 ;;;###autoload |
70673
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
498 (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
|
499 (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
|
500 'string-or-null-p |
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
501 '(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
|
502 ;;;_ = 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
|
503 (defcustom allout-presentation-padding 2 |
29490 | 504 "*Presentation-format white-space padding factor, for greater indent." |
505 :type 'integer | |
506 :group 'allout) | |
507 | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
508 (make-variable-buffer-local 'allout-presentation-padding) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
509 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
510 (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
|
511 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
512 ;;;_ = 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
|
513 (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
|
514 "*If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic |
29490 | 515 numbers to minimal amount with some context. Otherwise, entire |
516 numbers are always used." | |
517 :type 'boolean | |
518 :group 'allout) | |
519 | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
520 ;;;_ + 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
|
521 ;;;_ - 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
|
522 (defcustom allout-number-pages nil |
21088 | 523 "*Non-nil turns on page numbering for LaTeX formatting of an outline." |
524 :type 'boolean | |
525 :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
|
526 ;;;_ - 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
|
527 (defcustom allout-label-style "\\large\\bf" |
21088 | 528 "*Font and size of labels for LaTeX formatting of an outline." |
529 :type 'string | |
530 :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
|
531 ;;;_ - 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
|
532 (defcustom allout-head-line-style "\\large\\sl " |
21088 | 533 "*Font and size of entries for LaTeX formatting of an outline." |
534 :type 'string | |
535 :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
|
536 ;;;_ - 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
|
537 (defcustom allout-body-line-style " " |
21088 | 538 "*Font and size of entries for LaTeX formatting of an outline." |
539 :type 'string | |
540 :group 'allout) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
541 ;;;_ - allout-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
|
542 (defcustom allout-title-style "\\Large\\bf" |
21088 | 543 "*Font and size of titles for LaTeX formatting of an outline." |
544 :type 'string | |
545 :group 'allout) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
546 ;;;_ - allout-title |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
547 (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
|
548 "*Expression to be evaluated to determine the title for LaTeX |
21088 | 549 formatted copy." |
550 :type 'sexp | |
551 :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
|
552 ;;;_ - 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
|
553 (defcustom allout-line-skip ".05cm" |
21088 | 554 "*Space between lines for LaTeX formatting of an outline." |
555 :type 'string | |
556 :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
|
557 ;;;_ - 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
|
558 (defcustom allout-indent ".3cm" |
21088 | 559 "*LaTeX formatted depth-indent spacing." |
560 :type 'string | |
561 :group 'allout) | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
562 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
563 ;;;_ + Topic encryption |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
564 ;;;_ = allout-encryption group |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
565 (defgroup allout-encryption nil |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
566 "Settings for topic encryption features of allout outliner." |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
567 :group 'allout) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
568 ;;;_ = allout-topic-encryption-bullet |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
569 (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
|
570 "*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
|
571 :type '(choice (const nil) string) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
572 :version "22.0" |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
573 :group 'allout-encryption) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
574 ;;;_ = allout-passphrase-verifier-handling |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
575 (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
|
576 "*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
|
577 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
578 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
|
579 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
|
580 :type 'boolean |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
581 :version "22.0" |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
582 :group 'allout-encryption) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
583 (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
|
584 ;;;_ = allout-passphrase-hint-handling |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
585 (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
|
586 "*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
|
587 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
588 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
|
589 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
|
590 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
|
591 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
592 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
|
593 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
|
594 :type '(choice (const always) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
595 (const needed) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
596 (const disabled)) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
597 :version "22.0" |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
598 :group 'allout-encryption) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
599 (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
|
600 ;;;_ = allout-encrypt-unencrypted-on-saves |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
601 (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
|
602 "*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
|
603 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
604 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
|
605 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
|
606 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
607 - Yes: encrypt all topics pending encryption, even if it's the one |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
608 currently being edited. \(In that case, the currently edited topic |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
609 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
|
610 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
|
611 encrypted.) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
612 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
|
613 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
|
614 - 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
|
615 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
|
616 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
|
617 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
|
618 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
|
619 - 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
|
620 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
621 For practical reasons, auto-saves always use the 'except-current policy |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
622 when auto-encryption is enabled. \(Otherwise, spurious passphrase prompts |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
623 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
|
624 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
|
625 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
|
626 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
627 :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
|
628 (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
|
629 (const :tag "No" nil)) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
630 :version "22.0" |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
631 :group 'allout-encryption) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
632 (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
|
633 |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
634 ;;;_ + Developer |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
635 ;;;_ = allout-developer group |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
636 (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
|
637 "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
|
638 :group 'allout) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
639 ;;;_ = 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
|
640 (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
|
641 "*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
|
642 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
643 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
|
644 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
645 \(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
|
646 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
|
647 compilation.) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
648 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
649 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
|
650 :type 'boolean |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
651 :group 'allout-developer) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
652 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
653 ;;;_ + Miscellaneous customization |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
654 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
655 ;;;_ = allout-command-prefix |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
656 (defcustom allout-command-prefix "\C-c " |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
657 "*Key sequence to be used as prefix for outline mode command key bindings. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
658 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
659 Default is '\C-c<space>'; just '\C-c' is more short-and-sweet, if you're |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
660 willing to let allout use a bunch of \C-c keybindings." |
29490 | 661 :type 'string |
662 :group 'allout) | |
663 | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
664 ;;;_ = allout-keybindings-list |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
665 ;;; You have to reactivate allout-mode - `(allout-mode t)' - to |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
666 ;;; institute changes to this var. |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
667 (defvar allout-keybindings-list () |
48857
8641226163f1
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48856
diff
changeset
|
668 "*List of `allout-mode' key / function bindings, for `allout-mode-map'. |
8641226163f1
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48856
diff
changeset
|
669 |
8641226163f1
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48856
diff
changeset
|
670 String or vector key will be prefaced with `allout-command-prefix', |
29490 | 671 unless optional third, non-nil element is present.") |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
672 (setq allout-keybindings-list |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
673 '( |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
674 ; Motion commands: |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
675 ("\C-n" allout-next-visible-heading) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
676 ("\C-p" allout-previous-visible-heading) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
677 ("\C-u" allout-up-current-level) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
678 ("\C-f" allout-forward-current-level) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
679 ("\C-b" allout-backward-current-level) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
680 ("\C-a" allout-beginning-of-current-entry) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
681 ("\C-e" allout-end-of-entry) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
682 ; Exposure commands: |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
683 ("\C-i" allout-show-children) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
684 ("\C-s" allout-show-current-subtree) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
685 ("\C-h" allout-hide-current-subtree) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
686 ("h" allout-hide-current-subtree) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
687 ("\C-o" allout-show-current-entry) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
688 ("!" allout-show-all) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
689 ("x" allout-toggle-current-subtree-encryption) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
690 ; Alteration commands: |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
691 (" " allout-open-sibtopic) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
692 ("." allout-open-subtopic) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
693 ("," allout-open-supertopic) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
694 ("'" allout-shift-in) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
695 (">" allout-shift-in) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
696 ("<" allout-shift-out) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
697 ("\C-m" allout-rebullet-topic) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
698 ("*" allout-rebullet-current-heading) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
699 ("#" allout-number-siblings) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
700 ("\C-k" allout-kill-line t) |
73003
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
701 ("\M-k" allout-copy-line-as-kill t) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
702 ("\C-y" allout-yank t) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
703 ("\M-y" allout-yank-pop t) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
704 ("\C-k" allout-kill-topic) |
73003
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
705 ("\M-k" allout-copy-topic-as-kill) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
706 ; Miscellaneous commands: |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
707 ;([?\C-\ ] allout-mark-topic) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
708 ("@" 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
|
709 ("=c" allout-copy-exposed-to-buffer) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
710 ("=i" allout-indented-exposed-to-buffer) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
711 ("=t" allout-latexify-exposed) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
712 ("=p" allout-flatten-exposed-to-buffer))) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
713 |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
714 ;;;_ = 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
|
715 (defcustom allout-inhibit-auto-fill nil |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
716 "*If non-nil, auto-fill will be inhibited in the allout buffers. |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
717 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
718 You can customize this setting to set it for all allout buffers, or set it |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
719 in individual buffers if you want to inhibit auto-fill only in particular |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
720 buffers. \(You could use a function on `allout-mode-hook' to inhibit |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
721 auto-fill according, eg, to the major mode.\) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
722 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
723 If you don't set this and auto-fill-mode is enabled, allout will use the |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
724 value that `normal-auto-fill-function', if any, when allout mode starts, or |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
725 else allout's special hanging-indent maintaining auto-fill function, |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
726 `allout-auto-fill'." |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
727 :type 'boolean |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
728 :group 'allout) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
729 (make-variable-buffer-local 'allout-inhibit-auto-fill) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
730 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
731 ;;;_ = allout-use-hanging-indents |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
732 (defcustom allout-use-hanging-indents t |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
733 "*If non-nil, topic body text auto-indent defaults to indent of the header. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
734 Ie, it is indented to be just past the header prefix. This is |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
735 relevant mostly for use with indented-text-mode, or other situations |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
736 where auto-fill occurs." |
21088 | 737 :type 'boolean |
738 :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
|
739 (make-variable-buffer-local 'allout-use-hanging-indents) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
740 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
741 (put 'allout-use-hanging-indents 'safe-local-variable |
70673
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
742 (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
|
743 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
744 ;;;_ = 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
|
745 (defcustom allout-reindent-bodies (if allout-use-hanging-indents |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
746 'text) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
747 "*Non-nil enables auto-adjust of topic body hanging indent with depth shifts. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
748 |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
749 When active, topic body lines that are indented even with or beyond |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
750 their topic header are reindented to correspond with depth shifts of |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
751 the header. |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
752 |
50855
31ce4fcda3d8
(allout-auto-activation, allout-use-mode-specific-leader)
Juanma Barranquero <lekktu@gmail.com>
parents:
49966
diff
changeset
|
753 A value of t enables reindent in non-programming-code buffers, ie |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
754 those that do not have the variable `comment-start' set. A value of |
21088 | 755 `force' enables reindent whether or not `comment-start' is set." |
756 :type '(choice (const nil) (const t) (const text) (const force)) | |
757 :group 'allout) | |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
758 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
759 (make-variable-buffer-local 'allout-reindent-bodies) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
760 ;;;###autoload |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
761 (put 'allout-reindent-bodies 'safe-local-variable |
70616
b69cce4ff5a0
2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70256
diff
changeset
|
762 '(lambda (x) (memq x '(nil t text force)))) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
763 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
764 ;;;_ = 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
|
765 (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
|
766 "*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
|
767 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
768 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
|
769 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
|
770 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
771 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
|
772 is nil. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
773 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
774 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
|
775 For details, see `allout-toggle-current-subtree-encryption's docstring." |
21088 | 776 :type 'boolean |
777 :group 'allout) | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
778 (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
|
779 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
780 ;;;_* CODE - no user customizations below. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
781 |
29490 | 782 ;;;_ #1 Internal Outline Formatting and Configuration |
783 ;;;_ : 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
|
784 ;;;_ = allout-version |
69481
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
785 (defvar allout-version "2.2.1" |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
786 "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
|
787 ;;;_ > 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
|
788 (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
|
789 "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
|
790 (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
|
791 (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
|
792 (if here (insert msg)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
793 (message "%s" msg) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
794 msg)) |
67262
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
795 ;;;_ : 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
|
796 ;;;_ = allout-mode |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
797 (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
|
798 (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
|
799 ;;;_ = allout-layout nil |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
800 (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
|
801 "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
|
802 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
803 In buffers where this is non-nil \(and if `allout-init' has been run, to |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
804 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
|
805 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
|
806 `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
|
807 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
808 \*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
|
809 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
|
810 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
811 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
|
812 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
|
813 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
814 ;;;Local variables: |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
815 ;;;allout-layout: \(0 : -1 -1 0) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
816 ;;;End: |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
817 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
818 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
|
819 \(presuming allout-init was already run), followed by the |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
820 equivalent of `\(allout-expose-topic 0 : -1 -1 0)'. \(This is |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
821 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
|
822 |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
823 `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
|
824 `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
|
825 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
|
826 (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
|
827 ;;;###autoload |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
828 (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
|
829 '(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
|
830 |
29490 | 831 ;;;_ : 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
|
832 ;;;_ = 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
|
833 (defvar allout-regexp "" |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
834 "*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
|
835 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
836 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
|
837 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
|
838 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
|
839 (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
|
840 ;;;_ = 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
|
841 (defvar allout-bullets-string "" |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
842 "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
|
843 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
844 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
|
845 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
|
846 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
|
847 (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
|
848 ;;;_ = 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
|
849 (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
|
850 "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
|
851 (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
|
852 ;;;_ = allout-depth-specific-regexp |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
853 (defvar allout-depth-specific-regexp "" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
854 "*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
|
855 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
856 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
|
857 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
|
858 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
|
859 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
860 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
|
861 `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
|
862 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
|
863 topic prefix to be matched.") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
864 (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
|
865 ;;;_ = allout-depth-one-regexp |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
866 (defvar allout-depth-one-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 depth one. |
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 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
|
870 `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
|
871 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
|
872 topic prefix to be matched.") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
873 (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
|
874 ;;;_ = 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
|
875 (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
|
876 "`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
|
877 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
878 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
|
879 (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
|
880 ;;;_ = 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
|
881 (defvar allout-bob-regexp () |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
882 "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
|
883 (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
|
884 ;;;_ = 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
|
885 (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
|
886 "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
|
887 (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
|
888 ;;;_ = 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
|
889 (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
|
890 "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
|
891 (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
|
892 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
893 ;;;_ = allout-doublecheck-at-and-shallower |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
894 (defconst allout-doublecheck-at-and-shallower 2 |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
895 "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
|
896 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
897 Verified with `allout-aberrant-container-p'. This check's usefulness is |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
898 limited to shallow prospects, because the determination of aberrance |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
899 depends on the mistaken item being followed by a legitimate item of |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
900 excessively greater depth. |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
901 |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
902 A level of 2 is safest, so that yanks, which must ignore |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
903 aberrance while rectifying the yanked text to their new location, |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
904 is least likely to be fooled by aberrant topics in the yanked |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
905 text.") |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
906 ;;;_ 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
|
907 (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
|
908 "*Reset the leading string used to identify topic headers." |
3430 | 909 (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
|
910 (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
|
911 (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
|
912 (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
|
913 ;;;_ 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
|
914 (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
|
915 "*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
|
916 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
917 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
|
918 language comments. Returns the leading string." |
3430 | 919 |
920 (interactive "P") | |
921 (if (not (stringp header-lead)) | |
922 (setq header-lead (read-string | |
923 "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
|
924 (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
|
925 (allout-reset-header-lead header-lead) |
3430 | 926 header-lead) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
927 ;;;_ > 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
|
928 (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
|
929 "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
|
930 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
931 Works according to settings of: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
932 |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
933 `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
|
934 `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
|
935 `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
|
936 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
|
937 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
938 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
|
939 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
|
940 (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
|
941 (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
|
942 (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
|
943 '(allout-mode-leaders |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
944 comment-start |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
945 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
|
946 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
|
947 ;; 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
|
948 t))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
949 (leader |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
950 (cond |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
951 ((not use-leader) nil) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
952 ;; Use the explicitly designated leader: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
953 ((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
|
954 (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
|
955 ;; 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
|
956 (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
|
957 ;; ... 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
|
958 (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
|
959 comment-start |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
960 ;; Use comment-start, maybe tripled, and with |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
961 ;; underscore: |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
962 (concat |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
963 (if (string= " " |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
964 (substring comment-start |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
965 (1- (length comment-start)))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
966 ;; 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
|
967 (substring comment-start 0 -1) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
968 (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
|
969 ;; ... and append underscore, whichever: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
970 "_"))))))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
971 (if (not leader) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
972 nil |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
973 (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
|
974 (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
|
975 ;; 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
|
976 ;; 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
|
977 (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
|
978 allout-header-prefix))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
979 (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
|
980 '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
|
981 ;;;_ > 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
|
982 (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
|
983 "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
|
984 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
985 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
|
986 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
|
987 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
|
988 (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
|
989 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
|
990 (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
|
991 (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
|
992 ;;;_ > 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
|
993 (defun set-allout-regexp () |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
994 "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
|
995 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
996 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
|
997 `allout-distinctive-bullets-string'. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
998 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
999 Also refresh various data structures that hinge on the regexp." |
3430 | 1000 |
1001 (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
|
1002 ;; 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
|
1003 (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
|
1004 (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
|
1005 '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
|
1006 'allout-primary-bullet)) |
3430 | 1007 cur-string |
1008 cur-len | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1009 cur-char |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1010 index) |
3430 | 1011 (while strings |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1012 (setq index 0) |
3430 | 1013 (setq cur-len (length (setq cur-string (symbol-value (car strings))))) |
1014 (while (< index cur-len) | |
1015 (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
|
1016 (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
|
1017 (concat allout-bullets-string |
3430 | 1018 (cond |
1019 ; Single dash would denote a | |
1020 ; sequence, repeated denotes | |
1021 ; a dash: | |
1022 ((eq cur-char ?-) "--") | |
1023 ; literal close-square-bracket | |
1024 ; doesn't work right in the | |
1025 ; expr, exclude it: | |
1026 ((eq cur-char ?\]) "") | |
1027 (t (regexp-quote (char-to-string cur-char)))))) | |
1028 (setq index (1+ index))) | |
1029 (setq strings (cdr strings))) | |
1030 ) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1031 ;; 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
|
1032 (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
|
1033 (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
|
1034 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1035 (let (new-part old-part) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1036 (setq new-part (concat "\\(" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1037 (regexp-quote allout-header-prefix) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1038 "[ \t]*" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1039 ;; 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
|
1040 "[" allout-bullets-string "]" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1041 "\\)") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1042 old-part (concat "\\(" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1043 (regexp-quote allout-primary-bullet) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1044 "\\|" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1045 (regexp-quote allout-header-prefix) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1046 "\\)" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1047 "+" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1048 " ?[^" allout-primary-bullet "]") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1049 allout-regexp (concat new-part |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1050 "\\|" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1051 old-part |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1052 "\\|\^l") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1053 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1054 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
|
1055 "\\|" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1056 "\n" old-part) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1057 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1058 allout-bob-regexp (concat "\\`" new-part |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1059 "\\|" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1060 "\\`" old-part)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1061 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1062 (setq allout-depth-specific-regexp |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1063 (concat "\\(^\\|\\`\\)" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1064 "\\(" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1065 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1066 ;; new-style spacers-then-bullet 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 (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
|
1069 " \\{%s\\}" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1070 "[" (allout-format-quote allout-bullets-string) "]" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1071 "\\)" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1072 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1073 ;; 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
|
1074 (if (< 0 allout-header-subtraction) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1075 "" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1076 (concat "\\|\\(" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1077 (allout-format-quote |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1078 (regexp-quote allout-primary-bullet)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1079 (allout-format-quote |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1080 (regexp-quote allout-primary-bullet)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1081 (allout-format-quote |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1082 (regexp-quote allout-primary-bullet)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1083 "\\{%s\\}" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1084 ;; disqualify greater depths: |
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 (allout-format-quote allout-primary-bullet) |
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 )) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1089 "\\)" |
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 (setq allout-depth-one-regexp |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1092 (concat "\\(^\\|\\`\\)" |
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 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1095 "\\(" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1096 (regexp-quote allout-header-prefix) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1097 ;; 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
|
1098 ;; intervening whitespace: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1099 " *" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1100 (concat "[^ " allout-bullets-string "]") |
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 (if (< 0 allout-header-subtraction) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1103 ;; 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
|
1104 ;; 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
|
1105 "" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1106 (concat "\\|" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1107 (regexp-quote allout-primary-bullet) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1108 ;; disqualify deeper primary-bullet sequences: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1109 "[^" allout-primary-bullet "]")) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1110 "\\)" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1111 )))) |
29490 | 1112 ;;;_ : 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
|
1113 ;;;_ = 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
|
1114 (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
|
1115 ;;;_ > 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
|
1116 (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
|
1117 "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
|
1118 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1119 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
|
1120 See doc string for allout-keybindings-list for format of binding list." |
29490 | 1121 (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
|
1122 (pref (list allout-command-prefix))) |
29490 | 1123 (mapcar (function |
1124 (lambda (cell) | |
1125 (let ((add-pref (null (cdr (cdr cell)))) | |
1126 (key-suff (list (car cell)))) | |
1127 (apply 'define-key | |
1128 (list map | |
1129 (apply 'concat (if add-pref | |
1130 (append pref key-suff) | |
1131 key-suff)) | |
1132 (car (cdr cell))))))) | |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1133 keymap-list) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1134 map)) |
29490 | 1135 ;;;_ : Menu bar |
54952
5e2b4f7225cb
(allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents:
54770
diff
changeset
|
1136 (defvar allout-mode-exposure-menu) |
5e2b4f7225cb
(allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents:
54770
diff
changeset
|
1137 (defvar allout-mode-editing-menu) |
5e2b4f7225cb
(allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents:
54770
diff
changeset
|
1138 (defvar allout-mode-navigation-menu) |
5e2b4f7225cb
(allout-mode-exposure-menu, allout-mode-editing-menu):
Richard M. Stallman <rms@gnu.org>
parents:
54770
diff
changeset
|
1139 (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
|
1140 (defun produce-allout-mode-menubar-entries () |
29490 | 1141 (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
|
1142 (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
|
1143 allout-mode-map |
29490 | 1144 "Allout outline exposure menu." |
1145 '("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
|
1146 ["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
|
1147 ["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
|
1148 ["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
|
1149 ["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
|
1150 ["Hide Leaves" allout-hide-current-leaves t] |
29490 | 1151 "----" |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1152 ["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
|
1153 (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
|
1154 allout-mode-map |
29490 | 1155 "Allout outline editing menu." |
1156 '("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
|
1157 ["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
|
1158 ["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
|
1159 ["Open Supertopic" allout-open-supertopic t] |
29490 | 1160 "----" |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1161 ["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
|
1162 ["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
|
1163 ["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
|
1164 ["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
|
1165 ["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
|
1166 "----" |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1167 ["Toggle Topic Encryption" |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1168 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
|
1169 (> (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
|
1170 (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
|
1171 allout-mode-map |
29490 | 1172 "Allout outline navigation menu." |
1173 '("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
|
1174 ["Next Visible Heading" allout-next-visible-heading t] |
29490 | 1175 ["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
|
1176 allout-previous-visible-heading t] |
29490 | 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 ["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
|
1179 ["Forward Current Level" allout-forward-current-level t] |
29490 | 1180 ["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
|
1181 allout-backward-current-level t] |
29490 | 1182 "----" |
1183 ["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
|
1184 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
|
1185 ["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
|
1186 ["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
|
1187 (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
|
1188 allout-mode-map |
29490 | 1189 "Allout outlines miscellaneous bindings." |
1190 '("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
|
1191 ["Version" allout-version t] |
29490 | 1192 "----" |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1193 ["Duplicate Exposed" allout-copy-exposed-to-buffer t] |
29490 | 1194 ["Duplicate Exposed, numbered" |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
1195 allout-flatten-exposed-to-buffer t] |
29490 | 1196 ["Duplicate Exposed, indented" |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
1197 allout-indented-exposed-to-buffer t] |
29490 | 1198 "----" |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1199 ["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
|
1200 ["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
|
1201 ;;;_ : 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
|
1202 ;;;_ = 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
|
1203 (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
|
1204 "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
|
1205 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1206 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
|
1207 (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
|
1208 ;;;_ > 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
|
1209 (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
|
1210 "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
|
1211 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1212 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
|
1213 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1214 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
|
1215 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
|
1216 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
|
1217 |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1218 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
|
1219 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
|
1220 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
|
1221 as described further below. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1222 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1223 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
|
1224 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
|
1225 existing value. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1226 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1227 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
|
1228 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
|
1229 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
|
1230 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1231 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
|
1232 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
|
1233 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1234 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
|
1235 (while pairs |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1236 (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
|
1237 (name (car pair)) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1238 (value (cadr pair)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1239 (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
|
1240 (caddr pair))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1241 prior-value) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1242 (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
|
1243 (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
|
1244 name (type-of name))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1245 (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
|
1246 (symbol-value name) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1247 (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
|
1248 (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
|
1249 ;; 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
|
1250 (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
|
1251 ;; 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
|
1252 (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
|
1253 ;; 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
|
1254 ;; 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
|
1255 (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
|
1256 (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
|
1257 (if qualifier |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1258 (cond ((eq qualifier 'extend) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1259 (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
|
1260 (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
|
1261 (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
|
1262 ((eq qualifier 'append) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1263 (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
|
1264 (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
|
1265 (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
|
1266 (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
|
1267 qualifier))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1268 (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
|
1269 ;;;_ > allout-do-resumptions () |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1270 (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
|
1271 "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
|
1272 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1273 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
|
1274 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
|
1275 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1276 (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
|
1277 (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
|
1278 (name (car pair)) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1279 (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
|
1280 (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
|
1281 ;; 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
|
1282 (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
|
1283 ;; 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
|
1284 (set name (car value-cell)))))) |
29490 | 1285 ;;;_ : 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
|
1286 ;;;_ > allout-unprotected (expr) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1287 (defmacro allout-unprotected (expr) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1288 "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
|
1289 `(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
|
1290 (inhibit-field-text-motion t)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1291 ,expr)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1292 ;;;_ = allout-mode-hook |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1293 (defvar allout-mode-hook nil |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1294 "*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
|
1295 ;;;_ = 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
|
1296 (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
|
1297 "*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
|
1298 ;;;_ = allout-exposure-category |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1299 (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
|
1300 "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
|
1301 ;;;_ x allout-view-change-hook |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1302 (defvar allout-view-change-hook nil |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1303 "*\(Deprecated\) A hook run after allout outline exposure changes. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1304 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1305 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
|
1306 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
|
1307 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
|
1308 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
|
1309 ;;;_ = allout-exposure-change-hook |
b69cce4ff5a0
2006-05-12 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70256
diff
changeset
|
1310 (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
|
1311 "*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
|
1312 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1313 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
|
1314 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1315 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
|
1316 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1317 - 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
|
1318 - 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
|
1319 - 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
|
1320 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1321 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
|
1322 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1323 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
|
1324 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
|
1325 ;;;_ = allout-structure-added-hook |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1326 (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
|
1327 "*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
|
1328 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1329 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
|
1330 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1331 - 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
|
1332 - 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
|
1333 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1334 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
|
1335 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
|
1336 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1337 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
|
1338 ;;;_ = allout-structure-deleted-hook |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1339 (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
|
1340 "*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
|
1341 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1342 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
|
1343 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1344 - 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
|
1345 - 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
|
1346 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1347 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
|
1348 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
|
1349 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1350 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
|
1351 ;;;_ = allout-structure-shifted-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-shifted-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 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
|
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 - 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
|
1358 - 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
|
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 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
|
1361 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.") |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1364 ;;;_ = allout-outside-normal-auto-fill-function |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1365 (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
|
1366 "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
|
1367 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1368 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
|
1369 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
|
1370 (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
|
1371 ;;;_ = 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
|
1372 (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
|
1373 "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
|
1374 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
|
1375 to track repeats.") |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1376 ;;;_ = allout-passphrase-verifier-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1377 (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
|
1378 "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
|
1379 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
|
1380 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1381 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
|
1382 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
|
1383 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
|
1384 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
|
1385 search attacks. |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1386 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1387 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
|
1388 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
|
1389 `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
|
1390 (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
|
1391 ;;;###autoload |
70225
81a284d45346
(allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70002
diff
changeset
|
1392 (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
|
1393 ;;;_ = allout-passphrase-hint-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1394 (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
|
1395 "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
|
1396 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1397 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
|
1398 the reminder is deployed. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1399 |
73763
89b9e8184350
(allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
73660
diff
changeset
|
1400 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
|
1401 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
|
1402 `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
|
1403 (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
|
1404 (setq-default allout-passphrase-hint-string "") |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
1405 ;;;###autoload |
70225
81a284d45346
(allout-layout, allout-passphrase-verifier-string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70002
diff
changeset
|
1406 (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
|
1407 ;;;_ = allout-after-save-decrypt |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1408 (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
|
1409 "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
|
1410 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1411 - 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
|
1412 - 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
|
1413 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1414 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
|
1415 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
|
1416 (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
|
1417 ;;;_ = 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
|
1418 (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
|
1419 "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
|
1420 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1421 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
|
1422 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
|
1423 prior to encryption. |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1424 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1425 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
|
1426 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1427 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
|
1428 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
|
1429 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
|
1430 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
|
1431 (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
|
1432 ;;;_ = 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
|
1433 (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
|
1434 "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
|
1435 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1436 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
|
1437 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
|
1438 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
|
1439 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1440 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
|
1441 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1442 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
|
1443 `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
|
1444 is raised.") |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1445 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1446 (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
|
1447 ;;;_ = 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
|
1448 (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
|
1449 "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
|
1450 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1451 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
|
1452 (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
|
1453 ;;;_ > allout-mode-p () |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
1454 ;; 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
|
1455 ;; 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
|
1456 (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
|
1457 "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
|
1458 'allout-mode) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1459 ;;;_ > 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
|
1460 (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
|
1461 "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
|
1462 |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1463 (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
|
1464 (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
|
1465 (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
|
1466 nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1467 (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
|
1468 'except-current) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1469 (point-marker)))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1470 (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
|
1471 (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
|
1472 (progn |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1473 (message "auto-encrypting pending topics") |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1474 (sit-for 0) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1475 (condition-case failure |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1476 (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
|
1477 (allout-encrypt-decrypted except-mark)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1478 (error (progn |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1479 (message |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1480 "allout-write-file-hook-handler suppressing error %s" |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1481 failure) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1482 (sit-for 2)))))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1483 )) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1484 nil) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1485 ;;;_ > 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
|
1486 (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
|
1487 "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
|
1488 |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1489 (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
|
1490 ;; 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
|
1491 (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
|
1492 (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
|
1493 ;;;_ > allout-after-saves-handler () |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1494 (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
|
1495 "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
|
1496 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1497 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
|
1498 the save. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1499 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1500 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
|
1501 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
|
1502 (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
|
1503 (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
|
1504 allout-after-save-decrypt)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1505 t |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1506 (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
|
1507 (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
|
1508 (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
|
1509 (if (not was-modified) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1510 (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
|
1511 (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
|
1512 (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
|
1513 ) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
1514 ;;;_ = allout-during-yank-processing nil |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
1515 ;; XXX allout yanks adjust the level of the topic being pasted to that of |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
1516 ;; their target location. aberrance must be inhibited to allow that |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
1517 ;; reconciliation. (this means that actually aberrant topics won't be |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
1518 ;; treated specially while being pasted.) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
1519 (defvar allout-during-yank-processing nil |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
1520 "Internal state, inhibits aberrance doublecheck while adjusting yanks.") |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1521 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1522 ;;;_ #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
|
1523 ;;;_ = 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
|
1524 (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
|
1525 "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
|
1526 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
|
1527 (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
|
1528 ;;;_ > 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
|
1529 (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
|
1530 "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
|
1531 |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1532 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
|
1533 |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1534 - nil \(or no argument) deactivate auto-activation/layout; |
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1535 - `activate', enable auto-activation only; |
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1536 - `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
|
1537 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
|
1538 - `report', just report and return the current auto-activation state; |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1539 - anything else \(eg, t) for auto-activation and auto-layout, without |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1540 any confirmation check. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1541 |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
1542 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
|
1543 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
|
1544 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
|
1545 `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
|
1546 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1547 `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
|
1548 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
|
1549 setting. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1550 |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
1551 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
|
1552 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
|
1553 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1554 \(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
|
1555 \(allout-init t)" |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1556 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1557 (interactive) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1558 (if (interactive-p) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1559 (progn |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1560 (setq mode |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1561 (completing-read |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1562 (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
|
1563 "(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
|
1564 '(("nil")("full")("activate")("deactivate") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1565 ("ask") ("report") ("")) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1566 nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1567 t)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1568 (if (string= mode "") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1569 (setq mode 'report) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1570 (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
|
1571 (let |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1572 ;; 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
|
1573 ((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
|
1574 (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
|
1575 'find-file-hook |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1576 '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
|
1577 (curr-mode 'allout-auto-activation)) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1578 |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1579 (cond ((not mode) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1580 (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
|
1581 (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
|
1582 (if (interactive-p) |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1583 (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
|
1584 ((eq mode 'report) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1585 (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
|
1586 (allout-init nil) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1587 ;; 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
|
1588 (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
|
1589 (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
|
1590 (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
|
1591 (cond ((eq mode 'activate) |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1592 (message |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1593 "Outline mode auto-activation enabled.") |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1594 'activate) |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1595 ((eq mode 'report) |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1596 ;; 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
|
1597 (allout-init mode)) |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1598 ((eq mode 'ask) |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1599 (message |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1600 (concat "Outline mode auto-activation and " |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1601 "-layout \(upon confirmation) enabled.")) |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1602 'ask) |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1603 ((message |
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
1604 "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
|
1605 '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
|
1606 ;;;_ > 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
|
1607 (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
|
1608 "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
|
1609 (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
|
1610 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
|
1611 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
|
1612 allout-mode-misc-menu)) |
29490 | 1613 cur) |
1614 (while menus | |
1615 (setq cur (car menus) | |
1616 menus (cdr menus)) | |
1617 (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
|
1618 ;;;_ > allout-overlay-preparations |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1619 (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
|
1620 "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
|
1621 (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
|
1622 (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
|
1623 (put 'allout-exposure-category 'evaporate t) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1624 ;; 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
|
1625 ;; 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
|
1626 ;; 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
|
1627 ;; 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
|
1628 ;; 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
|
1629 ;; 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
|
1630 (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
|
1631 'allout-isearch-end-handler) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1632 (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
|
1633 (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
|
1634 (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
|
1635 '(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
|
1636 (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
|
1637 '(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
|
1638 ;;;_ > allout-mode (&optional toggle) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1639 ;;;_ : Defun: |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1640 ;;;###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
|
1641 (defun allout-mode (&optional toggle) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1642 ;;;_ . Doc string: |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1643 "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
|
1644 \\<allout-mode-map> |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1645 |
29490 | 1646 Optional arg forces mode to re-initialize iff arg is positive num or |
1647 symbol. Allout outline mode always runs as a minor mode. | |
1648 | |
48858
f4d079377a9a
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48857
diff
changeset
|
1649 Allout outline mode provides extensive outline oriented formatting and |
29490 | 1650 manipulation. It enables structural editing of outlines, as well as |
1651 navigation and exposure. It also is specifically aimed at | |
1652 accommodating syntax-sensitive text like programming languages. \(For | |
1653 an example, see the allout code itself, which is organized as an allout | |
1654 outline.) | |
1655 | |
1656 In addition to outline navigation and exposure, allout includes: | |
1657 | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1658 - topic-oriented repositioning, promotion/demotion, cut, and paste |
29490 | 1659 - integral outline exposure-layout |
1660 - incremental search with dynamic exposure and reconcealment of hidden text | |
1661 - automatic topic-number maintenance | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1662 - easy topic encryption and decryption |
29490 | 1663 - \"Hot-spot\" operation, for single-keystroke maneuvering and |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1664 exposure control. \(See the allout-mode docstring.) |
29490 | 1665 |
1666 and many other features. | |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1667 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1668 Below is a description of the 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
|
1669 special `allout-mode' features and terminology. See also the outline |
29490 | 1670 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
|
1671 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
|
1672 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
|
1673 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1674 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1675 The bindings are dictated by the `allout-keybindings-list' and |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1676 `allout-command-prefix' variables. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1677 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1678 Navigation: Exposure Control: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1679 ---------- ---------------- |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1680 \\[allout-next-visible-heading] allout-next-visible-heading | \\[allout-hide-current-subtree] allout-hide-current-subtree |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1681 \\[allout-previous-visible-heading] allout-previous-visible-heading | \\[allout-show-children] allout-show-children |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1682 \\[allout-up-current-level] allout-up-current-level | \\[allout-show-current-subtree] allout-show-current-subtree |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1683 \\[allout-forward-current-level] allout-forward-current-level | \\[allout-show-current-entry] allout-show-current-entry |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1684 \\[allout-backward-current-level] allout-backward-current-level | \\[allout-show-all] allout-show-all |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1685 \\[allout-end-of-entry] allout-end-of-entry |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1686 \\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1687 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1688 Topic Header Production: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1689 ----------------------- |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1690 \\[allout-open-sibtopic] allout-open-sibtopic Create a new sibling after current topic. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1691 \\[allout-open-subtopic] allout-open-subtopic ... an offspring of current topic. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1692 \\[allout-open-supertopic] allout-open-supertopic ... a sibling of the current topic's parent. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1693 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1694 Topic Level and Prefix Adjustment: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1695 --------------------------------- |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1696 \\[allout-shift-in] allout-shift-in Shift current topic and all offspring deeper. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1697 \\[allout-shift-out] allout-shift-out ... less deep. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1698 \\[allout-rebullet-current-heading] allout-rebullet-current-heading Prompt for alternate bullet for |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1699 current topic. |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1700 \\[allout-rebullet-topic] allout-rebullet-topic Reconcile bullets of topic and its offspring |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1701 - distinctive bullets are not changed, others |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1702 alternated according to nesting depth. |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1703 \\[allout-number-siblings] allout-number-siblings Number bullets of topic and siblings - the |
3430 | 1704 offspring are not affected. With repeat |
1705 count, revoke numbering. | |
1706 | |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1707 Topic-oriented Killing and Yanking: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1708 ---------------------------------- |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1709 \\[allout-kill-topic] allout-kill-topic Kill current topic, including offspring. |
73003
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
1710 \\[allout-copy-topic-as-kill] allout-copy-topic-as-kill Copy current topic, including offspring. |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
1711 \\[allout-kill-line] allout-kill-line kill-line, attending to outline structure. |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
1712 \\[allout-copy-line-as-kill] allout-copy-line-as-kill Copy line but don't delete it. |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1713 \\[allout-yank] allout-yank Yank, adjusting depth of yanked topic to |
3430 | 1714 depth of heading if yanking into bare topic |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1715 heading (ie, prefix sans text). |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1716 \\[allout-yank-pop] allout-yank-pop Is to allout-yank as yank-pop is to yank |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1717 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1718 Topic-oriented Encryption: |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1719 ------------------------- |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1720 \\[allout-toggle-current-subtree-encryption] allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content |
3430 | 1721 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1722 Misc commands: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1723 ------------- |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1724 M-x outlineify-sticky Activate outline mode for current buffer, |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1725 and establish a default file-var 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
|
1726 for `allout-layout'. |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1727 \\[allout-mark-topic] allout-mark-topic |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
1728 \\[allout-copy-exposed-to-buffer] allout-copy-exposed-to-buffer |
29490 | 1729 Duplicate outline, sans concealed text, to |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1730 buffer with name derived from derived from that |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1731 of current buffer - \"*BUFFERNAME exposed*\". |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1732 \\[allout-flatten-exposed-to-buffer] allout-flatten-exposed-to-buffer |
29490 | 1733 Like above 'copy-exposed', but convert topic |
1734 prefixes to section.subsection... numeric | |
1735 format. | |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1736 \\[eval-expression] (allout-init t) Setup Emacs session for outline mode |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1737 auto-activation. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1738 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1739 Topic Encryption |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1740 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1741 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
|
1742 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
|
1743 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
|
1744 mode, and auto-encryption of topics pending encryption on save. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1745 \(Topics pending encryption are, by default, automatically |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1746 encrypted during file saves; if you're editing the contents of |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1747 such a topic, it is automatically decrypted for continued |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1748 editing.) The aim is reliable topic privacy while preventing |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1749 accidents like neglected encryption before saves, forgetting |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1750 which passphrase was used, and other practical pitfalls. |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1751 |
67262
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
1752 See `allout-toggle-current-subtree-encryption' function docstring and |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1753 `allout-encrypt-unencrypted-on-saves' customization variable for details. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1754 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1755 HOT-SPOT Operation |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1756 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1757 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
|
1758 navigation and exposure control. |
3430 | 1759 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1760 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
|
1761 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
|
1762 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
|
1763 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
|
1764 \(\\[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
|
1765 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1766 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
|
1767 execute the outline navigation and manipulation commands with a |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1768 single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1769 this special translation, so you can use them to get out of the |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1770 hot-spot and back to normal operation. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1771 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1772 Note that the command `allout-beginning-of-current-entry' \(\\[allout-beginning-of-current-entry]\) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1773 will move to the hot-spot when the cursor is already located at the |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1774 beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry] |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1775 twice in a row to get to the hot-spot. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1776 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1777 Terminology |
3430 | 1778 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1779 Topic hierarchy constituents - TOPICS and SUBTOPICS: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1780 |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
1781 TOPIC: A basic, coherent component of an Emacs outline. It can |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1782 contain and be contained by other topics. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1783 CURRENT topic: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1784 The visible topic most immediately containing the cursor. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1785 DEPTH: The degree of nesting of a topic; it increases with |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1786 containment. Also called the: |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1787 LEVEL: The same as DEPTH. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1788 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1789 ANCESTORS: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1790 The topics that contain a topic. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1791 PARENT: A topic's immediate ancestor. It has a depth one less than |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1792 the topic. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1793 OFFSPRING: |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1794 The topics contained by a topic; |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1795 SUBTOPIC: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1796 An immediate offspring of a topic; |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1797 CHILDREN: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1798 The immediate offspring of a topic. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1799 SIBLINGS: |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1800 Topics having the same parent and depth. |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1801 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1802 Topic text constituents: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1803 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1804 HEADER: The first line of a topic, include the topic PREFIX and header |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1805 text. |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1806 PREFIX: The leading text of a topic which distinguishes it from normal |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1807 text. It has a strict form, which consists of a prefix-lead |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1808 string, padding, and a bullet. The bullet may be followed by a |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1809 number, indicating the ordinal number of the topic among its |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
1810 siblings, a space, and then the header text. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1811 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1812 The relative length of the PREFIX determines the nesting depth |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1813 of the topic. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1814 PREFIX-LEAD: |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1815 The string at the beginning of a topic prefix, normally a `.'. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1816 It can be customized by changing the setting 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
|
1817 `allout-header-prefix' and then reinitializing `allout-mode'. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1818 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1819 By setting the prefix-lead to the comment-string of a |
48858
f4d079377a9a
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48857
diff
changeset
|
1820 programming language, you can embed outline structuring in |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1821 program code without interfering with the language 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
|
1822 of that code. See `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
|
1823 docstring for more detail. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1824 PREFIX-PADDING: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1825 Spaces or asterisks which separate the prefix-lead and the |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1826 bullet, determining the depth of the topic. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1827 BULLET: A character at the end of the topic prefix, it must be one 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
|
1828 the characters listed on `allout-plain-bullets-string' or |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1829 `allout-distinctive-bullets-string'. (See the documentation |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1830 for these variables for more details.) The default choice of |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1831 bullet when generating topics varies in a cycle with the depth of |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1832 the topic. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1833 ENTRY: The text contained in a topic before any offspring. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1834 BODY: Same as ENTRY. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1835 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1836 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1837 EXPOSURE: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1838 The state of a topic which determines the on-screen visibility |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1839 of its offspring and contained text. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1840 CONCEALED: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1841 Topics and entry text whose display is inhibited. Contiguous |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1842 units of concealed text is represented by `...' ellipses. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1843 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1844 Concealed topics are effectively collapsed within an ancestor. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1845 CLOSED: A topic whose immediate offspring and body-text is concealed. |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1846 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
|
1847 ;;;_ . Code |
3430 | 1848 (interactive "P") |
1849 | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1850 (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
|
1851 (allout-mode-p))) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1852 ; Massage universal-arg `toggle' val: |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1853 (toggle (and toggle |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1854 (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
|
1855 toggle))) |
13964
4de229297f1f
(outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
1856 ; 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
|
1857 (explicit-activation (and toggle |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1858 (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
|
1859 (and (wholenump toggle) |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
1860 (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
|
1861 ;; 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
|
1862 (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
|
1863 (car command-history))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1864 (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
|
1865 'write-file-functions) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1866 ((boundp 'write-file-hooks) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1867 'write-file-hooks) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1868 (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
|
1869 do-layout |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1870 ) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1871 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1872 ; 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
|
1873 (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
|
1874 |
3430 | 1875 (cond |
1876 | |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1877 ;; 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
|
1878 ;; 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
|
1879 ;; 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
|
1880 ;; 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
|
1881 ;; skip everything. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1882 ((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
|
1883 ; 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
|
1884 active ; Already activated. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1885 (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
|
1886 (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
|
1887 emacs-version)); 19.19. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1888 t) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1889 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1890 ;; Deactivation: |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1891 ((and (not explicit-activation) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1892 (or active toggle)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1893 ; Activation not explicitly |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1894 ; requested, and either in |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1895 ; active state or *de*activation |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1896 ; 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
|
1897 (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
|
1898 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1899 (allout-do-resumptions) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1900 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1901 (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
|
1902 (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
|
1903 (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
|
1904 (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
|
1905 (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
|
1906 (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
|
1907 (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
|
1908 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1909 (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
|
1910 '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
|
1911 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1912 (setq allout-mode nil) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1913 (run-hooks 'allout-mode-deactivate-hook)) |
3430 | 1914 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1915 ;; Activation: |
3430 | 1916 ((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
|
1917 (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
|
1918 (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
|
1919 ;; 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
|
1920 (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
|
1921 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1922 (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
|
1923 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
1924 (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
|
1925 (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
|
1926 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1927 (set-allout-regexp) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1928 (allout-add-resumptions |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1929 '(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
|
1930 allout-line-boundary-regexp |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1931 extend) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1932 '(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
|
1933 allout-bob-regexp |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1934 extend)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
1935 |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1936 ;; Produce map from current version of allout-keybindings-list: |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1937 (setq allout-mode-map |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1938 (produce-allout-mode-map allout-keybindings-list)) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1939 (substitute-key-definition 'beginning-of-line |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1940 'allout-beginning-of-line |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1941 allout-mode-map global-map) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1942 (substitute-key-definition 'move-beginning-of-line |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1943 'allout-beginning-of-line |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1944 allout-mode-map global-map) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1945 (substitute-key-definition 'end-of-line |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1946 'allout-end-of-line |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1947 allout-mode-map global-map) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1948 (substitute-key-definition 'move-end-of-line |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
1949 'allout-end-of-line |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1950 allout-mode-map global-map) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1951 (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
|
1952 (fset 'allout-mode-map allout-mode-map) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1953 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1954 ;; 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
|
1955 (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
|
1956 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
|
1957 (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
|
1958 (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
|
1959 minor-mode-map-alist))) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
1960 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
1961 (add-to-invisibility-spec '(allout . t)) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1962 (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
|
1963 (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
|
1964 (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
|
1965 (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
|
1966 nil t) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1967 (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
|
1968 (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
|
1969 nil t) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1970 (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
|
1971 nil t) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1972 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1973 ;; 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
|
1974 ;; 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
|
1975 ;; 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
|
1976 ;; etc.) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1977 (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
|
1978 ;; 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
|
1979 (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
|
1980 (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
|
1981 auto-fill-function) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1982 ;; 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
|
1983 ;; filling is active: |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1984 (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
|
1985 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
|
1986 '(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
|
1987 ;; 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
|
1988 (list 'paragraph-start |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1989 (concat paragraph-start "\\|^\\(" |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1990 allout-regexp "\\)")) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1991 (list 'paragraph-separate |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1992 (concat paragraph-separate "\\|^\\(" |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
1993 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
|
1994 (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
|
1995 (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
|
1996 (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
|
1997 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
1998 (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
|
1999 |
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-layout |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2001 (setq do-layout t)) |
3430 | 2002 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2003 (setq allout-mode t) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2004 (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
|
2005 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2006 ;; Reactivation: |
7527
1f09079e18c4
(outline-mode): Use outline-this-or-next-heading.
Richard M. Stallman <rms@gnu.org>
parents:
7476
diff
changeset
|
2007 ((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
|
2008 (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
|
2009 ) ;; 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
|
2010 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
2011 ;; 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
|
2012 (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
|
2013 allout-layout |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2014 allout-default-layout))) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2015 (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
|
2016 allout-auto-activation |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2017 use-layout |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2018 (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
|
2019 (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
|
2020 (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
|
2021 (buffer-name) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2022 use-layout)) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2023 t |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2024 (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
|
2025 nil) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2026 t))) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2027 (save-excursion |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2028 (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
|
2029 (goto-char 0) |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2030 (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
|
2031 (condition-case err |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2032 (progn |
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
2033 (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
|
2034 (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
|
2035 ;; 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
|
2036 ;; 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
|
2037 (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
|
2038 (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
|
2039 allout-mode |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2040 ) ; let* |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2041 ) ; defun |
69250
85c3b33d6427
Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents:
69124
diff
changeset
|
2042 ;;;_ > allout-minor-mode |
85c3b33d6427
Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents:
69124
diff
changeset
|
2043 (defalias 'allout-minor-mode 'allout-mode) |
68956
af2db645bc9d
(allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents:
68953
diff
changeset
|
2044 |
af2db645bc9d
(allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents:
68953
diff
changeset
|
2045 ;;;_ - Position Assessment |
af2db645bc9d
(allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents:
68953
diff
changeset
|
2046 ;;;_ > allout-hidden-p (&optional pos) |
af2db645bc9d
(allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents:
68953
diff
changeset
|
2047 (defsubst allout-hidden-p (&optional pos) |
af2db645bc9d
(allout-hidden-p): Move this defsubts before
Eli Zaretskii <eliz@gnu.org>
parents:
68953
diff
changeset
|
2048 "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
|
2049 (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
|
2050 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2051 ;;;_ > 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
|
2052 ;;; &optional prelen) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2053 (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
|
2054 &optional prelen) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2055 "Shift the overlay so stuff inserted in front of it are excluded." |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2056 (if after |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2057 (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
|
2058 ;;;_ > 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
|
2059 ;;; &optional prelen) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2060 (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
|
2061 &optional prelen) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2062 "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
|
2063 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2064 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
|
2065 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
|
2066 reclosing the opened text. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2067 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2068 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
|
2069 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
|
2070 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2071 (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
|
2072 (let ((start (point)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2073 (ol-start (overlay-start ol)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2074 (ol-end (overlay-end ol)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2075 first) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2076 (goto-char beg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2077 (while (< (point) end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2078 (when (allout-hidden-p) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2079 (allout-show-to-offshoot) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2080 (if (allout-hidden-p) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2081 (save-excursion (forward-char 1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2082 (allout-show-to-offshoot))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2083 (when (not first) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2084 (setq first (point)))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2085 (goto-char (if (featurep 'xemacs) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2086 (next-property-change (1+ (point)) nil end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2087 (next-char-property-change (1+ (point)) end)))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2088 (when first |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2089 (goto-char first) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2090 (condition-case nil |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2091 (if (not |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2092 (yes-or-no-p |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2093 (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
|
2094 (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
|
2095 " \\[keyboard-quit] also reconceals) ")))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2096 (progn (goto-char start) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2097 (error "Concealed-text change refused."))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2098 (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
|
2099 (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
|
2100 (error "Concealed-text change abandoned, text reconcealed.")))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2101 (goto-char start)))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2102 ;;;_ > allout-before-change-handler (beg end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2103 (defun allout-before-change-handler (beg end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2104 "Protect against changes to invisible text. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2105 |
73003
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
2106 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
|
2107 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2108 (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
|
2109 (allout-show-to-offshoot)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2110 |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
2111 ;; 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
|
2112 ;; 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
|
2113 (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
|
2114 ;; 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
|
2115 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2116 (got-char beg) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2117 (let ((overlay (allout-get-invisibility-overlay))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2118 (allout-overlay-interior-modification-handler |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2119 overlay nil beg end nil))))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2120 ;;;_ > allout-isearch-end-handler (&optional overlay) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2121 (defun allout-isearch-end-handler (&optional overlay) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2122 "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
|
2123 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2124 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
|
2125 `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
|
2126 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
|
2127 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2128 (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
|
2129 (allout-show-to-offshoot))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2130 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2131 ;;;_ #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
|
2132 ;;; All the basic outline functions that directly do string matches to |
3430 | 2133 ;;; 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
|
2134 ;;; `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
|
2135 ;;; 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
|
2136 ;;; 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
|
2137 ;;; 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
|
2138 ;;; 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
|
2139 ;;;_ = 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
|
2140 (defvar allout-recent-prefix-beginning 0 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2141 "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
|
2142 (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
|
2143 ;;;_ = 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
|
2144 (defvar allout-recent-prefix-end 0 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2145 "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
|
2146 (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
|
2147 ;;;_ = allout-recent-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2148 (defvar allout-recent-depth 0 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2149 "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
|
2150 (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
|
2151 ;;;_ = 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
|
2152 (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
|
2153 "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
|
2154 (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
|
2155 ;;;_ > allout-prefix-data () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2156 (defsubst allout-prefix-data () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2157 "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
|
2158 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2159 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
|
2160 (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
|
2161 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
|
2162 (match-beginning 2)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2163 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
|
2164 allout-recent-prefix-beginning |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2165 allout-header-subtraction))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2166 allout-recent-prefix-beginning) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2167 ;;;_ > nullify-allout-prefix-data () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2168 (defsubst nullify-allout-prefix-data () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2169 "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
|
2170 (setq allout-recent-prefix-end (point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2171 allout-recent-prefix-beginning (point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2172 allout-recent-depth 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2173 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
|
2174 ;;;_ > allout-recent-depth () |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2175 (defsubst allout-recent-depth () |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2176 "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
|
2177 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2178 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
|
2179 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
|
2180 `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
|
2181 to return the current depth." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2182 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2183 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
|
2184 ;;;_ > allout-recent-prefix () |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2185 (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
|
2186 "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
|
2187 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2188 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
|
2189 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
|
2190 `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
|
2191 to return the current prefix." |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2192 (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
|
2193 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
|
2194 ;;;_ > 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
|
2195 (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
|
2196 "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
|
2197 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2198 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
|
2199 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
|
2200 `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
|
2201 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
|
2202 '(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
|
2203 allout-recent-prefix-end)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2204 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2205 ;;;_ #4 Navigation |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2206 |
69250
85c3b33d6427
Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents:
69124
diff
changeset
|
2207 ;;;_ - Position Assessment |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2208 ;;;_ : Location Predicates |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2209 ;;;_ > allout-do-doublecheck () |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2210 (defsubst allout-do-doublecheck () |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2211 "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
|
2212 (and |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2213 ;; 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
|
2214 ;; to allow for level disparity of yank location and yanked text: |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2215 (not allout-during-yank-processing) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2216 ;; 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
|
2217 (<= 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
|
2218 ;;;_ > allout-aberrant-container-p () |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2219 (defun allout-aberrant-container-p () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2220 "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
|
2221 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2222 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
|
2223 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
|
2224 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2225 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
|
2226 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
|
2227 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2228 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
|
2229 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
|
2230 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
|
2231 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2232 ;; 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
|
2233 ;; 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
|
2234 ;; 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
|
2235 ;; 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
|
2236 ;; 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
|
2237 ;; 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
|
2238 ;; 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
|
2239 ;; actually connected with their prospective context. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2240 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2241 (let ((depth (allout-depth)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2242 (start-point (point)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2243 done aberrant) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2244 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2245 (while (and (not done) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2246 (re-search-forward allout-line-boundary-regexp nil 0)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2247 (allout-prefix-data) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2248 (goto-char allout-recent-prefix-beginning) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2249 (cond |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2250 ;; sibling - continue: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2251 ((eq allout-recent-depth depth)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2252 ;; first offspring is excessive - aberrant: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2253 ((> allout-recent-depth (1+ depth)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2254 (setq done t aberrant t)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2255 ;; next non-sibling is lower-depth - not aberrant: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2256 (t (setq done t))))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2257 (if aberrant |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2258 aberrant |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2259 (goto-char start-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2260 ;; recalibrate allout-recent-* |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2261 (allout-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2262 nil))) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2263 ;;;_ > 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
|
2264 (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
|
2265 "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
|
2266 |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2267 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
|
2268 (save-excursion |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2269 (allout-beginning-of-current-line) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2270 (and (looking-at allout-regexp) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2271 (allout-prefix-data) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2272 (or (not (allout-do-doublecheck)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2273 (not (allout-aberrant-container-p)))))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2274 ;;;_ > allout-on-heading-p () |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2275 (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
|
2276 ;;;_ > 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
|
2277 (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
|
2278 "True if point is located where current topic prefix ends, heading begins." |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2279 (and (save-excursion (let ((inhibit-field-text-motion t)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2280 (beginning-of-line)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2281 (looking-at allout-regexp)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2282 (= (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
|
2283 ;;;_ : 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
|
2284 ;;;_ > allout-depth () |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2285 (defun allout-depth () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2286 "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
|
2287 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2288 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
|
2289 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2290 Like `allout-current-depth', but respects hidden as well as visible topics." |
29490 | 2291 (save-excursion |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2292 (let ((start-point (point))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2293 (if (and (allout-goto-prefix) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2294 (not (< start-point (point)))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2295 allout-recent-depth |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2296 (progn |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2297 ;; Oops, no prefix, nullify it: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2298 (nullify-allout-prefix-data) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2299 ;; ... and return 0: |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2300 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
|
2301 ;;;_ > allout-current-depth () |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2302 (defun allout-current-depth () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2303 "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
|
2304 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2305 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
|
2306 (save-excursion |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2307 (if (allout-back-to-current-heading) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2308 (max 1 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2309 (- allout-recent-prefix-end |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2310 allout-recent-prefix-beginning |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2311 allout-header-subtraction)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2312 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
|
2313 ;;;_ > 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
|
2314 (defun allout-get-current-prefix () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2315 "Topic prefix of the current topic." |
3430 | 2316 (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
|
2317 (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
|
2318 (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
|
2319 ;;;_ > 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
|
2320 (defun allout-get-bullet () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2321 "Return bullet of containing topic (visible or not)." |
3430 | 2322 (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
|
2323 (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
|
2324 (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
|
2325 ;;;_ > 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
|
2326 (defun allout-current-bullet () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2327 "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
|
2328 (condition-case nil |
3430 | 2329 (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
|
2330 (allout-back-to-current-heading) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2331 (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
|
2332 allout-recent-prefix-end)) |
3430 | 2333 ;; 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
|
2334 (args-out-of-range nil)) |
3430 | 2335 ) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2336 ;;;_ > 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
|
2337 (defun allout-get-prefix-bullet (prefix) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2338 "Return the bullet of the header prefix string PREFIX." |
3430 | 2339 ;; Doesn't make sense if we're old-style prefixes, but this just |
2340 ;; 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
|
2341 (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
|
2342 (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
|
2343 ;;;_ > 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
|
2344 (defun allout-sibling-index (&optional depth) |
29490 | 2345 "Item number of this prospective topic among its siblings. |
2346 | |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2347 If optional arg DEPTH is greater than current depth, then we're |
29490 | 2348 opening a new level, and return 0. |
2349 | |
2350 If less than this depth, ascend to that depth and count..." | |
2351 | |
2352 (save-excursion | |
2353 (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
|
2354 ((or (null depth) (= depth (allout-depth))) |
29490 | 2355 (let ((index 1)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2356 (while (allout-previous-sibling allout-recent-depth nil) |
29490 | 2357 (setq index (1+ index))) |
2358 index)) | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2359 ((< 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
|
2360 (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
|
2361 (allout-sibling-index)) |
29490 | 2362 (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
|
2363 ;;;_ > 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
|
2364 (defun allout-topic-flat-index () |
29490 | 2365 "Return a list indicating point's numeric section.subsect.subsubsect... |
2366 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
|
2367 (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
|
2368 (next-index (allout-sibling-index depth)) |
29490 | 2369 (rev-sibls nil)) |
2370 (while (> next-index 0) | |
2371 (setq rev-sibls (cons next-index rev-sibls)) | |
2372 (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
|
2373 (setq next-index (allout-sibling-index depth))) |
29490 | 2374 rev-sibls) |
2375 ) | |
3430 | 2376 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2377 ;;;_ - Navigation routines |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2378 ;;;_ > allout-beginning-of-current-line () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2379 (defun allout-beginning-of-current-line () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2380 "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
|
2381 |
71915
9315116570f0
(allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents:
71893
diff
changeset
|
2382 ;; 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
|
2383 ;; 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
|
2384 (let ((inhibit-field-text-motion t)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2385 (move-beginning-of-line 1) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2386 (beginning-of-line) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2387 (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
|
2388 (beginning-of-line) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2389 (if (or (allout-hidden-p) (not (bolp))) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2390 (forward-char -1))))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2391 ;;;_ > allout-end-of-current-line () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2392 (defun allout-end-of-current-line () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2393 "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
|
2394 ;; 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
|
2395 ;; `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
|
2396 ;; `move-beginning-of-line'. |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2397 (let ((inhibit-field-text-motion t)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2398 (end-of-line) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2399 (while (allout-hidden-p) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2400 (end-of-line) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
2401 (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
|
2402 ;;;_ > allout-beginning-of-line () |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2403 (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
|
2404 "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
|
2405 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2406 (interactive) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2407 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2408 (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
|
2409 (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
|
2410 (move-beginning-of-line 1) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2411 (allout-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2412 (let ((beginning-of-body |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2413 (save-excursion |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2414 (while (and (allout-do-doublecheck) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2415 (allout-aberrant-container-p) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2416 (allout-previous-visible-heading 1))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2417 (allout-beginning-of-current-entry) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2418 (point)))) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2419 (cond ((= (current-column) 0) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2420 (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
|
2421 ((< (point) beginning-of-body) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2422 (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
|
2423 ((= (point) beginning-of-body) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2424 (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
|
2425 (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
|
2426 (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
|
2427 ;; 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
|
2428 (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
|
2429 ;;;_ > allout-end-of-line () |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2430 (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
|
2431 "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
|
2432 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2433 (interactive) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2434 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2435 (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
|
2436 (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
|
2437 (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
|
2438 (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
|
2439 (allout-end-of-entry) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2440 (point)))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2441 (cond ((not (eolp)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2442 (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
|
2443 ((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
|
2444 (forward-char -1) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2445 (allout-hidden-p))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2446 (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
|
2447 (allout-show-current-entry) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2448 (allout-show-children) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2449 (allout-end-of-entry)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2450 ((>= (point) end-of-entry) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2451 (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
|
2452 (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
|
2453 (t (allout-end-of-entry)))))) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2454 ;;;_ > 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
|
2455 (defsubst allout-next-heading () |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
2456 "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
|
2457 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2458 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
|
2459 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2460 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
|
2461 (if (looking-at allout-regexp) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
2462 (forward-char 1)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2463 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2464 (when (re-search-forward allout-line-boundary-regexp nil 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2465 (allout-prefix-data) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2466 (and (allout-do-doublecheck) |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2467 ;; this will set allout-recent-* on the first non-aberrant topic, |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2468 ;; whether it's the current one or one that disqualifies it: |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2469 (allout-aberrant-container-p)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2470 (goto-char allout-recent-prefix-beginning))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2471 ;;;_ > 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
|
2472 (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
|
2473 "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
|
2474 ;; 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
|
2475 ;; and usable by allout-mode. |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2476 (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
|
2477 ;;;_ > allout-previous-heading () |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2478 (defun allout-previous-heading () |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2479 "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
|
2480 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2481 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
|
2482 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2483 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
|
2484 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2485 (if (bobp) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2486 nil |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2487 (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
|
2488 ;; 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
|
2489 (allout-goto-prefix) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2490 (when (or (re-search-backward allout-line-boundary-regexp nil 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2491 (looking-at allout-bob-regexp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2492 (goto-char (allout-prefix-data)) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2493 (if (and (allout-do-doublecheck) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2494 (allout-aberrant-container-p)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2495 (or (allout-previous-heading) |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2496 (and (goto-char start-point) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2497 ;; recalibrate allout-recent-*: |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2498 (allout-depth) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2499 nil)) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2500 (point)))))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2501 ;;;_ > allout-get-invisibility-overlay () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2502 (defun allout-get-invisibility-overlay () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2503 "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
|
2504 (let ((overlays (overlays-at (point))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2505 got) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2506 (while (and overlays (not got)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2507 (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
|
2508 (setq got (car overlays)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2509 (pop overlays))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2510 got)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2511 ;;;_ > allout-back-to-visible-text () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2512 (defun allout-back-to-visible-text () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2513 "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
|
2514 (if (allout-hidden-p) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2515 (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
|
2516 (point)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2517 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2518 ;;;_ - Subtree Charting |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2519 ;;;_ " 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
|
2520 ;;; 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
|
2521 ;;; |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2522 ;;; 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
|
2523 ;;; 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
|
2524 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2525 ;;;_ > 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
|
2526 (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
|
2527 "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
|
2528 |
73201
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
2529 Optional argument LEVELS specifies a depth limit \(relative to start |
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
2530 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
|
2531 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2532 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
|
2533 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
|
2534 |
73201
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
2535 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
|
2536 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2537 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
|
2538 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2539 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
|
2540 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
|
2541 for their elaborate manipulations. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2542 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2543 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
|
2544 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
|
2545 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
|
2546 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
|
2547 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
|
2548 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
|
2549 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2550 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
|
2551 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
|
2552 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
|
2553 |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
2554 (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
|
2555 chart curr-depth) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2556 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2557 (if original ; Just starting? |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2558 ; Register initial settings and |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2559 ; 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
|
2560 (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
|
2561 (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
|
2562 (if visible |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2563 (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
|
2564 (allout-next-heading)))) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2565 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2566 ;; 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
|
2567 ;; 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
|
2568 ;; the typically quite constrained Emacs max-lisp-eval-depth. |
29490 | 2569 ;; |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2570 ;; 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
|
2571 ;; operation rather than recursing for lower levels. Bah. |
29490 | 2572 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2573 (while (and (not (eobp)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2574 ; Still within original topic? |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2575 (< 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
|
2576 (cond ((= prev-depth curr-depth) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2577 ;; 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
|
2578 (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
|
2579 (if (and levels (<= levels 1)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2580 ;; 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
|
2581 (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
|
2582 ;; 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
|
2583 ;; 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
|
2584 (while (and (<= curr-depth |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2585 allout-recent-depth) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2586 (if visible |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2587 (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
|
2588 (allout-next-heading))))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2589 (if visible |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2590 (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
|
2591 (allout-next-heading)))) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2592 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2593 ((and (< prev-depth curr-depth) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2594 (or (not levels) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2595 (> levels 0))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2596 ;; 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
|
2597 (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
|
2598 (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
|
2599 (1- levels)) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2600 visible |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2601 orig-depth |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2602 curr-depth) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2603 chart)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2604 ;; ... then continue with this one. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2605 ) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2606 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2607 ;; ... 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
|
2608 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2609 ))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2610 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2611 (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
|
2612 ; the original level. Position |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2613 ; to the end of it: |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2614 (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
|
2615 (and (= (preceding-char) ?\n) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2616 (= (aref (buffer-substring (max 1 (- (point) 3)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2617 (point)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2618 1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2619 ?\n) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2620 (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
|
2621 (setq allout-recent-end-of-subtree (point)))) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
2622 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2623 chart ; (nreverse chart) not necessary, |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2624 ; and maybe not preferable. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2625 )) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2626 ;;;_ > 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
|
2627 (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
|
2628 "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
|
2629 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
|
2630 for an explanation of charts." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2631 (save-excursion |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2632 (when (allout-goto-prefix-doublechecked) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2633 (let ((chart (list (point)))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2634 (while (allout-next-sibling) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2635 (setq chart (cons (point) chart))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2636 (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
|
2637 ;;;_ > 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
|
2638 (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
|
2639 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2640 "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
|
2641 |
73201
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
2642 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
|
2643 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2644 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
|
2645 start point." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2646 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2647 (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
|
2648 (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
|
2649 chart) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2650 (setq here (car chart)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2651 (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
|
2652 (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
|
2653 depth |
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
2654 (1- depth))))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2655 ;; 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
|
2656 ;; more depth to go: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2657 (if further (setq result (append further result))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2658 (setq chart (cdr chart))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2659 (goto-char here) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2660 (if (allout-hidden-p) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2661 (setq result (cons here result))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2662 (setq chart (cdr chart)))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2663 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
|
2664 ;;;_ 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
|
2665 ;; (defun allout-chart-spec (chart spec &optional exposing) |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2666 ;; "Not yet \(if ever) implemented. |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2667 |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2668 ;; 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
|
2669 |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2670 ;; 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
|
2671 ;; 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
|
2672 ;; 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
|
2673 ;; 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
|
2674 ;; 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
|
2675 ;; 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
|
2676 |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2677 ;; 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
|
2678 ;; 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
|
2679 ;; exposed reside. |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2680 |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2681 ;; - 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
|
2682 ;; 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
|
2683 ;; 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
|
2684 ;; - 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
|
2685 ;; opened. |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2686 ;; - Lists signify the beginning and end points of regions that should |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2687 ;; be flagged, and the flag to employ. (For concealment: `\(\?r\)', and |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2688 ;; exposure:" |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2689 ;; (while spec |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2690 ;; (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
|
2691 ;; ) |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2692 ;; ) |
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
2693 ;; (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
|
2694 ;; ) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2695 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2696 ;;;_ - 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
|
2697 ;;;_ > 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
|
2698 (defun allout-goto-prefix () |
29490 | 2699 "Put point at beginning of immediately containing outline topic. |
2700 | |
2701 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
|
2702 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2703 Not sensitive to topic visibility. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2704 |
46161
29f1f32aee5b
(outline-goto-prefix): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
44182
diff
changeset
|
2705 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
|
2706 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2707 (let (done) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2708 (while (and (not done) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2709 (search-backward "\n" nil 1)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2710 (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
|
2711 (if (looking-at allout-regexp) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2712 (setq done (allout-prefix-data)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2713 (forward-char -1))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2714 (if (bobp) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2715 (cond ((looking-at allout-regexp) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2716 (allout-prefix-data)) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2717 ((allout-next-heading)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2718 (done)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2719 done))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2720 ;;;_ > allout-goto-prefix-doublechecked () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2721 (defun allout-goto-prefix-doublechecked () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2722 "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
|
2723 |
73201
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
2724 Like `allout-goto-prefix', but shallow topics \(according to |
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
2725 `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
|
2726 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
|
2727 `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
|
2728 (if (allout-goto-prefix) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2729 (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
|
2730 (allout-aberrant-container-p)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2731 (allout-previous-heading) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2732 (point)))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2733 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2734 ;;;_ > 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
|
2735 (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
|
2736 "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
|
2737 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2738 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
|
2739 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
|
2740 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2741 (if (not (allout-goto-prefix-doublechecked)) |
3430 | 2742 nil |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2743 (goto-char allout-recent-prefix-end) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2744 (if ignore-decorations |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2745 t |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2746 (while (looking-at "[0-9]") (forward-char 1)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2747 (if (and (not (eolp)) (looking-at "\\s-")) (forward-char 1))) |
3430 | 2748 ;; 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
|
2749 (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
|
2750 ;;;_ > 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
|
2751 (defun allout-current-bullet-pos () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2752 "Return position of current \(visible) topic's bullet." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2753 |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2754 (if (not (allout-current-depth)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2755 nil |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2756 (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
|
2757 ;;;_ > 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
|
2758 (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
|
2759 "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
|
2760 |
df3186ae0953
* allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents:
73201
diff
changeset
|
2761 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
|
2762 |
df3186ae0953
* allout.el (allout-back-to-current-heading): Base on lower-level
Chong Yidong <cyd@stupidchicken.com>
parents:
73201
diff
changeset
|
2763 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
|
2764 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
|
2765 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2766 (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
|
2767 (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
|
2768 (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
|
2769 (if (<= (point) bol-point) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2770 (if (interactive-p) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2771 (allout-end-of-prefix) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2772 (point)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2773 (goto-char (point-min)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2774 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
|
2775 ;;;_ > 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
|
2776 (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
|
2777 ;;;_ > allout-pre-next-prefix () |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2778 (defun allout-pre-next-prefix () |
3430 | 2779 "Skip forward to just before the next heading line. |
2780 | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2781 Returns that character position." |
3430 | 2782 |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2783 (if (allout-next-heading) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2784 (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
|
2785 ;;;_ > 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
|
2786 (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
|
2787 "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
|
2788 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2789 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
|
2790 visible topic. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2791 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2792 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
|
2793 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
|
2794 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
|
2795 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2796 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
|
2797 (interactive "P") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2798 (if current |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2799 (allout-back-to-current-heading) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2800 (allout-goto-prefix-doublechecked)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2801 (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
|
2802 (allout-next-heading) |
3430 | 2803 (while (and (not (eobp)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2804 (> 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
|
2805 (allout-next-heading)) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2806 (if (eobp) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2807 (allout-end-of-entry) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
2808 (forward-char -1)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2809 (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
|
2810 (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
|
2811 (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
|
2812 ;;;_ > 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
|
2813 (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
|
2814 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2815 "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
|
2816 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2817 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
|
2818 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
|
2819 excluded as delimiting whitespace between topics. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2820 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2821 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
|
2822 (interactive) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2823 (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
|
2824 ;;;_ > 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
|
2825 (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
|
2826 "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
|
2827 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2828 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
|
2829 \(See `allout-mode' doc string for details of hot-spot operation.)" |
3430 | 2830 (interactive) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2831 (let ((start-point (point))) |
69250
85c3b33d6427
Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents:
69124
diff
changeset
|
2832 (move-beginning-of-line 1) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2833 (if (< 0 (allout-current-depth)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2834 (goto-char allout-recent-prefix-end) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2835 (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
|
2836 (allout-end-of-prefix) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2837 (if (and (interactive-p) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2838 (= (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
|
2839 (goto-char (allout-current-bullet-pos))))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2840 ;;;_ > allout-end-of-entry (&optional inclusive) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2841 (defun allout-end-of-entry (&optional inclusive) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2842 "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
|
2843 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2844 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
|
2845 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
|
2846 collapsed." |
3430 | 2847 (interactive) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2848 (allout-pre-next-prefix) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2849 (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
|
2850 (forward-char -1)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2851 (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
|
2852 ;;;_ > 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
|
2853 (defun allout-end-of-current-heading () |
29490 | 2854 (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
|
2855 (allout-beginning-of-current-entry) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2856 (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
|
2857 (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
|
2858 (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
|
2859 ;;;_ > allout-get-body-text () |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2860 (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
|
2861 "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
|
2862 (save-excursion |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2863 (allout-end-of-prefix) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2864 (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
|
2865 nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2866 (backward-char 1) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2867 (let ((pre-body (point))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2868 (if (not pre-body) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2869 nil |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
2870 (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
|
2871 (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
|
2872 (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
|
2873 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2874 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2875 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2876 ) |
3430 | 2877 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2878 ;;;_ - 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
|
2879 ;;;_ > 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
|
2880 (defun allout-ascend-to-depth (depth) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2881 "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
|
2882 (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
|
2883 (let (last-ascended) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2884 (while (and (< depth allout-recent-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2885 (setq last-ascended (allout-ascend)))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2886 (goto-char allout-recent-prefix-beginning) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2887 (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
|
2888 (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
|
2889 ;;;_ > allout-ascend () |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
2890 (defun allout-ascend () |
29490 | 2891 "Ascend one level, returning t if successful, nil if not." |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2892 (prog1 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2893 (if (allout-beginning-of-level) |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2894 (allout-previous-heading)) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
2895 (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
|
2896 ;;;_ > 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
|
2897 (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
|
2898 "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
|
2899 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
2900 Returning depth if successful, nil if not." |
3430 | 2901 (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
|
2902 (start-depth (allout-depth))) |
3430 | 2903 (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
|
2904 (and (> (allout-depth) 0) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2905 (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
|
2906 (allout-next-heading) ; ... go further |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2907 (< 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
|
2908 (if (and (> (allout-depth) 0) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2909 (= allout-recent-depth depth)) |
3430 | 2910 depth |
2911 (goto-char start-point) | |
2912 nil)) | |
2913 ) | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2914 ;;;_ > allout-up-current-level (arg) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2915 (defun allout-up-current-level (arg) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2916 "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
|
2917 (interactive "p") |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2918 (let ((start-point (point))) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2919 (allout-back-to-current-heading) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2920 (if (not (allout-ascend)) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2921 (progn (goto-char start-point) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2922 (error "Can't ascend past outermost level")) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2923 (if (interactive-p) (allout-end-of-prefix)) |
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
2924 allout-recent-prefix-beginning))) |
3430 | 2925 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2926 ;;;_ - 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
|
2927 ;;;_ > 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
|
2928 (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
|
2929 "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
|
2930 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2931 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
|
2932 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2933 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
|
2934 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2935 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
|
2936 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2937 (if (if backward (bobp) (eobp)) |
3430 | 2938 nil |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2939 (let ((target-depth (or depth (allout-depth))) |
3430 | 2940 (start-point (point)) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2941 (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
|
2942 (count 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2943 leaping |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2944 last-depth) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2945 (while (and |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2946 ;; 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
|
2947 (not leaping) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2948 ;; not at limit: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2949 (not (if backward (bobp) (eobp))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2950 ;; still traversable: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2951 (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
|
2952 ;; we're below the target depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2953 (> (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
|
2954 (setq count (1+ count)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2955 (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
|
2956 (setq leaping t))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2957 (cond (leaping |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2958 (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
|
2959 (progn |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2960 (goto-char start-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2961 (if depth (allout-depth) target-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2962 nil))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2963 ((and (not (eobp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2964 (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
|
2965 (= 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
|
2966 (not (= start-prefix-beginning |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
2967 allout-recent-prefix-beginning))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2968 allout-recent-prefix-beginning) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2969 (t |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2970 (goto-char start-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2971 (if depth (allout-depth) target-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2972 nil))))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2973 ;;;_ > 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
|
2974 (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
|
2975 "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
|
2976 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2977 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
|
2978 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2979 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
|
2980 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2981 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
|
2982 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2983 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
|
2984 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2985 - we have to check the prior \(next, if travelling backwards) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2986 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
|
2987 - 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
|
2988 some extra navigation |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2989 - 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
|
2990 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2991 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
|
2992 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
|
2993 `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
|
2994 situation." |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2995 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2996 (if (if backward (bobp) (eobp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2997 nil |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2998 (let* ((start-point (point)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
2999 (target-depth (or depth (allout-depth))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3000 (search-whitespace-regexp nil) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3001 (depth-biased (- target-depth 2)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3002 (expression (if (<= target-depth 1) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3003 allout-depth-one-regexp |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3004 (format allout-depth-specific-regexp |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3005 depth-biased depth-biased))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3006 found |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3007 done) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3008 (while (not done) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3009 (setq found (if backward |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3010 (re-search-backward expression nil 'to-limit) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3011 (forward-char 1) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3012 (re-search-forward expression nil 'to-limit))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3013 (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
|
3014 (setq found nil)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3015 (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
|
3016 (if (not found) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3017 (progn (goto-char start-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3018 nil) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3019 ;; 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
|
3020 ;; 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
|
3021 ;; 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
|
3022 ;; 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
|
3023 (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
|
3024 (if (< allout-recent-depth target-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3025 ;; 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
|
3026 (progn |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3027 (goto-char start-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3028 (allout-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3029 nil) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3030 (goto-char found) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3031 ;; locate cursor and set allout-recent-*: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3032 (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
|
3033 ;;;_ > 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
|
3034 (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
|
3035 "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
|
3036 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3037 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
|
3038 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3039 Optional BACKWARD reverses direction. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3040 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3041 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
|
3042 (allout-next-sibling depth (not backward)) |
3430 | 3043 ) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3044 ;;;_ > 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
|
3045 (defun allout-snug-back () |
64283
d57ad48e7901
(my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
3046 "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
|
3047 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3048 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
|
3049 (if (or (bobp) (eobp)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3050 nil |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3051 (forward-char -1)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3052 (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
|
3053 nil |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3054 (forward-char -1)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3055 (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
|
3056 ;;;_ > 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
|
3057 (defun allout-beginning-of-level () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3058 "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
|
3059 (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
|
3060 ;;;_ > 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
|
3061 (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
|
3062 "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
|
3063 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3064 (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
|
3065 (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
|
3066 (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
|
3067 (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
|
3068 ;;;_ > 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
|
3069 (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
|
3070 "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
|
3071 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3072 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
|
3073 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3074 (interactive "p") |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
3075 (let* ((inhibit-field-text-motion t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
3076 (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
|
3077 (step (if backward -1 1)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3078 prev got) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3079 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3080 (while (> arg 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3081 (while (and |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3082 ;; Boundary condition: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3083 (not (if backward (bobp)(eobp))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3084 ;; 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
|
3085 (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
|
3086 (error nil)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3087 (allout-beginning-of-current-line)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3088 ;; Deal with apparent header line: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3089 (if (not (looking-at allout-regexp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3090 ;; not a header line, keep looking: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3091 t |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3092 (allout-prefix-data) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
3093 (if (and (allout-do-doublecheck) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3094 (allout-aberrant-container-p)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3095 ;; skip this aberrant prospective header line: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3096 t |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3097 ;; this prospective headerline qualifies - register: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3098 (setq got allout-recent-prefix-beginning) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3099 ;; and break the loop: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3100 nil)))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3101 ;; 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
|
3102 (if got (setq prev got)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3103 (setq arg (1- arg))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3104 (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
|
3105 (allout-end-of-prefix)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3106 (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
|
3107 (goto-char prev) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3108 (allout-end-of-prefix)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3109 ((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
|
3110 ;;;_ > 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
|
3111 (defun allout-previous-visible-heading (arg) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3112 "Move to the previous heading line. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3113 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3114 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
|
3115 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
|
3116 matches)." |
3430 | 3117 (interactive "p") |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3118 (prog1 (allout-next-visible-heading (- arg)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3119 (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
|
3120 ;;;_ > 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
|
3121 (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
|
3122 "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
|
3123 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3124 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
|
3125 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3126 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
|
3127 (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
|
3128 (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
|
3129 (start-arg arg) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3130 (backward (> 0 arg))) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3131 (if (= 0 start-depth) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3132 (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
|
3133 (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
|
3134 (allout-back-to-current-heading) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3135 (while (and (not (zerop arg)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3136 (if backward |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3137 (allout-previous-sibling) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3138 (allout-next-sibling))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3139 (setq arg (1- arg))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3140 (if (not (interactive-p)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3141 nil |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3142 (allout-end-of-prefix) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3143 (if (not (zerop arg)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3144 (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
|
3145 (if backward "first" "last") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3146 allout-recent-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3147 (- (abs start-arg) arg) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3148 (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
|
3149 ;;;_ > 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
|
3150 (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
|
3151 "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
|
3152 (interactive "p") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3153 (if (interactive-p) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3154 (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
|
3155 (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
|
3156 (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
|
3157 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3158 ;;;_ #5 Alteration |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3159 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3160 ;;;_ - 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
|
3161 ;;;_ = 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
|
3162 (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
|
3163 "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
|
3164 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3165 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
|
3166 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
|
3167 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
|
3168 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
|
3169 `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
|
3170 (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
|
3171 ;;;_ = allout-command-counter |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3172 (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
|
3173 "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
|
3174 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3175 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
|
3176 coordinating with allout activity.") |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3177 (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
|
3178 ;;;_ > 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
|
3179 (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
|
3180 "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
|
3181 |
8641226163f1
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48856
diff
changeset
|
3182 - 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
|
3183 outline commands. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3184 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3185 - 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
|
3186 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3187 ; 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
|
3188 (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
|
3189 nil |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3190 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3191 (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
|
3192 allout-after-save-decrypt) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3193 (allout-after-saves-handler)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3194 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3195 ;; 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
|
3196 (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
|
3197 (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
|
3198 (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
|
3199 (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
|
3200 )) |
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-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
|
3202 (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
|
3203 "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
|
3204 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3205 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
|
3206 topic bullet character. |
49962
13d146080936
(allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
3207 |
13d146080936
(allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
3208 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
|
3209 reinterpreted as the corresponding control-character in the |
13d146080936
(allout-pre-command-business): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
3210 `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
|
3211 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
|
3212 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
|
3213 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3214 The upshot is that you can get easy, single \(ie, unmodified\) key |
29490 | 3215 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
|
3216 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
|
3217 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
|
3218 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
|
3219 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3220 (if (not (allout-mode-p)) |
29490 | 3221 nil |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3222 ;; Increment allout-command-counter |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3223 (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
|
3224 ;; Do hot-spot navigation. |
29490 | 3225 (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
|
3226 (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
|
3227 (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
|
3228 ;;;_ > 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
|
3229 (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
|
3230 "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
|
3231 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3232 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
|
3233 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
|
3234 this-command accordingly. |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3235 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3236 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
|
3237 (interactive) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3238 (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
|
3239 (char-to-string last-command-char))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3240 (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
|
3241 ;; 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
|
3242 ((and (fboundp 'characterp) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3243 (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
|
3244 (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
|
3245 (t 0))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3246 mapped-binding) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3247 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3248 (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
|
3249 nil |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3250 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3251 (if (and |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3252 ;; exclude control chars and escape: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3253 (<= 33 key-num) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3254 (setq mapped-binding |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3255 (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
|
3256 ;; translate literal membership on list: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3257 (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
|
3258 ;; translate as a keybinding: |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3259 (key-binding (concat allout-command-prefix |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3260 (char-to-string |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3261 (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
|
3262 (>= 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
|
3263 (- key-num 96) key-num))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3264 t)))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3265 ;; 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
|
3266 (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
|
3267 ;; 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
|
3268 (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
|
3269 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3270 (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
|
3271 (setq mapped-binding |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3272 (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
|
3273 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3274 (if mapped-binding |
71915
9315116570f0
(allout-run-unit-tests-on-load): Rectified docstring grammar.
Nick Roberts <nickrob@snap.net.nz>
parents:
71893
diff
changeset
|
3275 (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
|
3276 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3277 ;;;_ > allout-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
|
3278 (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
|
3279 "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
|
3280 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3281 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
|
3282 (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
|
3283 (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
|
3284 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
|
3285 (allout-mode t))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3286 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3287 ;;;_ - 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
|
3288 ;;;_ > 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
|
3289 (defun allout-solicit-alternate-bullet (depth &optional current-bullet) |
3430 | 3290 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3291 "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
|
3292 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3293 Offer one suitable for current depth DEPTH as default." |
3430 | 3294 |
29490 | 3295 (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
|
3296 (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
|
3297 (sans-escapes (regexp-sans-escapes allout-bullets-string)) |
29490 | 3298 choice) |
3299 (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
|
3300 (goto-char (allout-current-bullet-pos)) |
29490 | 3301 (setq choice (solicit-char-in-string |
3302 (format "Select bullet: %s ('%s' default): " | |
3303 sans-escapes | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3304 (substring-no-properties default-bullet)) |
29490 | 3305 sans-escapes |
3306 t))) | |
3307 (message "") | |
3430 | 3308 (if (string= choice "") default-bullet choice)) |
3309 ) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3310 ;;;_ > 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
|
3311 (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
|
3312 "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
|
3313 (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
|
3314 ;;;_ > 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
|
3315 (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
|
3316 "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
|
3317 (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
|
3318 (string= allout-numbered-bullet |
3430 | 3319 (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
|
3320 (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
|
3321 (allout-get-bullet))))) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3322 ;;;_ > 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
|
3323 (defun 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
|
3324 "True if current header prefix bullet is for an encrypted entry \(body)." |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3325 (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
|
3326 (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
|
3327 (if prefix |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3328 (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
|
3329 (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
|
3330 ;;;_ > 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
|
3331 (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
|
3332 "Return outline topic bullet suited to optional DEPTH, or current depth." |
3430 | 3333 ;; 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
|
3334 (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
|
3335 (char-to-string (aref allout-plain-bullets-string |
3430 | 3336 (% (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
|
3337 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
|
3338 allout-primary-bullet) |
3430 | 3339 ) |
3340 | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3341 ;;;_ - 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
|
3342 ;;;_ > 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
|
3343 (defun allout-make-topic-prefix (&optional prior-bullet |
3430 | 3344 new |
3345 depth | |
3346 solicit | |
3347 number-control | |
3348 index) | |
3349 ;; Depth null means use current depth, non-null means we're either | |
3350 ;; opening a new topic after current topic, lower or higher, or we're | |
3351 ;; changing level of current topic. | |
3352 ;; Solicit dominates specified bullet-char. | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3353 ;;;_ . Doc string: |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3354 "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
|
3355 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3356 All the arguments are optional. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3357 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3358 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
|
3359 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
|
3360 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
|
3361 for instance. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3362 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3363 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
|
3364 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
|
3365 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
|
3366 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
|
3367 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
|
3368 bullet or previous sibling. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3369 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3370 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
|
3371 the current topics' depth. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3372 |
29490 | 3373 If SOLICIT is non-nil, then the choice of bullet is solicited from |
3374 user. If it's a character, then that character is offered as the | |
3375 default, otherwise the one suited to the context \(according to | |
3376 distinction or depth) is offered. \(This overrides other options, | |
3377 including, eg, a distinctive PRIOR-BULLET.) If non-nil, then the | |
3378 context-specific bullet is used. | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3379 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3380 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
|
3381 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
|
3382 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
|
3383 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
|
3384 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3385 \(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
|
3386 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3387 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
|
3388 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
|
3389 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
|
3390 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
|
3391 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
|
3392 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
|
3393 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
|
3394 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
|
3395 index for each successive sibling)." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3396 ;;;_ . Code: |
3430 | 3397 ;; The options are ordered in likely frequence of use, most common |
3398 ;; highest, least lowest. Ie, more likely to be doing prefix | |
3399 ;; adjustments than soliciting, and yet more than numbering. | |
3400 ;; Current prefix is least dominant, but most likely to be commonly | |
3401 ;; specified... | |
3402 | |
3403 (let* (body | |
3404 numbering | |
3405 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
|
3406 (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
|
3407 (header-lead allout-header-prefix) |
3430 | 3408 (bullet-char |
3409 | |
3410 ;; Getting value for bullet char is practically the whole job: | |
3411 | |
3412 (cond | |
3413 ; 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
|
3414 ((<= depth 1) (setq header-lead "") allout-primary-bullet) |
3430 | 3415 ; 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
|
3416 (allout-old-style-prefixes |
3430 | 3417 ;; Cheat - make body the whole thing, null out header-lead and |
3418 ;; bullet-char: | |
3419 (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
|
3420 (string-to-char allout-primary-bullet))) |
3430 | 3421 (setq header-lead "") |
3422 "") | |
3423 | |
3424 ;; (Neither level 1 nor old-style, so we're space padding. | |
3425 ;; Sneak it in the condition of the next case, whatever it is.) | |
3426 | |
3427 ;; Solicitation overrides numbering and other cases: | |
3428 ((progn (setq body (make-string (- depth 2) ?\ )) | |
3429 ;; The actual condition: | |
3430 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
|
3431 (let* ((got (allout-solicit-alternate-bullet depth solicit))) |
3430 | 3432 ;; 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
|
3433 (setq numbering (and allout-numbered-bullet |
3430 | 3434 (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
|
3435 (string= got allout-numbered-bullet))) |
3430 | 3436 ;; Now return what we got, regardless: |
3437 got)) | |
3438 | |
3439 ;; 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
|
3440 ((and allout-numbered-bullet number-control) |
3430 | 3441 (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
|
3442 allout-numbered-bullet |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3443 (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
|
3444 (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
|
3445 prior-bullet))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3446 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
|
3447 (allout-bullet-for-depth depth)))) |
3430 | 3448 |
3449 ;;; Neither soliciting nor controlled numbering ;;; | |
3450 ;;; (may be controlled denumbering, tho) ;;; | |
3451 | |
3452 ;; Check wrt previous sibling: | |
3453 ((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
|
3454 (<= 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
|
3455 allout-numbered-bullet ; ... & numbering enabled |
3430 | 3456 (not denumbering) |
3457 (let ((sibling-bullet | |
3458 (save-excursion | |
3459 ;; 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
|
3460 (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
|
3461 (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
|
3462 (allout-get-bullet)))) |
3430 | 3463 (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
|
3464 (string= allout-numbered-bullet sibling-bullet)) |
3430 | 3465 (setq numbering sibling-bullet))))) |
3466 | |
3467 ;; Distinctive prior bullet? | |
3468 ((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
|
3469 (allout-distinctive-bullet prior-bullet) |
3430 | 3470 ;; 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
|
3471 (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
|
3472 (string= prior-bullet allout-numbered-bullet))) |
3430 | 3473 ;; or numbered, and not denumbering: |
3474 (setq numbering (not denumbering))) | |
3475 ;; Here 'tis: | |
3476 prior-bullet)) | |
3477 | |
3478 ;; 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
|
3479 ((allout-bullet-for-depth depth))))) |
3430 | 3480 |
3481 (concat header-lead | |
3482 body | |
3483 bullet-char | |
3484 (if numbering | |
3485 (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
|
3486 (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
|
3487 ((allout-sibling-index)))))) |
3430 | 3488 ) |
3489 ) | |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3490 ;;;_ > 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
|
3491 (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
|
3492 "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
|
3493 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3494 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
|
3495 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
|
3496 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
|
3497 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3498 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
|
3499 the other offspring are exposed, or after the last child if the offspring |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3500 are hidden. \(The intervening offspring will be exposed in the latter |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3501 case.) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3502 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3503 If OFFER-RECENT-BULLET is true, offer to use the bullet of the prior sibling. |
29490 | 3504 |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
3505 Runs |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3506 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3507 Nuances: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3508 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3509 - 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
|
3510 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
|
3511 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3512 - 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
|
3513 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
|
3514 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
|
3515 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
|
3516 deliberately dividing topic bodies. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3517 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3518 - 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
|
3519 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
|
3520 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
|
3521 single-spacing is used. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3522 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3523 - 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
|
3524 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
|
3525 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
|
3526 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
|
3527 from there." |
3430 | 3528 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3529 (allout-beginning-of-current-line) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
3530 (let* ((inhibit-field-text-motion t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
3531 (depth (+ (allout-current-depth) relative-depth)) |
3430 | 3532 (opening-on-blank (if (looking-at "^\$") |
3533 (not (setq before nil)))) | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3534 ;; bunch o vars set while computing ref-topic |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3535 opening-numbered |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3536 ref-depth |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3537 ref-bullet |
3430 | 3538 (ref-topic (save-excursion |
3539 (cond ((< relative-depth 0) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3540 (allout-ascend-to-depth depth)) |
3430 | 3541 ((>= relative-depth 1) nil) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3542 (t (allout-back-to-current-heading))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3543 (setq ref-depth allout-recent-depth) |
29490 | 3544 (setq ref-bullet |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3545 (if (> allout-recent-prefix-end 1) |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3546 (allout-recent-bullet) |
29490 | 3547 "")) |
3430 | 3548 (setq opening-numbered |
3549 (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
|
3550 (and allout-numbered-bullet |
3430 | 3551 (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
|
3552 (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
|
3553 (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
|
3554 allout-numbered-bullet)))) |
3430 | 3555 (point))) |
3556 dbl-space | |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3557 doing-beginning |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3558 start end) |
3430 | 3559 |
3560 (if (not opening-on-blank) | |
3561 ; Positioning and vertical | |
3562 ; padding - only if not | |
3563 ; opening-on-blank: | |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
3564 (progn |
3430 | 3565 (goto-char ref-topic) |
3566 (setq dbl-space ; Determine double space action: | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3567 (or (and (<= relative-depth 0) ; not descending; |
3430 | 3568 (save-excursion |
13964
4de229297f1f
(outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
3569 ;; at b-o-b or preceded by a blank line? |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3570 (or (> 0 (forward-line -1)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3571 (looking-at "^\\s-*$") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3572 (bobp))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3573 (save-excursion |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3574 ;; succeeded by a blank line? |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3575 (allout-end-of-current-subtree) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3576 (looking-at "\n\n"))) |
3430 | 3577 (and (= ref-depth 1) |
3578 (or before | |
3579 (= depth 1) | |
3580 (save-excursion | |
3581 ;; Don't already have following | |
3582 ;; vertical padding: | |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3583 (not (allout-pre-next-prefix))))))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3584 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3585 ;; Position to prior heading, if inserting backwards, and not |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3586 ;; going outwards: |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3587 (if (and before (>= relative-depth 0)) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3588 (progn (allout-back-to-current-heading) |
3430 | 3589 (setq doing-beginning (bobp)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3590 (if (not (bobp)) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3591 (allout-previous-heading))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3592 (if (and before (bobp)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3593 (open-line 1))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3594 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3595 (if (<= relative-depth 0) |
3430 | 3596 ;; Not going inwards, don't snug up: |
3597 (if doing-beginning | |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3598 (if (not dbl-space) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3599 (open-line 1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3600 (open-line 2)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3601 (if before |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3602 (progn (end-of-line) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3603 (allout-pre-next-prefix) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3604 (while (and (= ?\n (following-char)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3605 (save-excursion |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3606 (forward-char 1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3607 (allout-hidden-p))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3608 (forward-char 1)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3609 (if (not (looking-at "^$")) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3610 (open-line 1))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3611 (allout-end-of-current-subtree) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3612 (if (looking-at "\n\n") (forward-char 1)))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3613 ;; Going inwards - double-space if first offspring is |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3614 ;; double-spaced, otherwise snug up. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3615 (allout-end-of-entry) |
69250
85c3b33d6427
Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents:
69124
diff
changeset
|
3616 (if (eobp) |
85c3b33d6427
Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents:
69124
diff
changeset
|
3617 (newline 1) |
85c3b33d6427
Restablished intermediate missing comment header to preserve outline structure.
Eli Zaretskii <eliz@gnu.org>
parents:
69124
diff
changeset
|
3618 (line-move 1)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3619 (allout-beginning-of-current-line) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3620 (backward-char 1) |
3430 | 3621 (if (bolp) |
3622 ;; Blank lines between current header body and next | |
3623 ;; header - get to last substantive (non-white-space) | |
3624 ;; line in body: | |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3625 (progn (setq dbl-space t) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3626 (re-search-backward "[^ \t\n]" nil t))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3627 (if (looking-at "\n\n") |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3628 (setq dbl-space t)) |
3430 | 3629 (if (save-excursion |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3630 (allout-next-heading) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3631 (when (> allout-recent-depth ref-depth) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3632 ;; This is an offspring. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3633 (forward-line -1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3634 (looking-at "^\\s-*$"))) |
3430 | 3635 (progn (forward-line 1) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3636 (open-line 1) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3637 (forward-line 1))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3638 (allout-end-of-current-line)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3639 |
3430 | 3640 ;;(if doing-beginning (goto-char doing-beginning)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3641 (if (not (bobp)) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3642 ;; We insert a newline char rather than using open-line to |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3643 ;; avoid rear-stickiness inheritence of read-only property. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3644 (progn (if (and (not (> depth ref-depth)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3645 (not before)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3646 (open-line 1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3647 (if (and (not dbl-space) (> depth ref-depth)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3648 (newline 1) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3649 (if dbl-space |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3650 (open-line 1) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3651 (if (not before) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3652 (newline 1))))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3653 (if (and dbl-space (not (> relative-depth 0))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3654 (newline 1)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3655 (if (and (not (eobp)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3656 (or (not (bolp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3657 (and (not (bobp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3658 ;; bolp doesnt detect concealed |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3659 ;; trailing newlines, compensate: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3660 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3661 (forward-char -1) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3662 (allout-hidden-p))))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3663 (forward-char 1)))) |
3430 | 3664 )) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3665 (setq start (point)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3666 (insert (concat (allout-make-topic-prefix opening-numbered t depth) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3667 " ")) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3668 (setq end (1+ (point))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3669 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3670 (allout-rebullet-heading (and offer-recent-bullet ref-bullet) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3671 depth nil nil t) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3672 (if (> relative-depth 0) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3673 (save-excursion (goto-char ref-topic) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3674 (allout-show-children))) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3675 (end-of-line) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3676 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
3677 (run-hook-with-args 'allout-structure-added-hook start end) |
3430 | 3678 ) |
3679 ) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3680 ;;;_ > 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
|
3681 (defun allout-open-subtopic (arg) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3682 "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
|
3683 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3684 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
|
3685 prior to the current one." |
3430 | 3686 (interactive "p") |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3687 (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
|
3688 ;;;_ > 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
|
3689 (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
|
3690 "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
|
3691 |
29490 | 3692 Positive universal arg means to use the bullet of the prior sibling. |
3693 | |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3694 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
|
3695 one." |
3430 | 3696 (interactive "p") |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3697 (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
|
3698 ;;;_ > 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
|
3699 (defun allout-open-supertopic (arg) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3700 "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
|
3701 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3702 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
|
3703 topic prior to the current one." |
3430 | 3704 |
3705 (interactive "p") | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3706 (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
|
3707 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3708 ;;;_ - Outline Alteration |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3709 ;;;_ : 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
|
3710 ;;;_ = 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
|
3711 (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
|
3712 "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
|
3713 ;;;_ > 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
|
3714 (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
|
3715 "`allout-mode' autofill function. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3716 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
3717 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
|
3718 `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
|
3719 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3720 (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
|
3721 (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
|
3722 ;; Check for topic header indentation: |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3723 (save-excursion |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3724 (beginning-of-line) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3725 (if (looking-at allout-regexp) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3726 ;; ... construct indentation to account for |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3727 ;; length of topic prefix: |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3728 (make-string (progn (allout-end-of-prefix) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3729 (current-column)) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3730 ?\ ))))) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3731 (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
|
3732 auto-fill-function |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3733 'do-auto-fill))) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
3734 (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
|
3735 (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
|
3736 ;;;_ > 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
|
3737 (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
|
3738 "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
|
3739 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3740 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
|
3741 be accommodated. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3742 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3743 Note that refill of indented paragraphs is not done." |
3430 | 3744 |
3745 (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
|
3746 (allout-end-of-prefix) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3747 (let* ((new-margin (current-column)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3748 excess old-indent-begin old-indent-end |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3749 ;; 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
|
3750 ;; *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
|
3751 ;; 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
|
3752 (old-margin (+ old-depth (- new-margin new-depth)))) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
3753 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3754 ;; 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
|
3755 (allout-unprotected |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3756 (save-match-data |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3757 (while |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3758 (and (re-search-forward "\n\\(\\s-*\\)" |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3759 nil |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3760 t) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3761 ;; Register the indent data, before we reset the |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
3762 ;; 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
|
3763 (setq old-indent-begin (match-beginning 1) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3764 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
|
3765 (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
|
3766 (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
|
3767 old-margin))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3768 ;; 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
|
3769 nil |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3770 ;; 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
|
3771 ;; reindent it, preserving its existing indentation |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3772 ;; beyond the old margin: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3773 (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
|
3774 (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
|
3775 ;;;_ > 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
|
3776 (defun allout-rebullet-current-heading (arg) |
29490 | 3777 "Solicit new bullet for current visible heading." |
3778 (interactive "p") | |
3779 (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
|
3780 (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
|
3781 from to |
29490 | 3782 (backwards (if (< arg 0) |
3783 (setq arg (* arg -1))))) | |
3784 (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
|
3785 (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
|
3786 (allout-end-of-prefix) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3787 (setq from allout-recent-prefix-beginning |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3788 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
|
3789 (allout-rebullet-heading t ;;; solicit |
29490 | 3790 nil ;;; depth |
3791 nil ;;; number-control | |
3792 nil ;;; index | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3793 t) ;;; do-successors |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3794 (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
|
3795 from to t)) |
29490 | 3796 (setq arg (1- arg)) |
3797 (if (<= arg 0) | |
3798 nil | |
3799 (setq initial-col nil) ; Override positioning back to init col | |
3800 (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
|
3801 (allout-next-visible-heading 1) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3802 (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
|
3803 (allout-next-visible-heading -1)))) |
29490 | 3804 (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
|
3805 (cond (on-bullet (goto-char (allout-current-bullet-pos))) |
29490 | 3806 (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
|
3807 ;;;_ > 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
|
3808 (defun allout-rebullet-heading (&optional solicit |
3430 | 3809 new-depth |
3810 number-control | |
3811 index | |
3812 do-successors) | |
3813 | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3814 "Adjust bullet of current topic prefix. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3815 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3816 All args are optional. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3817 |
29490 | 3818 If SOLICIT is non-nil, then the choice of bullet is solicited from |
3819 user. If it's a character, then that character is offered as the | |
3820 default, otherwise the one suited to the context \(according to | |
3821 distinction or depth) is offered. If non-nil, then the | |
3822 context-specific bullet is just used. | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3823 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3824 Second arg DEPTH forces the topic prefix to that depth, regardless |
29490 | 3825 of the topic's current depth. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3826 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3827 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
|
3828 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
|
3829 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
|
3830 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
|
3831 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
|
3832 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3833 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
|
3834 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
|
3835 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
|
3836 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
|
3837 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
|
3838 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
|
3839 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
|
3840 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3841 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
|
3842 siblings. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3843 |
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 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
|
3845 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
|
3846 this function." |
3430 | 3847 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3848 (let* ((current-depth (allout-depth)) |
3430 | 3849 (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
|
3850 (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
|
3851 (me allout-recent-prefix-end) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3852 (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
|
3853 (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
|
3854 (new-prefix (allout-make-topic-prefix current-bullet |
3430 | 3855 nil |
3856 new-depth | |
3857 solicit | |
3858 number-control | |
3859 index))) | |
3860 | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3861 ;; Is new one is identical to old? |
3430 | 3862 (if (and (= current-depth new-depth) |
3863 (string= current-bullet | |
3864 (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
|
3865 ;; Nothing to do: |
3430 | 3866 t |
3867 | |
3868 ;; New prefix probably different from old: | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3869 ; 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
|
3870 (allout-unprotected (delete-region mb me)) |
3430 | 3871 (goto-char mb) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3872 ; Dispense with number if |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3873 ; numbered-bullet prefix: |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3874 (if (and allout-numbered-bullet |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3875 (string= allout-numbered-bullet current-bullet) |
3430 | 3876 (looking-at "[0-9]+")) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
3877 (allout-unprotected |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3878 (delete-region (match-beginning 0)(match-end 0)))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3879 |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
3880 ;; 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
|
3881 (if has-annotation |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
3882 (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
|
3883 new-prefix)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
3884 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3885 ; 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
|
3886 (allout-unprotected (insert new-prefix)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3887 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3888 ;; 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
|
3889 (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
|
3890 (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
|
3891 (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
|
3892 (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
|
3893 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3894 ;; 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
|
3895 ;; caller elected for it: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3896 (if do-successors |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3897 (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
|
3898 (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
|
3899 (setq index |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3900 (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
|
3901 ((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
|
3902 (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
|
3903 (allout-rebullet-heading nil ;;; solicit |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3904 new-depth ;;; new-depth |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3905 number-control;;; number-control |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3906 index ;;; index |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3907 nil))))) ;;;(dont!)do-successors |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3908 ) ; (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
|
3909 ) ; let* ((current-depth (allout-depth))...) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3910 ) ; 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
|
3911 ;;;_ > allout-rebullet-topic (arg) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3912 (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
|
3913 "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
|
3914 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3915 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
|
3916 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3917 When optional sans-offspring is non-nil, subtopics are not |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3918 shifted. \(Shifting a topic outwards without shifting its |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3919 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
|
3920 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
|
3921 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
|
3922 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3923 With repeat count, shift topic depth by that amount." |
3430 | 3924 (interactive "P") |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
3925 (let ((start-col (current-column))) |
3430 | 3926 (save-excursion |
3927 ;; Normalize arg: | |
3928 (cond ((null arg) (setq arg 0)) | |
3929 ((listp arg) (setq arg (car arg)))) | |
3930 ;; Fill the user in, in case we're shifting a big topic: | |
3931 (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
|
3932 (allout-back-to-current-heading) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3933 (if (<= (+ allout-recent-depth arg) 0) |
3430 | 3934 (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
|
3935 (allout-rebullet-topic-grunt arg nil nil nil nil sans-offspring) |
3430 | 3936 (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
|
3937 (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
|
3938 ;;;_ > 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
|
3939 (defun allout-rebullet-topic-grunt (&optional relative-depth |
3430 | 3940 starting-depth |
3941 starting-point | |
3942 index | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3943 do-successors |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3944 sans-offspring) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3945 "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
|
3946 \(visible or not). |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3947 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3948 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
|
3949 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3950 All arguments are optional. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3951 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
3952 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
|
3953 topic that amount. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
3954 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3955 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
|
3956 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
|
3957 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3958 Finally, if optional SANS-OFFSPRING is non-nil then the offspring |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3959 are not shifted. \(Shifting a topic outwards without shifting |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3960 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
|
3961 \"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
|
3962 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
|
3963 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3964 ;; 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
|
3965 ;; need simplification with refactoring. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3966 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3967 (if (and sans-offspring |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3968 relative-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3969 (< relative-depth 0)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3970 (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
|
3971 " would cause containment discontinuity."))) |
3430 | 3972 |
3973 (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
|
3974 (new-depth (allout-depth)) |
3430 | 3975 (starting-depth (or starting-depth new-depth)) |
3976 (on-starting-call (null starting-point)) | |
3977 (index (or index | |
3978 ;; Leave index null on starting call, so rebullet-heading | |
3979 ;; calculates it at what might be new depth: | |
3980 (and (or (zerop relative-depth) | |
3981 (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
|
3982 (allout-sibling-index)))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3983 (starting-index index) |
3430 | 3984 (moving-outwards (< 0 relative-depth)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3985 (starting-point (or starting-point (point))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3986 (local-point (point))) |
3430 | 3987 |
3988 ;; Sanity check for excessive promotion done only on starting call: | |
3989 (and on-starting-call | |
3990 moving-outwards | |
3991 (> 0 (+ starting-depth relative-depth)) | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3992 (error "Attempt to shift topic out beyond level 1")) |
3430 | 3993 |
3994 (cond ((= starting-depth new-depth) | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3995 ;; 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
|
3996 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
3997 ;; 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
|
3998 ;; 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
|
3999 ;; 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
|
4000 (if (>= relative-depth 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4001 (allout-rebullet-heading nil |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4002 (+ starting-depth relative-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4003 nil ;;; number |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4004 index |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4005 nil)) ;;; do-successors |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4006 (when (not sans-offspring) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4007 ;; ... 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
|
4008 (setq index 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4009 (allout-next-heading) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4010 (while (and (not (eobp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4011 (< starting-depth (allout-depth))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4012 (setq index (1+ index)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4013 (allout-rebullet-topic-grunt relative-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4014 (1+ starting-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4015 starting-point |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4016 index))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4017 (when (< relative-depth 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4018 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4019 (goto-char local-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4020 (allout-rebullet-heading nil ;;; solicit |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4021 (+ starting-depth relative-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4022 nil ;;; number |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4023 starting-index |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4024 nil)))) ;;; do-successors |
3430 | 4025 |
4026 ((< starting-depth new-depth) | |
4027 ;; Rare case - subtopic more than one level deeper than parent. | |
4028 ;; 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
|
4029 (allout-rebullet-topic-grunt relative-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4030 new-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4031 starting-point |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4032 index |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4033 sans-offspring))) |
3430 | 4034 |
4035 (if on-starting-call | |
4036 (progn | |
4037 ;; Rectify numbering of former siblings of the adjusted topic, | |
4038 ;; if topic has changed depth | |
4039 (if (or do-successors | |
4040 (and (not (zerop relative-depth)) | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4041 (or (= allout-recent-depth starting-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4042 (= allout-recent-depth (+ starting-depth |
3430 | 4043 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
|
4044 (allout-rebullet-heading nil nil nil nil t)) |
3430 | 4045 ;; Now rectify numbering of new siblings of the adjusted topic, |
4046 ;; if depth has been changed: | |
4047 (progn (goto-char starting-point) | |
4048 (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
|
4049 (allout-rebullet-heading nil nil nil nil t))))) |
3430 | 4050 ) |
4051 ) | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
4052 ;;;_ > 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
|
4053 (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
|
4054 "Renumber siblings at current depth. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4055 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4056 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
|
4057 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4058 Returns final depth." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4059 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4060 ;; 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
|
4061 ;; 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
|
4062 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
4063 (let ((ascender (allout-depth)) |
29490 | 4064 was-eobp) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4065 (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
|
4066 (allout-depth) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4067 (>= allout-recent-depth depth) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4068 (>= ascender depth)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4069 ; Skip over all topics at |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4070 ; lesser depths, which can not |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4071 ; have been disturbed: |
29490 | 4072 (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
|
4073 (> 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
|
4074 (allout-next-heading)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4075 ; Prime ascender for ascension: |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4076 (setq ascender (1- allout-recent-depth)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4077 (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
|
4078 (allout-rebullet-heading nil ;;; solicit |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4079 nil ;;; depth |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4080 nil ;;; number-control |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4081 nil ;;; index |
29490 | 4082 t)) ;;; do-successors |
4083 (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
|
4084 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
|
4085 ;;;_ > 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
|
4086 (defun allout-number-siblings (&optional denumber) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4087 "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
|
4088 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4089 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
|
4090 topic and its siblings. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4091 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4092 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
|
4093 rebulleting each topic at this level." |
3430 | 4094 |
4095 (interactive "P") | |
4096 | |
4097 (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
|
4098 (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
|
4099 (allout-beginning-of-level) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4100 (let ((depth allout-recent-depth) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4101 (index (if (not denumber) 1)) |
3430 | 4102 (use-bullet (equal '(16) denumber)) |
4103 (more t)) | |
4104 (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
|
4105 (allout-rebullet-heading use-bullet ;;; solicit |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4106 depth ;;; depth |
3430 | 4107 t ;;; number-control |
4108 index ;;; index | |
4109 nil) ;;; do-successors | |
4110 (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
|
4111 (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
|
4112 ;;;_ > 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
|
4113 (defun allout-shift-in (arg) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4114 "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
|
4115 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4116 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
|
4117 `allout-shift-out', instead. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4118 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4119 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
|
4120 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
|
4121 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
|
4122 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4123 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
|
4124 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
|
4125 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
|
4126 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
|
4127 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
|
4128 |
3430 | 4129 (interactive "p") |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4130 (if (< arg 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4131 (allout-shift-out (* arg -1)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4132 ;; refuse to create a containment discontinuity: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4133 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4134 (allout-back-to-current-heading) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4135 (if (not (bobp)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4136 (let* ((current-depth allout-recent-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4137 (start-point (point)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4138 (predecessor-depth (progn |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4139 (forward-char -1) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4140 (allout-goto-prefix-doublechecked) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4141 (if (< (point) start-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4142 allout-recent-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4143 0)))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4144 (if (and (> predecessor-depth 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4145 (> (1+ current-depth) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4146 (1+ predecessor-depth))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4147 (error (concat "Disallowed shift deeper than" |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4148 " containing topic's children.")))))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4149 (let ((where (point))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4150 (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
|
4151 (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
|
4152 ;;;_ > 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
|
4153 (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
|
4154 "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
|
4155 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
|
4156 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4157 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
|
4158 `allout-shift-in', instead. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4159 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4160 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
|
4161 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
|
4162 the item. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4163 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4164 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
|
4165 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
|
4166 subtopics into siblings of the item." |
3430 | 4167 (interactive "p") |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4168 (if (< arg 0) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4169 (allout-shift-in (* arg -1)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4170 ;; Get proper exposure in this area: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4171 (save-excursion (if (allout-ascend) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4172 (allout-show-children))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4173 ;; 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
|
4174 ;; their sibling: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4175 (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
|
4176 (save-excursion (allout-next-sibling))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4177 (allout-show-children)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4178 (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
|
4179 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4180 (if (> arg 1) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4181 ;; 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
|
4182 (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
|
4183 (if (listp (car children-chart)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4184 ;; whoops: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4185 (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
|
4186 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4187 (dolist (child-point children-chart) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4188 (goto-char child-point) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4189 (allout-shift-out 1)))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4190 (allout-rebullet-topic (* arg -1)))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4191 (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
|
4192 ;;;_ : 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
|
4193 ;;;_ > 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
|
4194 (defun allout-kill-line (&optional arg) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4195 "Kill line, adjusting subsequent lines suitably for outline mode." |
3430 | 4196 |
4197 (interactive "*P") | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
4198 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4199 (if (or (not (allout-mode-p)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4200 (not (bolp)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4201 (not (looking-at allout-regexp))) |
69481
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
4202 ;; Just do a regular kill: |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4203 (kill-line arg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4204 ;; Ah, have to watch out for adjustments: |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4205 (let* ((beg (point)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4206 end |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4207 (beg-hidden (allout-hidden-p)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4208 (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
|
4209 (setq end (point)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4210 (allout-hidden-p))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4211 (depth (allout-depth))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4212 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4213 (allout-annotate-hidden beg end) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4214 (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
|
4215 (allout-unprotected (kill-line arg)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4216 (kill-line arg)) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4217 (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
|
4218 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4219 (if allout-numbered-bullet |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4220 (save-excursion ; Renumber subsequent topics if needed: |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
4221 (if (not (looking-at allout-regexp)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
4222 (allout-next-heading)) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4223 (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
|
4224 (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
|
4225 ;;;_ > 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
|
4226 (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
|
4227 "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
|
4228 (interactive) |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4229 (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
|
4230 (condition-case nil |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4231 (allout-kill-line) |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4232 (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
|
4233 ;;;_ > 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
|
4234 (defun allout-kill-topic () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4235 "Kill topic together with subtopics. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4236 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4237 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
|
4238 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4239 - 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
|
4240 - 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
|
4241 - 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
|
4242 previous one. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4243 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4244 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
|
4245 allout-yank-processing for exposure recovery." |
3430 | 4246 |
4247 (interactive) | |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4248 (let* ((inhibit-field-text-motion t) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4249 (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
|
4250 end |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4251 (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
|
4252 (allout-end-of-current-subtree) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4253 (if (and (/= (current-column) 0) (not (eobp))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4254 (forward-char 1)) |
3430 | 4255 (if (not (eobp)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4256 (if (and (looking-at "\n") |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4257 (or (save-excursion |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4258 (or (not (allout-next-heading)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4259 (= depth allout-recent-depth))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4260 (and (> (- beg (point-min)) 3) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4261 (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
|
4262 (forward-char 1))) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
4263 |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4264 (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
|
4265 (unwind-protect |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4266 (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
|
4267 (if buffer-read-only |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4268 ;; 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
|
4269 (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
|
4270 |
3430 | 4271 (save-excursion |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4272 (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
|
4273 (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
|
4274 ;;;_ > 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
|
4275 (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
|
4276 "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
|
4277 (interactive) |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4278 (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
|
4279 (condition-case nil |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4280 (allout-kill-topic) |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4281 (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
|
4282 ;;;_ > allout-annotate-hidden (begin end) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4283 (defun allout-annotate-hidden (begin end) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4284 "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
|
4285 |
73003
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4286 (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
|
4287 (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
|
4288 (allout-deannotate-hidden begin end) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4289 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4290 (goto-char begin) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4291 (let (done next prev overlay) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4292 (while (not done) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4293 ;; 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
|
4294 (if (not (allout-hidden-p)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4295 (setq next |
73003
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4296 (max (1+ (point)) |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4297 (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
|
4298 'invisible |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
4299 nil end)))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4300 (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
|
4301 ;; 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
|
4302 (setq done t) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4303 (goto-char next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4304 (setq prev next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4305 (if (not (allout-hidden-p)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4306 ;; 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
|
4307 (setq done t) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4308 (setq overlay (allout-get-invisibility-overlay)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4309 (setq next (overlay-end overlay) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4310 prev next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4311 ;; 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
|
4312 (when next |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4313 (goto-char next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4314 (allout-unprotected |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4315 (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
|
4316 (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
|
4317 'allout-was-hidden t))))))))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4318 (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
|
4319 ;;;_ > 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
|
4320 (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
|
4321 "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
|
4322 |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4323 (allout-unprotected |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4324 (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
|
4325 (buffer-undo-list t)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4326 ;(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
|
4327 ))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4328 ;;;_ > allout-hide-by-annotation (begin end) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4329 (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
|
4330 "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
|
4331 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4332 (goto-char begin) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4333 (let ((was-modified (buffer-modified-p)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4334 done next prev) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4335 (while (not done) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4336 ;; 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
|
4337 (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
|
4338 (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
|
4339 'allout-was-hidden |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4340 nil end))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4341 (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
|
4342 ;; 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
|
4343 (setq done t) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4344 (goto-char next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4345 (setq prev next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4346 (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
|
4347 ;; still not at start of annotation. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4348 (setq done t) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4349 ;; 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
|
4350 (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
|
4351 'allout-was-hidden |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4352 nil end)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4353 (overlay-put (make-overlay prev next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4354 '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
|
4355 (allout-deannotate-hidden prev next) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4356 (setq prev next) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4357 (if next (goto-char next))))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4358 (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
|
4359 ;;;_ > 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
|
4360 (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
|
4361 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4362 "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
|
4363 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4364 Does depth adjustment of yanked topics, when: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4365 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4366 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
|
4367 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
|
4368 topic prefix. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4369 |
13964
4de229297f1f
(outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
4370 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
|
4371 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4372 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
|
4373 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
|
4374 header into which it's being yanked. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4375 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4376 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
|
4377 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
|
4378 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
|
4379 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4380 (interactive "*P") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4381 ; Get to beginning, leaving |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4382 ; region around subject: |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4383 (if (< (allout-mark-marker t) (point)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4384 (exchange-point-and-mark)) |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4385 (let* ( ;; inhibit aberrance doublecheck while reconciling disparate pastes: |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4386 (allout-during-yank-processing t) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4387 (subj-beg (point)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4388 (into-bol (bolp)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4389 (subj-end (allout-mark-marker t)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4390 ;; 'resituate' if yanking an entire topic into topic header: |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4391 (resituate (and (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
|
4392 (looking-at allout-regexp) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4393 (allout-prefix-data))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4394 ;; `rectify-numbering' if resituating (where several topics may |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4395 ;; be resituating) or yanking a topic into a topic slot (bol): |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4396 (rectify-numbering (or resituate |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4397 (and into-bol (looking-at allout-regexp))))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4398 (if resituate |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4399 ; The yanked stuff is a topic: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4400 (let* ((inhibit-field-text-motion t) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4401 (prefix-len (if (not (match-end 1)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4402 1 |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4403 (- (match-end 1) subj-beg))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4404 (subj-depth allout-recent-depth) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4405 (prefix-bullet (allout-recent-bullet)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4406 (adjust-to-depth |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4407 ;; Nil if adjustment unnecessary, otherwise depth to which |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4408 ;; adjustment should be made: |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4409 (save-excursion |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4410 (and (goto-char subj-end) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4411 (eolp) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4412 (goto-char subj-beg) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4413 (and (looking-at allout-regexp) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4414 (progn |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4415 (beginning-of-line) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4416 (not (= (point) subj-beg))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4417 (looking-at allout-regexp) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4418 (allout-prefix-data)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4419 allout-recent-depth))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4420 (more t)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4421 (setq rectify-numbering allout-numbered-bullet) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4422 (if adjust-to-depth |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4423 ; Do the adjustment: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4424 (progn |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4425 (save-restriction |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4426 (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
|
4427 ; Trim off excessive blank |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4428 ; line at end, if any: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4429 (goto-char (point-max)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4430 (if (looking-at "^$") |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4431 (allout-unprotected (delete-char -1))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4432 ; Work backwards, with each |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4433 ; shallowest level, |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4434 ; successively excluding the |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4435 ; last processed topic from |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4436 ; the narrow region: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4437 (while more |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4438 (allout-back-to-current-heading) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4439 ; go as high as we can in each bunch: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4440 (while (allout-ascend)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4441 (save-excursion |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4442 (allout-unprotected |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4443 (allout-rebullet-topic-grunt (- adjust-to-depth |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4444 subj-depth))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4445 (allout-depth)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4446 (if (setq more (not (bobp))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4447 (progn (widen) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4448 (forward-char -1) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4449 (narrow-to-region subj-beg (point)))))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4450 ;; Preserve new bullet if it's a distinctive one, otherwise |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4451 ;; use old one: |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4452 (if (string-match (regexp-quote prefix-bullet) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4453 allout-distinctive-bullets-string) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4454 ; Delete from bullet of old to |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4455 ; before bullet of new: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4456 (progn |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4457 (beginning-of-line) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4458 (allout-unprotected |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4459 (delete-region (point) subj-beg)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4460 (set-marker (allout-mark-marker t) subj-end) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4461 (goto-char subj-beg) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4462 (allout-end-of-prefix)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4463 ; Delete base subj prefix, |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4464 ; leaving old one: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4465 (allout-unprotected |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4466 (progn |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4467 (delete-region (point) (+ (point) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4468 prefix-len |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4469 (- adjust-to-depth subj-depth))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4470 ; and delete residual subj |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4471 ; prefix digits and space: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4472 (while (looking-at "[0-9]") (delete-char 1)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4473 (if (looking-at " ") (delete-char 1)))))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4474 (exchange-point-and-mark)))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4475 (if rectify-numbering |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4476 (progn |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4477 (save-excursion |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4478 ; Give some preliminary feedback: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4479 (message "... reconciling numbers") |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4480 ; ... and renumber, in case necessary: |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4481 (goto-char subj-beg) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4482 (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
|
4483 (allout-unprotected |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4484 (allout-rebullet-heading nil ;;; solicit |
73660
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4485 (allout-depth) ;;; depth |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4486 nil ;;; number-control |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4487 nil ;;; index |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4488 t))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4489 (message "")))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4490 (if (or into-bol resituate) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4491 (allout-hide-by-annotation (point) (allout-mark-marker t)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4492 (allout-deannotate-hidden (allout-mark-marker t) (point))) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4493 (if (not resituate) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4494 (exchange-point-and-mark)) |
4a5c7b0a29cc
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
Kim F. Storm <storm@cua.dk>
parents:
73315
diff
changeset
|
4495 (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
|
4496 ;;;_ > 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
|
4497 (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
|
4498 "`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
|
4499 |
13964
4de229297f1f
(outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
4500 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
|
4501 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4502 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
|
4503 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
|
4504 |
48857
8641226163f1
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48856
diff
changeset
|
4505 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
|
4506 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
|
4507 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
|
4508 topic prefix. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4509 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4510 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
|
4511 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
|
4512 header into which it's being yanked. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4513 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4514 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
|
4515 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
|
4516 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
|
4517 exactly like normal yanks. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4518 |
13964
4de229297f1f
(outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
4519 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
|
4520 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
|
4521 |
64283
d57ad48e7901
(my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
4522 `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
|
4523 works with normal `yank' in non-outline buffers." |
3430 | 4524 |
4525 (interactive "*P") | |
4526 (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
|
4527 (allout-unprotected |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4528 (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
|
4529 (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
|
4530 (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
|
4531 ;;;_ > 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
|
4532 (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
|
4533 "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
|
4534 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4535 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
|
4536 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4537 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
|
4538 by pops to non-distinctive yanks. Bug..." |
3430 | 4539 |
4540 (interactive "*p") | |
4541 (setq this-command 'yank) | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4542 (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
|
4543 (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
|
4544 (allout-yank-processing))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4545 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4546 ;;;_ - Specialty bullet functions |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4547 ;;;_ : 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
|
4548 ;;;_ > 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
|
4549 (defun allout-resolve-xref () |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4550 "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
|
4551 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
4552 \(Works according to setting of `allout-file-xref-bullet')." |
3430 | 4553 (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
|
4554 (if (not allout-file-xref-bullet) |
3430 | 4555 (error |
64428
e55dd693f95b
(allout-resolve-xref): Fix typos in error strings.
Juanma Barranquero <lekktu@gmail.com>
parents:
64400
diff
changeset
|
4556 "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
|
4557 (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
|
4558 (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
|
4559 allout-file-xref-bullet) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4560 (let ((inhibit-field-text-motion t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4561 file-name) |
3430 | 4562 (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
|
4563 (let* ((text-start allout-recent-prefix-end) |
15663
4f762e6ae80a
(outline-resolve-xref): Do not mistake a blank line
Karl Heuer <kwzh@gnu.org>
parents:
14416
diff
changeset
|
4564 (heading-end (progn (end-of-line) (point)))) |
3430 | 4565 (goto-char text-start) |
4566 (setq file-name | |
4567 (if (re-search-forward "\\s-\\(\\S-*\\)" heading-end t) | |
4568 (buffer-substring (match-beginning 1) (match-end 1)))))) | |
67262
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
4569 (setq file-name (expand-file-name file-name)) |
3430 | 4570 (if (or (file-exists-p file-name) |
4571 (if (file-writable-p file-name) | |
4572 (y-or-n-p (format "%s not there, create one? " | |
4573 file-name)) | |
4574 (error "%s not found and can't be created" file-name))) | |
4575 (condition-case failure | |
4576 (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
|
4577 (error failure)) |
3430 | 4578 (error "%s not found" file-name)) |
4579 ) | |
4580 ) | |
4581 ) | |
4582 ) | |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4583 |
29490 | 4584 ;;;_ #6 Exposure Control |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4585 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4586 ;;;_ - Fundamental |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
4587 ;;;_ > 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
|
4588 (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
|
4589 "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
|
4590 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4591 Exposure-change hook `allout-exposure-change-hook' is run with the same |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4592 arguments as this function, after the exposure changes are made. \(The old |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4593 `allout-view-change-hook' is being deprecated, and eventually will not be |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4594 invoked.\)" |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4595 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4596 ;; 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
|
4597 (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
|
4598 (when flag |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4599 (let ((o (make-overlay from to))) |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
4600 (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
|
4601 (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
|
4602 (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
|
4603 (while props |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4604 (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
|
4605 (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
|
4606 (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
|
4607 ;;;_ > 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
|
4608 (defun allout-flag-current-subtree (flag) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4609 "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
|
4610 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4611 (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
|
4612 (allout-back-to-current-heading) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4613 (let ((inhibit-field-text-motion t)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4614 (end-of-line)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4615 (allout-flag-region (point) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4616 ;; Exposing must not leave trailing blanks hidden, |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4617 ;; 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
|
4618 ;; can use flag's inverse as the |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4619 ;; include-trailing-blank cue: |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4620 (allout-end-of-current-subtree (not flag)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4621 flag))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4622 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4623 ;;;_ - Topic-specific |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
4624 ;;;_ > allout-show-entry () |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
4625 (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
|
4626 "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
|
4627 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4628 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
|
4629 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
|
4630 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
|
4631 the exposure." |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4632 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4633 (interactive) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4634 (save-excursion |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4635 (let (beg end) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4636 (allout-goto-prefix-doublechecked) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4637 (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
|
4638 (setq end (allout-pre-next-prefix)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4639 (allout-flag-region beg end nil) |
29490 | 4640 (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
|
4641 ;;;_ > 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
|
4642 (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
|
4643 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4644 "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
|
4645 |
48857
8641226163f1
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48856
diff
changeset
|
4646 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
|
4647 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4648 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
|
4649 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
|
4650 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4651 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
|
4652 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
|
4653 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
|
4654 it. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4655 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4656 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
|
4657 point of non-opened subtree?)" |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4658 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4659 (interactive "p") |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4660 (let ((start-point (point))) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4661 (if (and (not strict) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4662 (allout-hidden-p)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4663 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4664 (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
|
4665 ; expose it. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4666 ;; 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
|
4667 ;; infinite regress: |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4668 (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
|
4669 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4670 (save-excursion |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4671 (allout-beginning-of-current-line) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4672 (save-restriction |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4673 (let* (depth |
73201
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
4674 ;; 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
|
4675 ;; 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
|
4676 (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
|
4677 ((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
|
4678 (t level))) |
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
4679 (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
|
4680 (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
|
4681 ;; interactive, show discontinuous children: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4682 (and chart |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4683 (interactive-p) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4684 (save-excursion |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4685 (allout-back-to-current-heading) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4686 (setq depth (allout-current-depth)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4687 (and (allout-next-heading) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4688 (> allout-recent-depth |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4689 (1+ depth)))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4690 (message |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4691 "Discontinuous offspring; use `%s %s'%s." |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4692 (substitute-command-keys |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4693 "\\[universal-argument]") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4694 (substitute-command-keys |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4695 "\\[allout-shift-out]") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4696 " to elevate them.") |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4697 (allout-chart-to-reveal |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4698 chart (- allout-recent-depth depth)))))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4699 (goto-char start-point) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4700 (when (and strict (allout-hidden-p)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4701 ;; 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
|
4702 ;; unless strict was set. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4703 (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
|
4704 (when allout-show-bodies |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4705 (goto-char (car to-reveal)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4706 (allout-show-current-entry))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4707 (while to-reveal |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4708 (goto-char (car to-reveal)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4709 (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
|
4710 (progn (search-forward "\n" nil t) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4711 (1- (point))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4712 nil) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4713 (when allout-show-bodies |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4714 (goto-char (car to-reveal)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4715 (allout-show-current-entry)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4716 (setq to-reveal (cdr to-reveal))))))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4717 ;; 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
|
4718 ;; within invisible text: |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4719 (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
|
4720 ;;;_ > 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
|
4721 (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
|
4722 "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
|
4723 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4724 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
|
4725 (interactive) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4726 (save-excursion |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4727 (let ((inhibit-field-text-motion t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4728 (orig-pt (point)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4729 (orig-pref (allout-goto-prefix-doublechecked)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4730 (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
|
4731 (bag-it 0)) |
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
4732 (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
|
4733 (while (allout-hidden-p) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4734 (move-beginning-of-line 1) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4735 (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
|
4736 (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
|
4737 ;; 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
|
4738 ;; 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
|
4739 (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
|
4740 (allout-show-current-subtree) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4741 (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
|
4742 (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
|
4743 (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
|
4744 (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
|
4745 "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
|
4746 (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
|
4747 (allout-show-children) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4748 (goto-char orig-pref))) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4749 (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
|
4750 (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
|
4751 (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
|
4752 ;;;_ > 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
|
4753 (defun allout-hide-current-entry () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4754 "Hide the body directly following this heading." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4755 (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
|
4756 (allout-back-to-current-heading) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4757 (save-excursion |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4758 (let ((inhibit-field-text-motion t)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4759 (end-of-line)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4760 (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
|
4761 (progn (allout-end-of-entry) (point)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4762 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
|
4763 ;;;_ > 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
|
4764 (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
|
4765 "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
|
4766 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4767 (interactive "P") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4768 (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
|
4769 (allout-hide-current-entry) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4770 (save-excursion (allout-show-to-offshoot)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4771 (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
|
4772 (allout-flag-region (point) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4773 (progn (allout-end-of-entry t) (point)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4774 nil) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
4775 ))) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
4776 ;;;_ > 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
|
4777 (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
|
4778 "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
|
4779 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
|
4780 (interactive "P") |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4781 (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
|
4782 (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
|
4783 ;; 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
|
4784 (if (not (allout-next-heading)) |
38431
853c3674f20a
Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38250
diff
changeset
|
4785 (error "No topics") |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4786 ;; 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
|
4787 (message "Above outermost topic - exposing all.") |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4788 (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
|
4789 (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
|
4790 (if (not arg) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4791 (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
|
4792 (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
|
4793 (allout-expose-topic '(* :)))))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4794 ;;;_ > 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
|
4795 (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
|
4796 "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
|
4797 |
70673
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
4798 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
|
4799 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
|
4800 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
|
4801 default, they are treated as being uncollapsed." |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4802 (save-excursion |
70673
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
4803 (and |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4804 ;; Is the topic all on one line (allowing for trailing blank line)? |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4805 (>= (progn (allout-back-to-current-heading) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4806 (move-end-of-line 1) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4807 (point)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4808 (allout-end-of-current-subtree (not (looking-at "\n\n")))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
4809 |
70673
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
4810 (or include-single-liners |
798fa39b6207
2006-05-16 Ken Manheimer <ken.manheimer@gmail.com>
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70616
diff
changeset
|
4811 (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
|
4812 ;;;_ > 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
|
4813 (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
|
4814 "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
|
4815 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4816 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
|
4817 and its siblings. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4818 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4819 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
|
4820 siblings, even if the target topic is already closed." |
3430 | 4821 |
4822 (interactive) | |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4823 (let* ((from (point)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4824 (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
|
4825 (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
|
4826 (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
|
4827 (just-close nil) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4828 ((allout-ascend) (allout-hide-current-subtree)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4829 (t (goto-char 0) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4830 (message sibs-msg) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
4831 (allout-goto-prefix-doublechecked) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4832 (allout-expose-topic '(0 :)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4833 (message (concat sibs-msg " Done.")))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4834 (goto-char from))) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
4835 ;;;_ > 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
|
4836 (defun allout-show-current-branches () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4837 "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
|
4838 (interactive) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4839 (let ((inhibit-field-text-motion t)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4840 (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
|
4841 (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
|
4842 ;;;_ > 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
|
4843 (defun allout-hide-current-leaves () |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
4844 "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
|
4845 (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
|
4846 (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
|
4847 (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
|
4848 (point)))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4849 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4850 ;;;_ - 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
|
4851 ;;;_ > 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
|
4852 (defun allout-show-all () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4853 "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
|
4854 (interactive) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4855 (message "Exposing entire buffer...") |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4856 (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
|
4857 (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
|
4858 ;;;_ > 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
|
4859 (defun allout-hide-bodies () |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4860 "Hide all of buffer except headings." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4861 (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
|
4862 (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
|
4863 ;;;_ > 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
|
4864 (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
|
4865 "Hide all body lines in the region, but not headings." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4866 (save-excursion |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4867 (save-restriction |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4868 (narrow-to-region start end) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4869 (goto-char (point-min)) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4870 (let ((inhibit-field-text-motion t)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4871 (while (not (eobp)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4872 (end-of-line) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4873 (allout-flag-region (point) (allout-end-of-entry) t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4874 (if (not (eobp)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4875 (forward-char |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4876 (if (looking-at "\n\n") |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
4877 2 1)))))))) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4878 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
4879 ;;;_ > 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
|
4880 (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
|
4881 "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
|
4882 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
4883 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
|
4884 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
|
4885 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
|
4886 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
|
4887 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4888 Cursor is left at start position. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4889 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4890 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
|
4891 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4892 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
|
4893 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4894 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
|
4895 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
|
4896 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4897 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
|
4898 subtopics of the current topic. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4899 |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
4900 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
|
4901 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
|
4902 explicit specs following the `:'. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4903 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4904 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
|
4905 |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4906 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
|
4907 - 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
|
4908 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
|
4909 that level. |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4910 - 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
|
4911 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
|
4912 - 0 means to close topic - hide all offspring. |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
4913 : - `repeat' |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4914 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
|
4915 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
|
4916 on the list. Ie, apply to all topics at level but the last |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4917 ones. \(Only first of multiple colons at same level is |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4918 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
|
4919 * - 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
|
4920 + - 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
|
4921 - - 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
|
4922 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4923 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
|
4924 \(allout-expose-topic '(-1 : 0)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4925 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
|
4926 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
|
4927 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
|
4928 \(allout-expose-topic '(-1 () : 1 0)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4929 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
|
4930 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
|
4931 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
|
4932 \(allout-expose-topic '(-2 : -1 *)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4933 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
|
4934 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
|
4935 last and completely open the last one." |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4936 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
4937 (interactive "xExposure spec: ") |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4938 (if (not (listp spec)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4939 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
|
4940 (let ((depth (allout-depth)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4941 (max-pos 0) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4942 prev-elem curr-elem |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4943 stay) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4944 (while spec |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4945 (setq prev-elem curr-elem |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4946 curr-elem (car spec) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4947 spec (cdr spec)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4948 (cond ; Do current element: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4949 ((null curr-elem) nil) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4950 ((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
|
4951 (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
|
4952 (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
|
4953 (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
|
4954 ((eq curr-elem '+) |
16a7031b0447
(allout-expose-topic): Rectify implementation of "+" spec, so that bodies are
Eli Zaretskii <eliz@gnu.org>
parents:
73003
diff
changeset
|
4955 (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
|
4956 (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
|
4957 (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
|
4958 (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
|
4959 (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
|
4960 ((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
|
4961 ((eq curr-elem ':) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4962 (setq stay t) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
4963 ;; 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
|
4964 ;; w.r.t. remaining siblings: |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4965 (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
|
4966 ;; 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
|
4967 (- (length (allout-chart-siblings)) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4968 (length spec)))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4969 (if (< 0 residue) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4970 ;; 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
|
4971 (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
|
4972 spec))))))) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4973 ((numberp curr-elem) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
4974 (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
|
4975 (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
|
4976 (if (> 0 curr-elem) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4977 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
|
4978 (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
|
4979 (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
|
4980 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
|
4981 (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
|
4982 (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
|
4983 (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
|
4984 (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
|
4985 ((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
|
4986 (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
|
4987 (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
|
4988 (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
|
4989 (cond (stay (setq stay nil)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4990 ((listp (car spec)) nil) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4991 ((> max-pos (point)) |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4992 ;; 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
|
4993 (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
|
4994 (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
|
4995 ((allout-next-sibling depth)))) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
4996 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
|
4997 ;;;_ > 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
|
4998 (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
|
4999 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5000 "Deprecated. Use `allout-expose-topic' \(with different schema |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5001 format) instead. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5002 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5003 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
|
5004 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5005 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
|
5006 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
|
5007 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5008 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
|
5009 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
|
5010 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
|
5011 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
|
5012 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
|
5013 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5014 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
|
5015 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5016 - 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
|
5017 - 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
|
5018 absolute value of the number. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5019 - 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
|
5020 - 0 just closes |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
5021 - `*' completely opens the topic, including bodies. |
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
5022 - `+' shows all the sub headers, but not the bodies |
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
5023 - `-' 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
|
5024 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5025 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
|
5026 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
|
5027 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
|
5028 for the corresponding offspring of the topic. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5029 |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
5030 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
|
5031 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5032 (interactive "xExposure spec: ") |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5033 (let ((inhibit-field-text-motion t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5034 (depth (allout-current-depth)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5035 max-pos) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5036 (cond ((null spec) nil) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5037 ((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
|
5038 (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
|
5039 (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
|
5040 (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
|
5041 ((numberp spec) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5042 (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
|
5043 (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
|
5044 (end-of-line) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5045 (if (or (not max-pos) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5046 (> (point) max-pos)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5047 (setq max-pos (point))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5048 (if (> 0 spec) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5049 (setq spec (* -1 spec))))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5050 (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
|
5051 (allout-show-children spec))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5052 ((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
|
5053 ;(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
|
5054 ; (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
|
5055 ; (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
|
5056 (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
|
5057 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
|
5058 (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
|
5059 (setq spec (cdr spec)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5060 (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
|
5061 (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
|
5062 (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
|
5063 (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
|
5064 (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
|
5065 (setq max-pos got))))))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5066 (while (and followers |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5067 (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
|
5068 (progn (goto-char max-pos) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5069 (setq max-pos nil))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5070 (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
|
5071 (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
|
5072 (allout-old-expose-topic (car followers)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5073 (setq followers (cdr followers))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5074 max-pos)) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
5075 ;;;_ > allout-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
|
5076 (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
|
5077 "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
|
5078 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
|
5079 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
|
5080 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5081 Cursor is left at start position. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5082 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5083 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
|
5084 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5085 Examples: |
61969
38ca28ee68d6
(allout-exposure): Remove macro and obsolete declaration.
Nick Roberts <nickrob@snap.net.nz>
parents:
59996
diff
changeset
|
5086 \(allout-new-exposure (-1 () () () 1) 0) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5087 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
|
5088 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
|
5089 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
|
5090 \(allout-new-exposure : -1 0) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5091 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
|
5092 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
|
5093 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
|
5094 \(allout-new-exposure -2 : -1 *) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5095 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
|
5096 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
|
5097 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
|
5098 (list 'save-excursion |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5099 '(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
|
5100 (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
|
5101 (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
|
5102 (list 'allout-expose-topic (list 'quote spec)))) |
29490 | 5103 |
5104 ;;;_ #7 Systematic outline presentation - copying, printing, flattening | |
5105 | |
5106 ;;;_ - Mapping and processing of topics | |
5107 ;;;_ ( 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
|
5108 ;;;_ > 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
|
5109 (defun allout-stringify-flat-index (flat-index &optional context) |
29490 | 5110 "Convert list representing section/subsection/... to document string. |
5111 | |
5112 Optional arg CONTEXT indicates interior levels to include." | |
5113 (let ((delim ".") | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
5114 result |
29490 | 5115 numstr |
5116 (context-depth (or (and context 2) 1))) | |
5117 ;; Take care of the explicit context: | |
5118 (while (> context-depth 0) | |
5119 (setq numstr (int-to-string (car flat-index)) | |
5120 flat-index (cdr flat-index) | |
5121 result (if flat-index | |
5122 (cons delim (cons numstr result)) | |
5123 (cons numstr result)) | |
5124 context-depth (if flat-index (1- context-depth) 0))) | |
5125 (setq delim " ") | |
5126 ;; Take care of the indentation: | |
5127 (if flat-index | |
5128 (progn | |
5129 (while flat-index | |
5130 (setq result | |
5131 (cons delim | |
5132 (cons (make-string | |
5133 (1+ (truncate (if (zerop (car flat-index)) | |
5134 1 | |
5135 (log10 (car flat-index))))) | |
5136 ? ) | |
5137 result))) | |
5138 (setq flat-index (cdr flat-index))) | |
5139 ;; Dispose of single extra delim: | |
5140 (setq result (cdr result)))) | |
5141 (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
|
5142 ;;;_ > 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
|
5143 (defun allout-stringify-flat-index-plain (flat-index) |
29490 | 5144 "Convert list representing section/subsection/... to document string." |
5145 (let ((delim ".") | |
5146 result) | |
5147 (while flat-index | |
5148 (setq result (cons (int-to-string (car flat-index)) | |
5149 (if result | |
5150 (cons delim result)))) | |
5151 (setq flat-index (cdr flat-index))) | |
5152 (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
|
5153 ;;;_ > 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
|
5154 (defun allout-stringify-flat-index-indented (flat-index) |
29490 | 5155 "Convert list representing section/subsection/... to document string." |
5156 (let ((delim ".") | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
5157 result |
29490 | 5158 numstr) |
5159 ;; Take care of the explicit context: | |
5160 (setq numstr (int-to-string (car flat-index)) | |
5161 flat-index (cdr flat-index) | |
5162 result (if flat-index | |
5163 (cons delim (cons numstr result)) | |
5164 (cons numstr result))) | |
5165 (setq delim " ") | |
5166 ;; Take care of the indentation: | |
5167 (if flat-index | |
5168 (progn | |
5169 (while flat-index | |
5170 (setq result | |
5171 (cons delim | |
5172 (cons (make-string | |
5173 (1+ (truncate (if (zerop (car flat-index)) | |
5174 1 | |
5175 (log10 (car flat-index))))) | |
5176 ? ) | |
5177 result))) | |
5178 (setq flat-index (cdr flat-index))) | |
5179 ;; Dispose of single extra delim: | |
5180 (setq result (cdr result)))) | |
5181 (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
|
5182 ;;;_ > 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
|
5183 (defun allout-listify-exposed (&optional start end format) |
29490 | 5184 |
5185 "Produce a list representing exposed topics in current region. | |
5186 | |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
5187 This list can then be used by `allout-process-exposed' to manipulate |
29490 | 5188 the subject region. |
5189 | |
5190 Optional START and END indicate bounds of region. | |
5191 | |
5192 optional arg, FORMAT, designates an alternate presentation form for | |
5193 the prefix: | |
5194 | |
5195 list - Present prefix as numeric section.subsection..., starting with | |
5196 section indicated by the list, innermost nesting first. | |
5197 `indent' \(symbol) - Convert header prefixes to all white space, | |
5198 except for distinctive bullets. | |
5199 | |
5200 The elements of the list produced are lists that represents a topic | |
5201 header and body. The elements of that list are: | |
5202 | |
5203 - a number representing the depth of the topic, | |
5204 - a string representing the header-prefix, including trailing whitespace and | |
5205 bullet. | |
5206 - a string representing the bullet character, | |
5207 - and a series of strings, each containing one line of the exposed | |
5208 portion of the topic entry." | |
5209 | |
5210 (interactive "r") | |
5211 (save-excursion | |
5212 (let* | |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5213 ((inhibit-field-text-motion t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5214 ;; state vars: |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5215 strings prefix result depth new-depth out gone-out bullet beg |
29490 | 5216 next done) |
5217 | |
5218 (goto-char start) | |
5219 (beginning-of-line) | |
5220 ;; 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
|
5221 (if (> (allout-goto-prefix-doublechecked) start) |
29490 | 5222 ;; First topic follows beginning point - register preliminary stuff: |
5223 (setq result (list (list 0 "" nil | |
5224 (buffer-substring start (1- (point))))))) | |
5225 (while (and (not done) | |
5226 (not (eobp)) ; Loop until we've covered the region. | |
5227 (not (> (point) end))) | |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5228 (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
|
5229 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
|
5230 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
|
5231 beg (progn (allout-end-of-prefix t) (point))) ; and beginning. |
29490 | 5232 (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
|
5233 (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
|
5234 (setq new-depth allout-recent-depth) |
29490 | 5235 (setq gone-out out |
5236 out (< new-depth depth)) | |
5237 (beginning-of-line) | |
5238 (setq next (point)) | |
5239 (goto-char beg) | |
5240 (setq strings nil) | |
5241 (while (> next (point)) ; Get all the exposed text in | |
5242 (setq strings | |
5243 (cons (buffer-substring | |
5244 beg | |
5245 ;To hidden text or end of line: | |
5246 (progn | |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5247 (end-of-line) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5248 (allout-back-to-visible-text))) |
29490 | 5249 strings)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5250 (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
|
5251 (line-move 1) |
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
5252 (beginning-of-line)) |
29490 | 5253 (setq beg (point))) |
5254 ;; Accumulate list for this topic: | |
5255 (setq strings (nreverse strings)) | |
5256 (setq result | |
5257 (cons | |
5258 (if format | |
5259 (let ((special (if (string-match | |
5260 (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
|
5261 allout-distinctive-bullets-string) |
29490 | 5262 bullet))) |
5263 (cond ((listp format) | |
5264 (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
|
5265 (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
|
5266 (allout-stringify-flat-index format |
29490 | 5267 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
|
5268 (allout-stringify-flat-index-plain |
29490 | 5269 format)) |
5270 strings | |
5271 special)) | |
5272 ((eq format 'indent) | |
5273 (if special | |
5274 (list depth | |
5275 (concat (make-string (1+ depth) ? ) | |
5276 (substring prefix -1)) | |
5277 strings) | |
5278 (list depth | |
5279 (make-string depth ? ) | |
5280 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
|
5281 (t (error "allout-listify-exposed: %s %s" |
29490 | 5282 "invalid format" format)))) |
5283 (list depth prefix strings)) | |
5284 result)) | |
5285 ;; Reasses format, if any: | |
5286 (if (and format (listp format)) | |
5287 (cond ((= new-depth depth) | |
5288 (setq format (cons (1+ (car format)) | |
5289 (cdr format)))) | |
5290 ((> new-depth depth) ; descending - assume by 1: | |
5291 (setq format (cons 1 format))) | |
5292 (t | |
5293 ; Pop the residue: | |
5294 (while (< new-depth depth) | |
5295 (setq format (cdr format)) | |
5296 (setq depth (1- depth))) | |
5297 ; And increment the current one: | |
5298 (setq format | |
5299 (cons (1+ (or (car format) | |
5300 -1)) | |
5301 (cdr format))))))) | |
5302 ;; Put the list with first at front, to last at back: | |
5303 (nreverse result)))) | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5304 ;;;_ > my-region-active-p () |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5305 (defmacro my-region-active-p () |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5306 (if (fboundp 'region-active-p) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5307 '(region-active-p) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5308 'mark-active)) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
5309 ;;;_ > allout-process-exposed (&optional func from to frombuf |
29490 | 5310 ;;; 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
|
5311 (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
|
5312 format start-num) |
29490 | 5313 "Map function on exposed parts of current topic; results to another buffer. |
5314 | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5315 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
|
5316 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5317 Apply FUNCTION to exposed portions FROM position TO position in buffer |
29490 | 5318 FROMBUF to buffer TOBUF. Sixth optional arg, FORMAT, designates an |
5319 alternate presentation form: | |
5320 | |
5321 `flat' - Present prefix as numeric section.subsection..., starting with | |
5322 section indicated by the start-num, innermost nesting first. | |
5323 X`flat-indented' - Prefix is like `flat' for first topic at each | |
5324 X level, but subsequent topics have only leaf topic | |
5325 X number, padded with blanks to line up with first. | |
5326 `indent' \(symbol) - Convert header prefixes to all white space, | |
5327 except for distinctive bullets. | |
5328 | |
5329 Defaults: | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5330 FUNCTION: `allout-insert-listified' |
29490 | 5331 FROM: region start, if region active, else start of buffer |
5332 TO: region end, if region active, else end of buffer | |
5333 FROMBUF: current buffer | |
5334 TOBUF: buffer name derived: \"*current-buffer-name exposed*\" | |
5335 FORMAT: nil" | |
5336 | |
5337 ; Resolve arguments, | |
5338 ; 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
|
5339 (if (not func) (setq func 'allout-insert-listified)) |
29490 | 5340 (if (not (and from to)) |
5341 (if (my-region-active-p) | |
5342 (setq from (region-beginning) to (region-end)) | |
5343 (setq from (point-min) to (point-max)))) | |
5344 (if frombuf | |
5345 (if (not (bufferp frombuf)) | |
5346 ;; Specified but not a buffer - get it: | |
5347 (let ((got (get-buffer frombuf))) | |
5348 (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
|
5349 (error (concat "allout-process-exposed: source buffer " |
29490 | 5350 frombuf |
5351 " not found.")) | |
5352 (setq frombuf got)))) | |
5353 ;; not specified - default it: | |
5354 (setq frombuf (current-buffer))) | |
5355 (if tobuf | |
5356 (if (not (bufferp tobuf)) | |
5357 (setq tobuf (get-buffer-create tobuf))) | |
5358 ;; not specified - default it: | |
5359 (setq tobuf (concat "*" (buffer-name frombuf) " exposed*"))) | |
5360 (if (listp format) | |
5361 (nreverse format)) | |
5362 | |
5363 (let* ((listified | |
5364 (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
|
5365 (allout-listify-exposed from to format)))) |
29490 | 5366 (set-buffer tobuf) |
5367 (mapcar func listified) | |
5368 (pop-to-buffer tobuf))) | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5369 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5370 ;;;_ - 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
|
5371 ;;;_ > 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
|
5372 (defun allout-insert-listified (listified) |
29490 | 5373 "Insert contents of listified outline portion in current buffer. |
5374 | |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
5375 LISTIFIED is a list representing each topic header and body: |
29490 | 5376 |
5377 \`(depth prefix text)' | |
5378 | |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5379 or \`(depth prefix text bullet-plus)' |
29490 | 5380 |
5381 If `bullet-plus' is specified, it is inserted just after the entire prefix." | |
5382 (setq listified (cdr listified)) | |
5383 (let ((prefix (prog1 | |
5384 (car listified) | |
5385 (setq listified (cdr listified)))) | |
5386 (text (prog1 | |
5387 (car listified) | |
5388 (setq listified (cdr listified)))) | |
5389 (bullet-plus (car listified))) | |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5390 (insert prefix) |
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5391 (if bullet-plus (insert (concat " " bullet-plus))) |
29490 | 5392 (while text |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5393 (insert (car text)) |
29490 | 5394 (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
|
5395 (insert "\n"))) |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5396 (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
|
5397 ;;;_ > 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
|
5398 (defun allout-copy-exposed-to-buffer (&optional arg tobuf format) |
29490 | 5399 "Duplicate exposed portions of current outline to another buffer. |
5400 | |
5401 Other buffer has current buffers name with \" exposed\" appended to it. | |
5402 | |
5403 With repeat count, copy the exposed parts of only the current topic. | |
5404 | |
5405 Optional second arg TOBUF is target buffer name. | |
5406 | |
5407 Optional third arg FORMAT, if non-nil, symbolically designates an | |
5408 alternate presentation format for the outline: | |
5409 | |
5410 `flat' - Convert topic header prefixes to numeric | |
5411 section.subsection... identifiers. | |
5412 `indent' - Convert header prefixes to all white space, except for | |
5413 distinctive bullets. | |
5414 `indent-flat' - The best of both - only the first of each level has | |
5415 the full path, the rest have only the section number | |
5416 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
|
5417 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5418 (interactive "P") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5419 (if (not tobuf) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5420 (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
|
5421 (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
|
5422 (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
|
5423 (end (if arg (allout-end-of-current-subtree) (point-max))) |
29490 | 5424 (buf (current-buffer)) |
5425 (start-list ())) | |
5426 (if (eq format 'flat) | |
5427 (setq format (if arg (save-excursion | |
5428 (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
|
5429 (allout-topic-flat-index)) |
29490 | 5430 '(1)))) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5431 (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
|
5432 (allout-process-exposed 'allout-insert-listified |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5433 beg |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5434 end |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5435 (current-buffer) |
29490 | 5436 tobuf |
5437 format start-list) | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5438 (goto-char (point-min)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5439 (pop-to-buffer buf) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5440 (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
|
5441 ;;;_ > 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
|
5442 (defun allout-flatten-exposed-to-buffer (&optional arg tobuf) |
29490 | 5443 "Present numeric outline of outline's exposed portions in another buffer. |
5444 | |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
5445 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
|
5446 `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
|
5447 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
5448 Use `allout-indented-exposed-to-buffer' for indented presentation. |
29490 | 5449 |
5450 With repeat count, copy the exposed portions of only current topic. | |
5451 | |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
5452 Other buffer has current buffer's name with \" exposed\" appended to |
29490 | 5453 it, unless optional second arg TOBUF is specified, in which case it is |
5454 used verbatim." | |
5455 (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
|
5456 (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
|
5457 ;;;_ > 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
|
5458 (defun allout-indented-exposed-to-buffer (&optional arg tobuf) |
29490 | 5459 "Present indented outline of outline's exposed portions in another buffer. |
5460 | |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
5461 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
|
5462 `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
|
5463 |
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
5464 Use `allout-flatten-exposed-to-buffer' for numeric sectional presentation. |
29490 | 5465 |
5466 With repeat count, copy the exposed portions of only current topic. | |
5467 | |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
5468 Other buffer has current buffer's name with \" exposed\" appended to |
29490 | 5469 it, unless optional second arg TOBUF is specified, in which case it is |
5470 used verbatim." | |
5471 (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
|
5472 (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
|
5473 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5474 ;;;_ - 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
|
5475 ;;;_ > 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
|
5476 (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
|
5477 "Return copy of STRING for literal reproduction across LaTeX processing. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
5478 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
|
5479 string across LaTeX processing." |
29490 | 5480 (mapconcat (function |
5481 (lambda (char) | |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5482 (cond ((memq char '(?\\ ?$ ?% ?# ?& ?{ ?} ?_ ?^ ?- ?*)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5483 (concat "\\char" (number-to-string char) "{}")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5484 ((= char ?\n) "\\\\") |
29490 | 5485 (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
|
5486 string |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5487 "")) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
5488 ;;;_ > 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
|
5489 (defun allout-latex-verbatim-quote-curr-line () |
64283
d57ad48e7901
(my-mark-marker, allout-isearch-prior-pos, allout-unprotected,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
5490 "Express line for exact \(literal) representation across LaTeX processing. |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
5491 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
5492 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
|
5493 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
|
5494 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
|
5495 (let ((inhibit-field-text-motion t)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5496 (beginning-of-line) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5497 (let ((beg (point)) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5498 (end (progn (end-of-line)(point)))) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5499 (goto-char beg) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5500 (while (re-search-forward "\\\\" |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5501 ;;"\\\\\\|\\{\\|\\}\\|\\_\\|\\$\\|\\\"\\|\\&\\|\\^\\|\\-\\|\\*\\|#" |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5502 end ; bounded by end-of-line |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5503 1) ; no matches, move to end & return nil |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5504 (goto-char (match-beginning 2)) |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5505 (insert "\\") |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
5506 (setq end (1+ end)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5507 (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
|
5508 ;;;_ > 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
|
5509 (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
|
5510 "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
|
5511 ;; 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
|
5512 ;; 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
|
5513 (set-buffer buffer) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5514 (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
|
5515 "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
|
5516 (page-numbering (if allout-number-pages |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5517 "\\pagestyle{empty}\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5518 "")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5519 (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
|
5520 allout-title-style)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5521 (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
|
5522 allout-label-style)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5523 (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
|
5524 allout-head-line-style)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5525 (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
|
5526 allout-body-line-style)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5527 (setlength (format "%s%s%s%s" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5528 "\\newlength{\\stepsize}\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5529 "\\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
|
5530 allout-indent |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5531 "}\n")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5532 (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
|
5533 "\\newcommand{\\OneHeadLine}[3]{%\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5534 "\\noindent%\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5535 "\\hspace*{#2\\stepsize}%\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5536 "\\labelcmd{#1}\\hspace*{.2cm}" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5537 "\\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
|
5538 allout-line-skip |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5539 "]\n}\n")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5540 (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
|
5541 "\\newcommand{\\OneBodyLine}[2]{%\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5542 "\\noindent%\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5543 "\\hspace*{#1\\stepsize}%\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5544 "\\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
|
5545 allout-line-skip |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5546 "]\n}\n")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5547 (begindoc "\\begin{document}\n\\begin{center}\n") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5548 (title (format "%s%s%s%s" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5549 "\\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
|
5550 (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
|
5551 (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
|
5552 (eval allout-title) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5553 (error "<unnamed buffer>")) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5554 "Unnamed Outline")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5555 "}\n" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5556 "\\end{center}\n\n")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5557 (hsize "\\hsize = 7.5 true in\n") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5558 (hoffset "\\hoffset = -1.5 true in\n") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5559 (vspace "\\vspace{.1cm}\n\n")) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5560 (insert (concat doc-style |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5561 page-numbering |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5562 titlecmd |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5563 labelcmd |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5564 headlinecmd |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5565 bodylinecmd |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5566 setlength |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5567 oneheadline |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5568 onebodyline |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5569 begindoc |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5570 title |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5571 hsize |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5572 hoffset |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5573 vspace) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5574 ))) |
55717
50b099e608af
(allout-chart-subtree, allout-rebullet-topic-grunt): Don't mention in the
Juanma Barranquero <lekktu@gmail.com>
parents:
54952
diff
changeset
|
5575 ;;;_ > 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
|
5576 (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
|
5577 "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
|
5578 (set-buffer buffer) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5579 (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
|
5580 ;;;_ > 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
|
5581 (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
|
5582 "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
|
5583 |
29490 | 5584 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
|
5585 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
|
5586 (let* ((head-line (if text (car text))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5587 (body-lines (cdr text)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5588 (curr-line) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5589 body-content bop) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5590 ; Do the head line: |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48859
diff
changeset
|
5591 (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
|
5592 (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
|
5593 "\1}{" |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5594 depth |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5595 "}{\\verb\1 " |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5596 (if head-line |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5597 (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
|
5598 "") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5599 "\1}\n")) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5600 (if (not body-lines) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5601 nil |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5602 ;;(insert "\\beginlines\n") |
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5603 (insert "\\begin{verbatim}\n") |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5604 (while body-lines |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5605 (setq curr-line (car body-lines)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5606 (if (and (not body-content) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5607 (not (string-match "^\\s-*$" curr-line))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5608 (setq body-content t)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5609 ; Mangle any occurrences of |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5610 ; "\end{verbatim}" in text, |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5611 ; it's special: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5612 (if (and body-content |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5613 (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
|
5614 (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
|
5615 ">" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5616 (substring curr-line bop)))) |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5617 ;;(insert "|" (car body-lines) "|") |
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5618 (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
|
5619 (allout-latex-verbatim-quote-curr-line) |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5620 (insert "\n") |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5621 (setq body-lines (cdr body-lines))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5622 (if body-content |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5623 (setq body-content nil) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5624 (forward-char -1) |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5625 (insert "\\ ") |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5626 (forward-char 1)) |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5627 ;;(insert "\\endlines\n") |
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
5628 (insert "\\end{verbatim}\n") |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5629 ))) |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
5630 ;;;_ > 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
|
5631 (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
|
5632 "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
|
5633 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
|
5634 with \"*\" prepended and \" latex-formed*\" appended. |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5635 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5636 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
|
5637 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5638 (interactive "P") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5639 (if (not tobuf) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5640 (setq tobuf |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5641 (get-buffer-create (concat "*" (buffer-name) " latexified*")))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5642 (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
|
5643 (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
|
5644 (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
|
5645 (buf (current-buffer))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5646 (set-buffer tobuf) |
3430 | 5647 (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
|
5648 (allout-insert-latex-header tobuf) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5649 (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
|
5650 (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
|
5651 beg |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5652 end |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5653 buf |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5654 tobuf) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5655 (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
|
5656 (allout-insert-latex-trailer tobuf) |
3430 | 5657 (goto-char (point-min)) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5658 (pop-to-buffer buf) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5659 (goto-char start-pt))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
5660 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5661 ;;;_ #8 Encryption |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5662 ;;;_ > 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
|
5663 (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
|
5664 "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
|
5665 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5666 Optional FETCH-PASS universal argument provokes key-pair encryption with |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5667 single universal argument. With doubled universal argument \(value = 16), |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5668 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
|
5669 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
|
5670 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
|
5671 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5672 Currently only GnuPG encryption is supported. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5673 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5674 \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5675 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
|
5676 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5677 Both symmetric-key and key-pair encryption is implemented. Symmetric is |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5678 the default, use a single \(x4) universal argument for keypair mode. |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5679 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5680 Encrypted topic's bullet is set to a `~' to signal that the contents of the |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5681 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
|
5682 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
|
5683 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
|
5684 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
|
5685 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
|
5686 auto-encryption specifics. |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5687 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5688 \**NOTE WELL** that automatic encryption that happens during saves will |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5689 default to symmetric encryption - you must manually \(re)encrypt key-pair |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5690 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
|
5691 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5692 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
|
5693 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
|
5694 \\[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
|
5695 |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5696 Passphrase Caching |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5697 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5698 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
|
5699 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
|
5700 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5701 The solicited passphrase is retained for reuse in a buffer-specific cache |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5702 for some set period of time \(default, 60 seconds), after which the string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5703 is nulled. The passphrase cache timeout is customized by setting |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5704 `pgg-passphrase-cache-expiry'. |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5705 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5706 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
|
5707 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5708 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
|
5709 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
|
5710 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
|
5711 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
|
5712 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
|
5713 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
|
5714 keys. |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5715 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5716 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
|
5717 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
|
5718 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
|
5719 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
|
5720 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
|
5721 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5722 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
|
5723 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
|
5724 when the hint is presented, or if passphrase hints are disabled. If |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5725 enabled \(see the `allout-passphrase-hint-handling' docstring for details), |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5726 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
|
5727 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
|
5728 (interactive "P") |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5729 (save-excursion |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5730 (allout-back-to-current-heading) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5731 (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
|
5732 ) |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5733 ) |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5734 ;;;_ > 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
|
5735 (defun 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
|
5736 "Encrypt clear text or decrypt encoded topic contents \(body and subtopics.) |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5737 |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5738 Optional FETCH-PASS universal argument provokes key-pair encryption with |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5739 single universal argument. With doubled universal argument \(value = 16), |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5740 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
|
5741 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
|
5742 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
|
5743 |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5744 Currently only GnuPG encryption is supported. |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5745 |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5746 \**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
|
5747 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
|
5748 |
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5749 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
|
5750 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5751 (interactive "P") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5752 (save-excursion |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5753 (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
|
5754 |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5755 (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
|
5756 (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
|
5757 " 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
|
5758 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5759 (let* ((allout-buffer (current-buffer)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5760 ;; Asses location: |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5761 (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
|
5762 (after-bullet-pos (point)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5763 (was-encrypted |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5764 (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
|
5765 (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
|
5766 (allout-encrypted-topic-p))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5767 (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
|
5768 nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5769 (backward-char 1) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5770 (allout-hidden-p))) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5771 (subtree-beg (1+ (point))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5772 (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
|
5773 (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
|
5774 subtree-end)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5775 (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
|
5776 (subtree-trailing-char (char-after subtree-end)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5777 ;; 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
|
5778 ;; check for the error condition |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5779 (result-text (if (or (string= "" subject-text) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5780 (string= "\n" subject-text)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5781 (error "No topic contents to %scrypt" |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5782 (if was-encrypted "de" "en")) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5783 nil)) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5784 ;; Assess key parameters: |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5785 (key-info (or |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5786 ;; 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
|
5787 (and was-encrypted |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5788 (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
|
5789 (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
|
5790 '(keypair nil)) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5791 '(symmetric nil))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5792 (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
|
5793 (for-key-identity (cadr key-info)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5794 (fetch-pass (and fetch-pass (member fetch-pass '(16 (16)))))) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5795 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5796 (setq result-text |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5797 (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
|
5798 (current-buffer) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5799 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
|
5800 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5801 ;; 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
|
5802 (allout-unprotected |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5803 (progn |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5804 (set-buffer allout-buffer) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5805 (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
|
5806 (insert result-text) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5807 (if was-collapsed |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5808 (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
|
5809 ;; 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
|
5810 (if (not was-encrypted) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5811 (if (and (= subtree-end-char ?\n) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5812 (= subtree-trailing-char ?\n)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5813 (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
|
5814 ;; 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
|
5815 (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
|
5816 (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
|
5817 allout-topic-encryption-bullet)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5818 (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
|
5819 (delete-char 1) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5820 (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
|
5821 (if was-encrypted |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5822 ;; 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
|
5823 (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
|
5824 (delete-char 1)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5825 ;; 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
|
5826 (goto-char after-bullet-pos) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5827 (insert "*")))) |
73003
ec72ab6f5541
* allout.el (allout-unprotected): Let inhibit-read-only only when
Chong Yidong <cyd@stupidchicken.com>
parents:
72917
diff
changeset
|
5828 (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
|
5829 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
|
5830 ;;;_ > 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
|
5831 ;;; 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
|
5832 ;;; passphrase) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5833 (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
|
5834 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
|
5835 verifying passphrase) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5836 "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
|
5837 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5838 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
|
5839 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5840 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
|
5841 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5842 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
|
5843 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5844 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
|
5845 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
|
5846 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5847 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
|
5848 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
|
5849 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5850 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
|
5851 for verification purposes. |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5852 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5853 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
|
5854 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
|
5855 `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
|
5856 `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
|
5857 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
5858 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
|
5859 |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5860 (require 'pgg) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5861 |
67262
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
5862 (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
|
5863 (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
|
5864 |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5865 (let* ((scheme (upcase |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5866 (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
|
5867 (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
|
5868 (or for-key |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5869 (split-string (read-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5870 (format "%s message recipients: " |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5871 scheme)) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5872 "[ \t,]+")))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5873 (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
|
5874 (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
|
5875 (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
|
5876 (buffer-name allout-buffer))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5877 (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
|
5878 key-type |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5879 (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
|
5880 target-prompt-id |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5881 (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
|
5882 target-prompt-id)))) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5883 (strip-plaintext-regexps |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5884 (if (not decrypt) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5885 (allout-get-configvar-values |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5886 '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
|
5887 (reject-ciphertext-regexps |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5888 (if (not decrypt) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5889 (allout-get-configvar-values |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5890 '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
|
5891 (rejected (or rejected 0)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5892 (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
|
5893 rejected)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5894 result-text status) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5895 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5896 (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
|
5897 ;; 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
|
5898 (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
|
5899 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5900 (catch 'encryption-failed |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5901 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5902 ;; Obtain the passphrase if we don't already have one and we're not |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5903 ;; doing a keypair encryption: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5904 (if (not (or passphrase |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5905 (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
|
5906 (not decrypt)))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5907 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5908 (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
|
5909 target-cache-id |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5910 target-prompt-id |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5911 key-type |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5912 allout-buffer |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5913 retried fetch-pass))) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5914 |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5915 (with-temp-buffer |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5916 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
5917 (insert text) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5918 |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5919 (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
|
5920 (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
|
5921 (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
|
5922 (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
|
5923 (goto-char (point-min)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5924 (while (re-search-forward re nil t) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5925 (replace-match replacement nil nil))))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5926 |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5927 (cond |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5928 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5929 ;; symmetric: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5930 ((equal key-type 'symmetric) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5931 (setq status |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5932 (if decrypt |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5933 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5934 (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
|
5935 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5936 (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
|
5937 passphrase))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5938 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5939 (if status |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5940 (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
|
5941 ;; failed - handle passphrase caching |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5942 (if verifying |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5943 (throw 'encryption-failed nil) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5944 (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
|
5945 (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
|
5946 (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
|
5947 "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
|
5948 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5949 ;; encrypt 'keypair: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5950 ((not decrypt) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5951 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5952 (setq status |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5953 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5954 (pgg-encrypt for-key |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5955 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
|
5956 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5957 (if status |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5958 (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
|
5959 (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
|
5960 (error "encryption failed")))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5961 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5962 ;; decrypt 'keypair: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5963 (t |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5964 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5965 (setq status |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5966 (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
|
5967 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5968 (if status |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5969 (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
|
5970 (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
|
5971 (error "decryption failed"))))) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5972 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
5973 (setq result-text |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5974 (buffer-substring-no-properties |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
5975 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
|
5976 ) |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5977 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5978 ;; validate result - non-empty |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5979 (cond ((not result-text) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5980 (if verifying |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5981 nil |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5982 ;; 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
|
5983 (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
|
5984 (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
|
5985 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
|
5986 (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
|
5987 rejected verifying nil))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5988 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5989 ;; 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
|
5990 ((and (not decrypt) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5991 ;; 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
|
5992 (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
|
5993 reject-it) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5994 (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
|
5995 (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
|
5996 result-text)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5997 (pop regexps)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5998 reject-it)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
5999 (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
|
6000 (if (<= rejections-left 0) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6001 (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
|
6002 " (%s), per `%s'") |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6003 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
|
6004 '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
|
6005 (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
|
6006 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
|
6007 retried (1+ rejected) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6008 verifying passphrase))) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6009 ;; 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
|
6010 ((and (not decrypt) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6011 (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
|
6012 result-text)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6013 (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
|
6014 "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
|
6015 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6016 ;; 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
|
6017 ((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
|
6018 (if (or verifying decrypt) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6019 (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
|
6020 passphrase t)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6021 result-text) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6022 |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6023 ;; 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
|
6024 ;; 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
|
6025 (t |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6026 (set-buffer allout-buffer) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6027 (if passphrase |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6028 (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
|
6029 passphrase t)) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6030 (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
|
6031 allout-buffer) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6032 result-text) |
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6033 ) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6034 ) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6035 ) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6036 ) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6037 ;;;_ > 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
|
6038 ;;; 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
|
6039 (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
|
6040 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
|
6041 "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
|
6042 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6043 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
|
6044 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
|
6045 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
|
6046 user for corroboration. |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6047 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6048 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
|
6049 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6050 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
|
6051 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6052 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
|
6053 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6054 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
|
6055 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6056 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
|
6057 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6058 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
|
6059 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6060 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
|
6061 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
|
6062 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6063 (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
|
6064 ;; 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
|
6065 (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
|
6066 (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
|
6067 pgg-default-scheme |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6068 "GPG"))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6069 (if prompt-id |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6070 (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
|
6071 "")) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6072 cache-id t) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6073 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6074 ;; Symmetric hereon: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6075 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6076 (save-excursion |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6077 (set-buffer allout-buffer) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6078 (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
|
6079 (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
|
6080 (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
|
6081 'needed) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6082 retried))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6083 (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
|
6084 "")) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6085 (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
|
6086 (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
|
6087 prompt-id retry-message)) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6088 (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
|
6089 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
|
6090 (prompt full-prompt) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6091 (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
|
6092 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6093 (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
|
6094 (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
|
6095 (got-pass (or cached |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6096 (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
|
6097 confirmation) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6098 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6099 (if (not got-pass) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6100 nil |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6101 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6102 ;; 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
|
6103 ;; 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
|
6104 (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
|
6105 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6106 (cond (verifier-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6107 (save-window-excursion |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6108 (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
|
6109 allout-buffer 'symmetric |
72367
12fa9bdadf0a
(allout-prior-bindings, allout-added-bindings): Remove, after long deprecation.
Eli Zaretskii <eliz@gnu.org>
parents:
72050
diff
changeset
|
6110 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
|
6111 (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
|
6112 (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
|
6113 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6114 (if (and (not confirmation) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6115 (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
|
6116 (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
|
6117 " - use new one instead? ")) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6118 ;; deactivate password for subsequent |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6119 ;; confirmation: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6120 (progn |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6121 (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
|
6122 (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
|
6123 nil) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6124 t)) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6125 (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
|
6126 (error "Wrong passphrase.")))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6127 ;; 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
|
6128 ;; (new) passphrase: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6129 ((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
|
6130 (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
|
6131 ;; 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
|
6132 ;; 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
|
6133 (if (not confirmation) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6134 (setq confirmation |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6135 (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
|
6136 " ... confirm spelling: ") |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6137 cache-id t))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6138 (prog1 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6139 (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
|
6140 confirmation |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6141 (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
|
6142 " confirmation differ - retry? ")) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6143 (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
|
6144 (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
|
6145 ;; recurse to this routine: |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6146 (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
|
6147 (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
|
6148 (error "Confirmation failed.")))))))) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6149 ;;;_ > allout-encrypted-topic-p () |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6150 (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
|
6151 "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
|
6152 (save-excursion |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6153 (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
|
6154 (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
|
6155 allout-topic-encryption-bullet) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6156 (looking-at "\\*")) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6157 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6158 ) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6159 ;;;_ > 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
|
6160 ;; XXX gpg-specific, alas |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6161 (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
|
6162 "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
|
6163 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6164 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
|
6165 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6166 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
|
6167 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
|
6168 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
|
6169 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6170 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
|
6171 (require 'pgg-parse) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6172 (save-excursion |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6173 (with-temp-buffer |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6174 (insert text) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6175 (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
|
6176 (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
|
6177 'symmetric |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6178 'keypair)) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6179 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
|
6180 (if (equal type 'keypair) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6181 (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
|
6182 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
|
6183 secret-keys) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6184 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
|
6185 (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
|
6186 first-secret-key)))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6187 (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
|
6188 ) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6189 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6190 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6191 ) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6192 ;;;_ > 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
|
6193 (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
|
6194 "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
|
6195 ;; 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
|
6196 (random t) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6197 (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
|
6198 (dotimes (i (length spew)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6199 (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
|
6200 (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
|
6201 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
|
6202 ) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6203 ;;;_ > 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
|
6204 ;;; outline-buffer) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6205 (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
|
6206 outline-buffer) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6207 "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
|
6208 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6209 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
|
6210 settings. |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6211 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6212 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
|
6213 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6214 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
|
6215 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6216 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
|
6217 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
|
6218 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6219 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
|
6220 `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
|
6221 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
|
6222 `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
|
6223 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6224 ;; 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
|
6225 ;; - adjust the verifier |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6226 ;; - 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
|
6227 ;; - 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
|
6228 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6229 (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
|
6230 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
|
6231 (new-verifier-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6232 (if new-verifier-needed |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6233 ;; 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
|
6234 (subst-char-in-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6235 ?\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
|
6236 passphrase)))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6237 new-hint) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6238 (when new-verifier-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6239 ;; 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
|
6240 (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
|
6241 (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
|
6242 (setq new-hint |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6243 (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
|
6244 allout-passphrase-hint-string)) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6245 (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
|
6246 (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
|
6247 (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
|
6248 allout-passphrase-hint-string))) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6249 (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
|
6250 (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
|
6251 (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
|
6252 allout-passphrase-verifier-string)) |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6253 ) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6254 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6255 ) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6256 ;;;_ > 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
|
6257 (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
|
6258 "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
|
6259 |
69481
be6a0491d438
* allout.el: Increment version to 2.2.1 in file commentary.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69250
diff
changeset
|
6260 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
|
6261 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6262 (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
|
6263 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
|
6264 (if verifier-string |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6265 ;; Return it uncollapsed |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6266 (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
|
6267 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6268 ) |
66319
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6269 ;;;_ > 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
|
6270 (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
|
6271 "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
|
6272 |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6273 \"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
|
6274 (save-excursion |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6275 (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
|
6276 (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
|
6277 allout-passphrase-verifier-string |
4b40c48a16ad
Increment version number to 2.1, and use a literal
Eli Zaretskii <eliz@gnu.org>
parents:
66230
diff
changeset
|
6278 (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
|
6279 '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
|
6280 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
|
6281 t))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6282 ;;;_ > 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
|
6283 (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
|
6284 "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
|
6285 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6286 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
|
6287 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
|
6288 `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
|
6289 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6290 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
|
6291 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
|
6292 must also have content." |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6293 (let (done got content-beg) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6294 (while (not done) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6295 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6296 (if (not (re-search-forward |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6297 (format "\\(\\`\\|\n\\)%s *%s[^*]" |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6298 (regexp-quote allout-header-prefix) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6299 (regexp-quote allout-topic-encryption-bullet)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6300 nil t)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6301 (setq got nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6302 done t) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6303 (goto-char (setq got (match-beginning 0))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6304 (if (looking-at "\n") |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6305 (forward-char 1)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6306 (setq got (point))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6307 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6308 (cond ((not got) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6309 (setq done t)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6310 |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6311 ((not (search-forward "\n")) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6312 (setq got nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6313 done t)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6314 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6315 ((eobp) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6316 (setq got nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6317 done t)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6318 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6319 (t |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6320 (setq content-beg (point)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6321 (backward-char 1) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6322 (allout-end-of-subtree) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6323 (if (or (<= (point) content-beg) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6324 (and except-mark |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6325 (<= content-beg except-mark) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6326 (>= (point) except-mark))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6327 ;; Continue looking |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6328 (setq got nil) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6329 ;; Got it! |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6330 (setq done t))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6331 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6332 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6333 (if got |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6334 (goto-char got)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6335 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6336 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6337 ;;;_ > 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
|
6338 (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
|
6339 "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
|
6340 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6341 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
|
6342 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
|
6343 `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
|
6344 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6345 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
|
6346 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
|
6347 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
|
6348 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
|
6349 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
|
6350 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6351 (interactive "p") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6352 (save-excursion |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6353 (let* ((current-mark (point-marker)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6354 (current-mark-position (marker-position current-mark)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6355 was-modified |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6356 bo-subtree |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6357 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
|
6358 (goto-char (point-min)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6359 (while (allout-next-topic-pending-encryption except-mark) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6360 (setq was-modified (buffer-modified-p)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6361 (when (save-excursion |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6362 (and (boundp 'allout-encrypt-unencrypted-on-saves) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6363 allout-encrypt-unencrypted-on-saves |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6364 (setq bo-subtree (re-search-forward "$")) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6365 (not (allout-hidden-p)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6366 (>= current-mark (point)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6367 (allout-end-of-current-subtree) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6368 (<= current-mark (point)))) |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6369 (setq editing-topic (point) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6370 ;; 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
|
6371 ;; 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
|
6372 editing-point (- current-mark-position |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6373 (count-trailing-whitespace-region |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6374 bo-subtree current-mark-position)))) |
67262
c3cfae9a5571
(eval-when-compile): Remove unnecessary load of 'cl. Add fset of
Eli Zaretskii <eliz@gnu.org>
parents:
66319
diff
changeset
|
6375 (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
|
6376 (if (not was-modified) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6377 (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
|
6378 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6379 (if (not was-modified) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6380 (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
|
6381 (if editing-topic (list editing-topic editing-point)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6382 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6383 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6384 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6385 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6386 ;;;_ #9 miscellaneous |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6387 ;;;_ : Mode: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6388 ;;;_ > outlineify-sticky () |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6389 ;; 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
|
6390 ;;;###autoload |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6391 (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
|
6392 ;;;###autoload |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6393 (defun outlineify-sticky (&optional arg) |
13964
4de229297f1f
(outline-primary-bullet, outline-numbered-bullet,
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
6394 "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
|
6395 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
6396 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
|
6397 setup for auto-startup." |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6398 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6399 (interactive "P") |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6400 |
48856
e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47127
diff
changeset
|
6401 (allout-mode t) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6402 |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6403 (save-excursion |
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6404 (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
|
6405 (if (allout-goto-prefix) |
7416
4996c50431de
(outline-init) New user interface for control of
Richard M. Stallman <rms@gnu.org>
parents:
7218
diff
changeset
|
6406 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
|
6407 (allout-open-topic 2) |
41571
2902b21d2034
(outline-version, outline-open-topic)
Pavel Janík <Pavel@Janik.cz>
parents:
38431
diff
changeset
|
6408 (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
|
6409 "`allout-mode' docstring: `^Hm'.")) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6410 (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
|
6411 "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
|
6412 ;;;_ > 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
|
6413 (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
|
6414 "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
|
6415 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6416 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
|
6417 ;; 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
|
6418 (let (beg prefix suffix) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6419 (save-excursion |
3430 | 6420 (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
|
6421 (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
|
6422 (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
|
6423 (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
|
6424 nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6425 (setq beg (- (point) 16)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6426 (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
|
6427 (point) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6428 (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
|
6429 (forward-char -1)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6430 (point)))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6431 (setq prefix (buffer-substring-no-properties |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6432 (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
|
6433 (forward-char 1)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6434 (point)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6435 beg)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6436 (list beg prefix suffix)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6437 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6438 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6439 ) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6440 ;;;_ > 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
|
6441 (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
|
6442 "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
|
6443 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6444 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
|
6445 `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
|
6446 |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6447 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
|
6448 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
|
6449 variables, itself, is created if not already present. When created, the |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6450 section lines \(including the section line) exist as second-level topics in |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6451 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
|
6452 |
73763
89b9e8184350
(allout-adjust-file-variable, allout-passphrase-verifier-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
73660
diff
changeset
|
6453 `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
|
6454 (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
|
6455 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
|
6456 nil |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6457 (save-excursion |
72050
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
6458 (let ((inhibit-field-text-motion t) |
d79208e62ea9
(allout-unprotected, allout-e-o-prefix-p)
Eli Zaretskii <eliz@gnu.org>
parents:
71915
diff
changeset
|
6459 (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
|
6460 beg prefix suffix) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6461 (if section-data |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6462 (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
|
6463 prefix (cadr section-data) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6464 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
|
6465 ;; create the section |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6466 (goto-char (point-max)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6467 (open-line 1) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6468 (allout-open-topic 0) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6469 (end-of-line) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6470 (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
|
6471 (allout-open-topic 1) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6472 (setq beg (point) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6473 suffix "" |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6474 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
|
6475 (beginning-of-line) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6476 (point)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6477 beg)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6478 (goto-char beg) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6479 (insert "Local variables:\n") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6480 (allout-open-topic 0) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6481 (insert "End:\n") |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6482 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6483 ;; 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
|
6484 ;; of new value: |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6485 (goto-char beg) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6486 (allout-show-to-offshoot) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6487 (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
|
6488 (let* ((value-beg (point)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6489 (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
|
6490 (forward-char -1)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6491 (point))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6492 (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
|
6493 (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
|
6494 (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
|
6495 (end-of-line) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6496 (open-line 1) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6497 (forward-line 1) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6498 (insert (concat prefix varname ":"))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6499 (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
|
6500 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6501 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6502 ) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6503 ) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6504 ;;;_ > allout-get-configvar-values (varname) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6505 (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
|
6506 "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
|
6507 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6508 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
|
6509 otherwise are ignored. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6510 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6511 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
|
6512 not its value." |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6513 |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6514 (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
|
6515 got) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6516 (dolist (sym configvar-value) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6517 (if (not (boundp sym)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6518 (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
|
6519 configvar-name sym)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6520 (delq sym (symbol-value configvar-name))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6521 (push (symbol-value sym) got))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6522 (reverse got))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6523 ;;;_ : Topics: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6524 ;;;_ > allout-mark-topic () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6525 (defun allout-mark-topic () |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6526 "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
|
6527 (interactive) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6528 (let ((inhibit-field-text-motion t)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6529 (beginning-of-line)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6530 (allout-goto-prefix-doublechecked) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6531 (push-mark (point)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6532 (allout-end-of-current-subtree) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6533 (exchange-point-and-mark)) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6534 ;;;_ : UI: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6535 ;;;_ > solicit-char-in-string (prompt string &optional do-defaulting) |
3430 | 6536 (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
|
6537 "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
|
6538 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6539 Optional arg DO-DEFAULTING indicates to accept empty input (CR)." |
3430 | 6540 |
6541 (let ((new-prompt prompt) | |
6542 got) | |
6543 | |
6544 (while (not got) | |
6545 (message "%s" new-prompt) | |
6546 | |
6547 ;; We do our own reading here, so we can circumvent, eg, special | |
29490 | 6548 ;; treatment for `?' character. (Oughta use minibuffer keymap instead.) |
3430 | 6549 (setq got |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6550 (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
|
6551 |
29490 | 6552 (setq got |
6553 (cond ((string-match (regexp-quote got) string) got) | |
6554 ((and do-defaulting (string= got "\r")) | |
6555 ;; Return empty string to default: | |
6556 "") | |
6557 ((string= got "\C-g") (signal 'quit nil)) | |
6558 (t | |
6559 (setq new-prompt (concat prompt | |
6560 got | |
6561 " ...pick from: " | |
6562 string | |
6563 "")) | |
6564 nil)))) | |
6565 ;; got something out of loop - return it: | |
6566 got) | |
3430 | 6567 ) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6568 ;;;_ : Strings: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6569 ;;;_ > regexp-sans-escapes (string) |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6570 (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
|
6571 "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
|
6572 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6573 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
|
6574 single backslash. |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6575 |
66230
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6576 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
|
6577 |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6578 (if (string= regexp "") |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6579 "" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6580 ;; 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
|
6581 ;; backslash, or else to nil: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6582 (setq successive-backslashes |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6583 (if (= (aref regexp 0) ?\\) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6584 (if successive-backslashes (1+ successive-backslashes) 1) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6585 nil)) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6586 (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
|
6587 ;; Include first char: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6588 (concat (substring regexp 0 1) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6589 (regexp-sans-escapes (substring regexp 1))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6590 ;; Exclude first char, but maintain count: |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6591 (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
|
6592 ;;;_ > count-trailing-whitespace-region (beg end) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6593 (defun count-trailing-whitespace-region (beg end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6594 "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
|
6595 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6596 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
|
6597 (if (> beg end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6598 0 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6599 (save-excursion |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6600 (goto-char beg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6601 (let ((count 0)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6602 (while (re-search-forward "[ ][ ]*$" end t) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6603 (goto-char (1+ (match-beginning 2))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6604 (setq count (1+ count))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6605 count)))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6606 ;;;_ > allout-format-quote (string) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6607 (defun allout-format-quote (string) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6608 "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
|
6609 (apply 'concat |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6610 (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
|
6611 string))) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6612 ;;;_ : lists |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6613 ;;;_ > allout-flatten (list) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6614 (defun allout-flatten (list) |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6615 "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
|
6616 ;; classic. |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6617 (cond ((null list) nil) |
72917
17942cb3949e
(allout-regexp, allout-line-boundary-regexp)
Eli Zaretskii <eliz@gnu.org>
parents:
72873
diff
changeset
|
6618 ((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
|
6619 (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
|
6620 ;;;_ : Compatability: |
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6621 ;;;_ > 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
|
6622 (defun allout-mark-marker (&optional force buffer) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6623 "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
|
6624 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6625 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
|
6626 so pass them along when appropriate." |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6627 (if (featurep 'xemacs) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6628 (apply 'mark-marker force buffer) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6629 (mark-marker))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6630 ;;;_ > 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
|
6631 (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
|
6632 (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
|
6633 "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
|
6634 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
|
6635 (let ((i (length string)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6636 (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
|
6637 (while (> i 0) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6638 (setq i (1- i)) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6639 (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
|
6640 (aset newstr i tochar))) |
4344fd52a670
Add autoloads of crypt++ and mailcrypt routines, all for encryption
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
6641 newstr))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6642 ;;;_ > wholenump if necessary |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6643 (if (not (fboundp 'wholenump)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6644 (defalias 'wholenump 'natnump)) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6645 ;;;_ > remove-overlays if necessary |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6646 (if (not (fboundp 'remove-overlays)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6647 (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
|
6648 "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
|
6649 Overlays might be moved and/or split. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6650 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
|
6651 (unless beg (setq beg (point-min))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6652 (unless end (setq end (point-max))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6653 (if (< end beg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6654 (setq beg (prog1 end (setq end beg)))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6655 (save-excursion |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6656 (dolist (o (overlays-in beg end)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6657 (when (eq (overlay-get o name) val) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6658 ;; Either push this overlay outside beg...end |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6659 ;; or split it to exclude beg...end |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6660 ;; 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
|
6661 (if (< (overlay-start o) beg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6662 (if (> (overlay-end o) end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6663 (progn |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6664 (move-overlay (copy-overlay o) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6665 (overlay-start o) beg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6666 (move-overlay o end (overlay-end o))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6667 (move-overlay o (overlay-start o) beg)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6668 (if (> (overlay-end o) end) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6669 (move-overlay o end (overlay-end o)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6670 (delete-overlay o))))))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6671 ) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6672 ;;;_ > 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
|
6673 (if (not (fboundp 'copy-overlay)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6674 (defun copy-overlay (o) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6675 "Return a copy of overlay O." |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6676 (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
|
6677 ;; 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
|
6678 ;; insertion-type of the two markers. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6679 (overlay-buffer o))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6680 (props (overlay-properties o))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6681 (while props |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6682 (overlay-put o1 (pop props) (pop props))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6683 o1))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6684 ;;;_ > 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
|
6685 (if (not (fboundp 'add-to-invisibility-spec)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6686 (defun add-to-invisibility-spec (element) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6687 "Add ELEMENT to `buffer-invisibility-spec'. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6688 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
|
6689 that can be added." |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6690 (if (eq buffer-invisibility-spec t) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6691 (setq buffer-invisibility-spec (list t))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6692 (setq buffer-invisibility-spec |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6693 (cons element buffer-invisibility-spec)))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6694 ;;;_ > 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
|
6695 (if (not (fboundp 'remove-from-invisibility-spec)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6696 (defun remove-from-invisibility-spec (element) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6697 "Remove ELEMENT from `buffer-invisibility-spec'." |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6698 (if (consp buffer-invisibility-spec) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6699 (setq buffer-invisibility-spec (delete element |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6700 buffer-invisibility-spec))))) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6701 ;;;_ > 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
|
6702 (if (not (fboundp 'move-beginning-of-line)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6703 (defun move-beginning-of-line (arg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6704 "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
|
6705 \(This disregards invisible newlines such as those |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6706 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
|
6707 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6708 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
|
6709 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
|
6710 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
|
6711 (interactive "p") |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6712 (or arg (setq arg 1)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6713 (if (/= arg 1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6714 (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
|
6715 |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6716 ;; 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
|
6717 (skip-chars-backward "^\n") |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6718 (while (and (not (bobp)) (line-move-invisible-p (1- (point)))) |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6719 (goto-char (if (featurep 'xemacs) |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6720 (previous-property-change (point)) |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6721 (previous-char-property-change (point)))) |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6722 (skip-chars-backward "^\n")) |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6723 (vertical-motion 0)) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6724 ) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6725 ;;;_ > 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
|
6726 (if (not (fboundp 'move-end-of-line)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6727 (defun move-end-of-line (arg) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6728 "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
|
6729 \(This disregards invisible newlines such as those |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6730 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
|
6731 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6732 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
|
6733 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
|
6734 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
|
6735 (interactive "p") |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6736 (or arg (setq arg 1)) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6737 (let (done) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6738 (while (not done) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6739 (let ((newpos |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6740 (save-excursion |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6741 (let ((goal-column 0)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6742 (and (condition-case nil |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6743 (or (line-move arg) t) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6744 (error nil)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6745 (not (bobp)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6746 (progn |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6747 (while (and (not (bobp)) |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6748 (line-move-invisible-p (1- (point)))) |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6749 (goto-char |
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6750 (previous-char-property-change (point)))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6751 (backward-char 1))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6752 (point))))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6753 (goto-char newpos) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6754 (if (and (> (point) newpos) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6755 (eq (preceding-char) ?\n)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6756 (backward-char 1) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6757 (if (and (> (point) newpos) (not (eobp)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6758 (not (eq (following-char) ?\n))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6759 ;; If we skipped something intangible |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6760 ;; 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
|
6761 ;; keep going. |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6762 (setq arg 1) |
70244
ccd02e1ca0e3
Remove local autoload declaration for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70225
diff
changeset
|
6763 (setq done t))))))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6764 ) |
72873
b42e98d06749
* allout.el (allout-regexp, allout-line-boundary-regexp)
Chong Yidong <cyd@stupidchicken.com>
parents:
72367
diff
changeset
|
6765 ;;;_ > line-move-invisible-p if necessary |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6766 (if (not (fboundp 'line-move-invisible-p)) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6767 (defun line-move-invisible-p (pos) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6768 "Return non-nil if the character after POS is currently invisible." |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6769 (let ((prop |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6770 (get-char-property pos 'invisible))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6771 (if (eq buffer-invisibility-spec t) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6772 prop |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6773 (or (memq prop buffer-invisibility-spec) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6774 (assq prop buffer-invisibility-spec)))))) |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6775 |
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6776 ;;;_ #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
|
6777 ;;;_ > 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
|
6778 (defun allout-bullet-isearch (&optional bullet) |
29490 | 6779 "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
|
6780 (interactive) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6781 (if (not bullet) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6782 (setq bullet (solicit-char-in-string |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6783 "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
|
6784 (regexp-sans-escapes allout-bullets-string)))) |
15664
a50ebf4ac764
(outline-auto-activation, outline-layout)
Karl Heuer <kwzh@gnu.org>
parents:
15663
diff
changeset
|
6785 |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6786 (let ((isearch-regexp t) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6787 (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
|
6788 allout-header-prefix |
7218
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6789 "[ \t]*" |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6790 bullet))) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6791 (isearch-repeat 'forward) |
49f9f9a08b4c
major code speedups, bug fixes, behavior
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
6792 (isearch-mode t))) |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6793 |
71893
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6794 ;;;_ #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
|
6795 ;;;_ > 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
|
6796 (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
|
6797 "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
|
6798 (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
|
6799 (allout-test-resumptions) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6800 (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
|
6801 (sit-for .5)) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6802 ;;;_ : test resumptions: |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6803 ;;;_ > 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
|
6804 (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
|
6805 "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
|
6806 (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
|
6807 (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
|
6808 ;;;_ > allout-test-resumptions () |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6809 (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
|
6810 "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
|
6811 (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
|
6812 "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
|
6813 (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
|
6814 "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
|
6815 (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
|
6816 "Exercise allout resumptions." |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6817 ;; 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
|
6818 ;; 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
|
6819 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6820 ;; 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
|
6821 (with-temp-buffer |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6822 (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
|
6823 (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
|
6824 (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
|
6825 (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
|
6826 (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
|
6827 (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
|
6828 (allout-do-resumptions) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6829 (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
|
6830 (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
|
6831 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6832 ;; 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
|
6833 (with-temp-buffer |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6834 (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
|
6835 (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
|
6836 (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
|
6837 (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
|
6838 (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
|
6839 (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
|
6840 (allout-do-resumptions) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6841 (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
|
6842 (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
|
6843 (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
|
6844 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6845 ;; 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
|
6846 (with-temp-buffer |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6847 (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
|
6848 (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
|
6849 (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
|
6850 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
|
6851 " 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
|
6852 (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
|
6853 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
|
6854 " 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
|
6855 (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
|
6856 (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
|
6857 (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
|
6858 (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
|
6859 (allout-do-resumptions) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6860 (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
|
6861 (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
|
6862 (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
|
6863 (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
|
6864 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6865 ;; 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
|
6866 (with-temp-buffer |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6867 (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
|
6868 (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
|
6869 (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
|
6870 (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
|
6871 (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
|
6872 (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
|
6873 '(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
|
6874 '(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
|
6875 (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
|
6876 '(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
|
6877 '(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
|
6878 ;; 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
|
6879 (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
|
6880 (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
|
6881 (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
|
6882 (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
|
6883 (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
|
6884 (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
|
6885 (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
|
6886 (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
|
6887 (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
|
6888 (allout-do-resumptions) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6889 (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
|
6890 (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
|
6891 (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
|
6892 (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
|
6893 (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
|
6894 (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
|
6895 (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
|
6896 (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
|
6897 (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
|
6898 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6899 ;; 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
|
6900 (with-temp-buffer |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6901 (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
|
6902 (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
|
6903 (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
|
6904 (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
|
6905 (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
|
6906 (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
|
6907 '(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
|
6908 '(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
|
6909 (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
|
6910 (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
|
6911 (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
|
6912 (allout-do-resumptions)) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6913 ) |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6914 ;;;_ % 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
|
6915 (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
|
6916 (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
|
6917 |
bb3316be643e
Require 'cl during byte-compilation/interactive load, for the `assert' macro.
Eli Zaretskii <eliz@gnu.org>
parents:
71625
diff
changeset
|
6918 ;;;_ #12 Provide |
68953
0ddd5b380ffb
Use allout invisible-text overlays instead of
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
6919 (provide 'allout) |
3430 | 6920 |
6921 ;;;_* Local emacs vars. | |
69124
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6922 ;; The following `allout-layout' local variable setting: |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6923 ;; - 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
|
6924 ;; - shows the children of the third to last (config vars) |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6925 ;; - and the second to last (code section), |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6926 ;; - and closes the last topic (this local-variables section). |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6927 ;;Local variables: |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6928 ;;allout-layout: (0 : -1 -1 0) |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6929 ;;End: |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6930 |
f6b5ed4f7f58
Add 2006 copyright.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68956
diff
changeset
|
6931 ;; arch-tag: cf38fbc3-c044-450f-8bff-afed8ba5681c |
38431
853c3674f20a
Fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38250
diff
changeset
|
6932 ;;; allout.el ends here |