Mercurial > emacs
annotate lisp/outline.el @ 110410:f2e111723c3a
Merge changes made in Gnus trunk.
Reimplement nnimap, and do tweaks to the rest of the code to support that.
* gnus-int.el (gnus-finish-retrieve-group-infos)
(gnus-retrieve-group-data-early): New functions.
* gnus-range.el (gnus-range-nconcat): New function.
* gnus-start.el (gnus-get-unread-articles): Support early retrieval of
data.
(gnus-read-active-for-groups): Support finishing the early retrieval of
data.
* gnus-sum.el (gnus-summary-move-article): Pass the move-to group name
if the move is internal, so that nnimap can do fast internal moves.
* gnus.el (gnus-article-special-mark-lists): Add uid/active tuples, for
nnimap usage.
* nnimap.el: Rewritten.
* nnmail.el (nnmail-inhibit-default-split-group): New internal variable
to allow the mail splitting to not return a default group. This is
useful for nnimap, which will leave unmatched mail in the inbox.
* utf7.el (utf7-encode): Autoload.
Implement shell connection.
* nnimap.el (nnimap-open-shell-stream): New function.
(nnimap-open-connection): Use it.
Get the number of lines by using BODYSTRUCTURE.
(nnimap-transform-headers): Get the number of lines in each message.
(nnimap-retrieve-headers): Query for BODYSTRUCTURE so that we get the
number of lines.
Not all servers return UIDNEXT. Work past this problem.
Remove junk from end of file.
Fix typo in "bogus" section.
Make capabilties be case-insensitive.
Require cl when compiling.
Don't bug out if the LIST command doesn't have any parameters.
2010-09-17 Knut Anders Hatlen <kahatlen@gmail.com> (tiny change)
* nnimap.el (nnimap-get-groups): Don't bug out if the LIST command
doesn't have any parameters.
(mm-text-html-renderer): Document gnus-article-html.
2010-09-17 Julien Danjou <julien@danjou.info> (tiny fix)
* mm-decode.el (mm-text-html-renderer): Document gnus-article-html.
* dgnushack.el: Define netrc-credentials.
If the user doesn't have a /etc/services, supply some sensible port defaults.
Have `unseen-or-unread' select an unread unseen article first.
(nntp-open-server): Return whether the open was successful or not.
Throughout all files, replace (save-excursion (set-buffer ...)) with (with-current-buffer ... ).
Save result so that it doesn't say "failed" all the time.
Add ~/.authinfo to the default, since that's probably most useful for users.
Don't use the "finish" method when we're reading from the agent.
Add some more nnimap-relevant agent stuff to nnagent.el.
* nnimap.el (nnimap-with-process-buffer): Removed.
Revert one line that was changed by mistake in the last checkin.
(nnimap-open-connection): Don't error out when we can't make a connection
nnimap-related changes to avoid bugging out if we can't contact a server.
* gnus-start.el (gnus-get-unread-articles): Don't try to scan groups
from methods that are denied.
* nnimap.el (nnimap-possibly-change-group): Return nil if we can't log
in.
(nnimap-finish-retrieve-group-infos): Make sure we're not waiting for
nothing.
* gnus-sum.el (gnus-select-newsgroup): Indent.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sat, 18 Sep 2010 10:02:19 +0000 |
parents | 93cf07b171cc |
children | 515d80e174ba |
rev | line source |
---|---|
51347 | 1 ;;; outline.el --- outline mode commands for Emacs |
2 | |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002, |
106815 | 4 ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
51347 | 5 |
6 ;; Maintainer: FSF | |
7 ;; Keywords: outlines | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94164
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
51347 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94164
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94164
diff
changeset
|
14 ;; (at your option) any later version. |
51347 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94164
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
51347 | 23 |
24 ;;; Commentary: | |
25 | |
26 ;; This package is a major mode for editing outline-format documents. | |
27 ;; An outline can be `abstracted' to show headers at any given level, | |
28 ;; with all stuff below hidden. See the Emacs manual for details. | |
29 | |
30 ;;; Todo: | |
31 | |
32 ;; - subtree-terminators | |
33 ;; - better handle comments before function bodies (i.e. heading) | |
34 ;; - don't bother hiding whitespace | |
35 | |
36 ;;; Code: | |
37 | |
65294
ecfa88bd9638
(font-lock-warning-face): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65214
diff
changeset
|
38 (defvar font-lock-warning-face) |
ecfa88bd9638
(font-lock-warning-face): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65214
diff
changeset
|
39 |
ecfa88bd9638
(font-lock-warning-face): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65214
diff
changeset
|
40 |
51347 | 41 (defgroup outlines nil |
64040
44cf3ecee23f
(outlines): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
62803
diff
changeset
|
42 "Support for hierarchical outlining." |
51347 | 43 :prefix "outline-" |
107378
904ccd8f2acb
Reorganize Custom groups.
Chong Yidong <cyd@stupidchicken.com>
parents:
107146
diff
changeset
|
44 :group 'wp) |
51347 | 45 |
46 (defcustom outline-regexp "[*\^L]+" | |
69297
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
47 "Regular expression to match the beginning of a heading. |
51347 | 48 Any line whose beginning matches this regexp is considered to start a heading. |
49 Note that Outline mode only checks this regexp at the start of a line, | |
50 so the regexp need not (and usually does not) start with `^'. | |
51 The recommended way to set this is with a Local Variables: list | |
52 in the file it applies to. See also `outline-heading-end-regexp'." | |
53 :type '(choice regexp (const nil)) | |
54 :group 'outlines) | |
70590
63b772bfba93
Move `safe-local-variable' declarations to the respective files.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69297
diff
changeset
|
55 ;;;###autoload(put 'outline-regexp 'safe-local-variable 'string-or-null-p) |
51347 | 56 |
57 (defcustom outline-heading-end-regexp "\n" | |
69297
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
58 "Regular expression to match the end of a heading line. |
51347 | 59 You can assume that point is at the beginning of a heading when this |
60 regexp is searched for. The heading ends at the end of the match. | |
61 The recommended way to set this is with a `Local Variables:' list | |
62 in the file it applies to." | |
63 :type 'regexp | |
64 :group 'outlines) | |
65 | |
66 (defvar outline-mode-prefix-map | |
67 (let ((map (make-sparse-keymap))) | |
68 (define-key map "@" 'outline-mark-subtree) | |
69 (define-key map "\C-n" 'outline-next-visible-heading) | |
70 (define-key map "\C-p" 'outline-previous-visible-heading) | |
71 (define-key map "\C-i" 'show-children) | |
72 (define-key map "\C-s" 'show-subtree) | |
73 (define-key map "\C-d" 'hide-subtree) | |
74 (define-key map "\C-u" 'outline-up-heading) | |
75 (define-key map "\C-f" 'outline-forward-same-level) | |
76 (define-key map "\C-b" 'outline-backward-same-level) | |
77 (define-key map "\C-t" 'hide-body) | |
78 (define-key map "\C-a" 'show-all) | |
79 (define-key map "\C-c" 'hide-entry) | |
80 (define-key map "\C-e" 'show-entry) | |
81 (define-key map "\C-l" 'hide-leaves) | |
82 (define-key map "\C-k" 'show-branches) | |
83 (define-key map "\C-q" 'hide-sublevels) | |
84 (define-key map "\C-o" 'hide-other) | |
85 (define-key map "\C-^" 'outline-move-subtree-up) | |
86 (define-key map "\C-v" 'outline-move-subtree-down) | |
87 (define-key map [(control ?<)] 'outline-promote) | |
88 (define-key map [(control ?>)] 'outline-demote) | |
89 (define-key map "\C-m" 'outline-insert-heading) | |
90 ;; Where to bind outline-cycle ? | |
91 map)) | |
92 | |
93 (defvar outline-mode-menu-bar-map | |
94 (let ((map (make-sparse-keymap))) | |
95 | |
96 (define-key map [hide] (cons "Hide" (make-sparse-keymap "Hide"))) | |
97 | |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
98 (define-key map [hide hide-other] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
99 '(menu-item "Hide Other" hide-other |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
100 :help "Hide everything except current body and parent and top-level headings")) |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
101 (define-key map [hide hide-sublevels] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
102 '(menu-item "Hide Sublevels" hide-sublevels |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
103 :help "Hide everything but the top LEVELS levels of headers, in whole buffer")) |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
104 (define-key map [hide hide-subtree] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
105 '(menu-item "Hide Subtree" hide-subtree |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
106 :help "Hide everything after this heading at deeper levels")) |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
107 (define-key map [hide hide-entry] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
108 '(menu-item "Hide Entry" hide-entry |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
109 :help "Hide the body directly following this heading")) |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
110 (define-key map [hide hide-body] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
111 '(menu-item "Hide Body" hide-body |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
112 :help "Hide all body lines in buffer, leaving all headings visible")) |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
113 (define-key map [hide hide-leaves] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
114 '(menu-item "Hide Leaves" hide-leaves |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
115 :help "Hide the body after this heading and at deeper levels")) |
51347 | 116 |
117 (define-key map [show] (cons "Show" (make-sparse-keymap "Show"))) | |
118 | |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
119 (define-key map [show show-subtree] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
120 '(menu-item "Show Subtree" show-subtree |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
121 :help "Show everything after this heading at deeper levels")) |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
122 (define-key map [show show-children] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
123 '(menu-item "Show Children" show-children |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
124 :help "Show all direct subheadings of this heading")) |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
125 (define-key map [show show-branches] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
126 '(menu-item "Show Branches" show-branches |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
127 :help "Show all subheadings of this heading, but not their bodies")) |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
128 (define-key map [show show-entry] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
129 '(menu-item "Show Entry" show-entry |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
130 :help "Show the body directly following this heading")) |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
131 (define-key map [show show-all] |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
132 '(menu-item "Show All" show-all |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
133 :help "Show all of the text in the buffer")) |
51347 | 134 |
135 (define-key map [headings] | |
136 (cons "Headings" (make-sparse-keymap "Headings"))) | |
137 | |
138 (define-key map [headings demote-subtree] | |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
139 '(menu-item "Demote subtree" outline-demote |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
140 :help "Demote headings lower down the tree")) |
51347 | 141 (define-key map [headings promote-subtree] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
142 '(menu-item "Promote subtree" outline-promote |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
143 :help "Promote headings higher up the tree")) |
51347 | 144 (define-key map [headings move-subtree-down] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
145 '(menu-item "Move subtree down" outline-move-subtree-down |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
146 :help "Move the currrent subtree down past arg headlines of the same level")) |
51347 | 147 (define-key map [headings move-subtree-up] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
148 '(menu-item "Move subtree up" outline-move-subtree-up |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
149 :help "Move the currrent subtree up past arg headlines of the same level")) |
51347 | 150 (define-key map [headings copy] |
151 '(menu-item "Copy to kill ring" outline-headers-as-kill | |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
152 :enable mark-active |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
153 :help "Save the visible outline headers in region at the start of the kill ring")) |
51347 | 154 (define-key map [headings outline-insert-heading] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
155 |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
156 '(menu-item "New heading" outline-insert-heading |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
157 :help "Insert a new heading at same depth at point")) |
51347 | 158 (define-key map [headings outline-backward-same-level] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
159 |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
160 '(menu-item "Previous Same Level" outline-backward-same-level |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
161 :help "Move backward to the arg'th subheading at same level as this one.")) |
51347 | 162 (define-key map [headings outline-forward-same-level] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
163 |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
164 '(menu-item "Next Same Level" outline-forward-same-level |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
165 :help "Move forward to the arg'th subheading at same level as this one")) |
51347 | 166 (define-key map [headings outline-previous-visible-heading] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
167 |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
168 '(menu-item "Previous" outline-previous-visible-heading |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
169 :help "Move to the previous heading line")) |
51347 | 170 (define-key map [headings outline-next-visible-heading] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
171 |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
172 '(menu-item "Next" outline-next-visible-heading |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
173 :help "Move to the next visible heading line")) |
51347 | 174 (define-key map [headings outline-up-heading] |
93674
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
175 |
44fab469d68d
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87881
diff
changeset
|
176 '(menu-item "Up" outline-up-heading |
93893
ff99dcb2b31b
* outline.el (outline-mode-menu-bar-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93674
diff
changeset
|
177 :help "Move to the visible heading line of which the present line is a subheading")) |
51347 | 178 map)) |
179 | |
180 (defvar outline-minor-mode-menu-bar-map | |
181 (let ((map (make-sparse-keymap))) | |
182 (define-key map [outline] | |
183 (cons "Outline" | |
184 (nconc (make-sparse-keymap "Outline") | |
185 ;; Remove extra separator | |
186 (cdr | |
187 ;; Flatten the major mode's menus into a single menu. | |
188 (apply 'append | |
189 (mapcar (lambda (x) | |
190 (if (consp x) | |
191 ;; Add a separator between each | |
192 ;; part of the unified menu. | |
193 (cons '(--- "---") (cdr x)))) | |
194 outline-mode-menu-bar-map)))))) | |
195 map)) | |
52067
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
196 |
51347 | 197 |
198 (defvar outline-mode-map | |
199 (let ((map (make-sparse-keymap))) | |
200 (define-key map "\C-c" outline-mode-prefix-map) | |
201 (define-key map [menu-bar] outline-mode-menu-bar-map) | |
202 map)) | |
203 | |
204 (defvar outline-font-lock-keywords | |
205 '(;; | |
206 ;; Highlight headings according to the level. | |
207 (eval . (list (concat "^\\(?:" outline-regexp "\\).+") | |
208 0 '(outline-font-lock-face) nil t))) | |
209 "Additional expressions to highlight in Outline mode.") | |
210 | |
62803
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
211 (defface outline-1 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
212 '((t :inherit font-lock-function-name-face)) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
213 "Level 1." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
214 :group 'outlines) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
215 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
216 (defface outline-2 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
217 '((t :inherit font-lock-variable-name-face)) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
218 "Level 2." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
219 :group 'outlines) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
220 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
221 (defface outline-3 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
222 '((t :inherit font-lock-keyword-face)) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
223 "Level 3." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
224 :group 'outlines) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
225 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
226 (defface outline-4 |
84457
33b5c158a227
(outline-4, outline-5, outline-7):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83792
diff
changeset
|
227 '((t :inherit font-lock-comment-face)) |
62803
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
228 "Level 4." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
229 :group 'outlines) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
230 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
231 (defface outline-5 |
84457
33b5c158a227
(outline-4, outline-5, outline-7):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83792
diff
changeset
|
232 '((t :inherit font-lock-type-face)) |
62803
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
233 "Level 5." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
234 :group 'outlines) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
235 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
236 (defface outline-6 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
237 '((t :inherit font-lock-constant-face)) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
238 "Level 6." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
239 :group 'outlines) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
240 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
241 (defface outline-7 |
84457
33b5c158a227
(outline-4, outline-5, outline-7):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83792
diff
changeset
|
242 '((t :inherit font-lock-builtin-face)) |
62803
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
243 "Level 7." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
244 :group 'outlines) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
245 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
246 (defface outline-8 |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
247 '((t :inherit font-lock-string-face)) |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
248 "Level 8." |
5a1fd32a61a2
(outline-1, outline-2, outline-3, outline-4)
Lute Kamstra <lute@gnu.org>
parents:
57974
diff
changeset
|
249 :group 'outlines) |
51347 | 250 |
251 (defvar outline-font-lock-faces | |
252 [outline-1 outline-2 outline-3 outline-4 | |
253 outline-5 outline-6 outline-7 outline-8]) | |
254 | |
83792
97a6d10c46db
(outline-font-lock-levels): Comment out unused var.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
78236
diff
changeset
|
255 ;; (defvar outline-font-lock-levels nil) |
97a6d10c46db
(outline-font-lock-levels): Comment out unused var.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
78236
diff
changeset
|
256 ;; (make-variable-buffer-local 'outline-font-lock-levels) |
51347 | 257 |
258 (defun outline-font-lock-face () | |
259 ;; (save-excursion | |
260 ;; (outline-back-to-heading t) | |
261 ;; (let* ((count 0) | |
262 ;; (start-level (funcall outline-level)) | |
263 ;; (level start-level) | |
264 ;; face-level) | |
265 ;; (while (not (setq face-level | |
266 ;; (if (or (bobp) (eq level 1)) 0 | |
267 ;; (cdr (assq level outline-font-lock-levels))))) | |
268 ;; (outline-up-heading 1 t) | |
269 ;; (setq count (1+ count)) | |
270 ;; (setq level (funcall outline-level))) | |
271 ;; ;; Remember for later. | |
272 ;; (unless (zerop count) | |
273 ;; (setq face-level (+ face-level count)) | |
274 ;; (push (cons start-level face-level) outline-font-lock-levels)) | |
275 ;; (condition-case nil | |
276 ;; (aref outline-font-lock-faces face-level) | |
277 ;; (error font-lock-warning-face)))) | |
278 (save-excursion | |
279 (goto-char (match-beginning 0)) | |
280 (looking-at outline-regexp) | |
83792
97a6d10c46db
(outline-font-lock-levels): Comment out unused var.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
78236
diff
changeset
|
281 (aref outline-font-lock-faces (% (1- (funcall outline-level)) (length outline-font-lock-faces))))) |
51347 | 282 |
283 (defvar outline-view-change-hook nil | |
284 "Normal hook to be run after outline visibility changes.") | |
285 | |
52067
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
286 (defvar outline-mode-hook nil |
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
287 "*This hook is run when outline mode starts.") |
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
288 |
55273
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
289 (defvar outline-blank-line nil |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
290 "*Non-nil means to leave unhidden blank line before heading.") |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
291 |
51347 | 292 ;;;###autoload |
293 (define-derived-mode outline-mode text-mode "Outline" | |
294 "Set major mode for editing outlines with selective display. | |
295 Headings are lines which start with asterisks: one for major headings, | |
296 two for subheadings, etc. Lines not starting with asterisks are body lines. | |
297 | |
298 Body text or subheadings under a heading can be made temporarily | |
299 invisible, or visible again. Invisible lines are attached to the end | |
300 of the heading, so they move with it, if the line is killed and yanked | |
301 back. A heading with text hidden under it is marked with an ellipsis (...). | |
302 | |
303 Commands:\\<outline-mode-map> | |
304 \\[outline-next-visible-heading] outline-next-visible-heading move by visible headings | |
305 \\[outline-previous-visible-heading] outline-previous-visible-heading | |
306 \\[outline-forward-same-level] outline-forward-same-level similar but skip subheadings | |
307 \\[outline-backward-same-level] outline-backward-same-level | |
308 \\[outline-up-heading] outline-up-heading move from subheading to heading | |
309 | |
310 \\[hide-body] make all text invisible (not headings). | |
311 \\[show-all] make everything in buffer visible. | |
312 \\[hide-sublevels] make only the first N levels of headers visible. | |
313 | |
314 The remaining commands are used when point is on a heading line. | |
315 They apply to some of the body or subheadings of that heading. | |
316 \\[hide-subtree] hide-subtree make body and subheadings invisible. | |
317 \\[show-subtree] show-subtree make body and subheadings visible. | |
318 \\[show-children] show-children make direct subheadings visible. | |
319 No effect on body, or subheadings 2 or more levels down. | |
320 With arg N, affects subheadings N levels down. | |
321 \\[hide-entry] make immediately following body invisible. | |
322 \\[show-entry] make it visible. | |
323 \\[hide-leaves] make body under heading and under its subheadings invisible. | |
324 The subheadings remain visible. | |
325 \\[show-branches] make all subheadings at all levels visible. | |
326 | |
327 The variable `outline-regexp' can be changed to control what is a heading. | |
328 A line is a heading if `outline-regexp' matches something at the | |
329 beginning of the line. The longer the match, the deeper the level. | |
330 | |
331 Turning on outline mode calls the value of `text-mode-hook' and then of | |
332 `outline-mode-hook', if they are non-nil." | |
333 (make-local-variable 'line-move-ignore-invisible) | |
334 (setq line-move-ignore-invisible t) | |
335 ;; Cause use of ellipses for invisible text. | |
336 (add-to-invisibility-spec '(outline . t)) | |
337 (set (make-local-variable 'paragraph-start) | |
338 (concat paragraph-start "\\|\\(?:" outline-regexp "\\)")) | |
339 ;; Inhibit auto-filling of header lines. | |
340 (set (make-local-variable 'auto-fill-inhibit-regexp) outline-regexp) | |
341 (set (make-local-variable 'paragraph-separate) | |
342 (concat paragraph-separate "\\|\\(?:" outline-regexp "\\)")) | |
343 (set (make-local-variable 'font-lock-defaults) | |
344 '(outline-font-lock-keywords t nil nil backward-paragraph)) | |
345 (setq imenu-generic-expression | |
346 (list (list nil (concat "^\\(?:" outline-regexp "\\).*$") 0))) | |
52070
318ea3203ba5
(outline-mode): Revert part of last patch (outline-mode already runs the hook).
Juanma Barranquero <lekktu@gmail.com>
parents:
52067
diff
changeset
|
347 (add-hook 'change-major-mode-hook 'show-all nil t)) |
51347 | 348 |
349 (defcustom outline-minor-mode-prefix "\C-c@" | |
100171 | 350 "Prefix key to use for Outline commands in Outline minor mode. |
51347 | 351 The value of this variable is checked as part of loading Outline mode. |
352 After that, changing the prefix key requires manipulating keymaps." | |
353 :type 'string | |
354 :group 'outlines) | |
355 | |
356 ;;;###autoload | |
357 (define-minor-mode outline-minor-mode | |
358 "Toggle Outline minor mode. | |
359 With arg, turn Outline minor mode on if arg is positive, off otherwise. | |
360 See the command `outline-mode' for more information on this mode." | |
361 nil " Outl" (list (cons [menu-bar] outline-minor-mode-menu-bar-map) | |
362 (cons outline-minor-mode-prefix outline-mode-prefix-map)) | |
363 :group 'outlines | |
364 (if outline-minor-mode | |
365 (progn | |
366 ;; Turn off this mode if we change major modes. | |
367 (add-hook 'change-major-mode-hook | |
368 (lambda () (outline-minor-mode -1)) | |
369 nil t) | |
370 (set (make-local-variable 'line-move-ignore-invisible) t) | |
371 ;; Cause use of ellipses for invisible text. | |
372 (add-to-invisibility-spec '(outline . t))) | |
373 (setq line-move-ignore-invisible nil) | |
374 ;; Cause use of ellipses for invisible text. | |
375 (remove-from-invisibility-spec '(outline . t)) | |
376 ;; When turning off outline mode, get rid of any outline hiding. | |
377 (show-all))) | |
378 | |
379 (defvar outline-level 'outline-level | |
380 "*Function of no args to compute a header's nesting level in an outline. | |
381 It can assume point is at the beginning of a header line and that the match | |
382 data reflects the `outline-regexp'.") | |
104612
c220a29e75fd
Define risky-local-variable property here rather than in files.el.
Glenn Morris <rgm@gnu.org>
parents:
102985
diff
changeset
|
383 ;;;###autoload(put 'outline-level 'risky-local-variable t) |
51347 | 384 |
385 (defvar outline-heading-alist () | |
386 "Alist associating a heading for every possible level. | |
387 Each entry is of the form (HEADING . LEVEL). | |
388 This alist is used two ways: to find the heading corresponding to | |
389 a given level and to find the level of a given heading. | |
390 If a mode or document needs several sets of outline headings (for example | |
391 numbered and unnumbered sections), list them set by set and sorted by level | |
392 within each set. For example in texinfo mode: | |
393 | |
394 (setq outline-heading-alist | |
395 '((\"@chapter\" . 2) (\"@section\" . 3) (\"@subsection\" . 4) | |
396 (\"@subsubsection\" . 5) | |
397 (\"@unnumbered\" . 2) (\"@unnumberedsec\" . 3) | |
398 (\"@unnumberedsubsec\" . 4) (\"@unnumberedsubsubsec\" . 5) | |
399 (\"@appendix\" . 2) (\"@appendixsec\" . 3)... | |
400 (\"@appendixsubsec\" . 4) (\"@appendixsubsubsec\" . 5) ..)) | |
401 | |
402 Instead of sorting the entries in each set, you can also separate the | |
403 sets with nil.") | |
404 (make-variable-buffer-local 'outline-heading-alist) | |
405 | |
406 ;; This used to count columns rather than characters, but that made ^L | |
407 ;; appear to be at level 2 instead of 1. Columns would be better for | |
408 ;; tab handling, but the default regexp doesn't use tabs, and anyone | |
409 ;; who changes the regexp can also redefine the outline-level variable | |
410 ;; as appropriate. | |
411 (defun outline-level () | |
412 "Return the depth to which a statement is nested in the outline. | |
413 Point must be at the beginning of a header line. | |
414 This is actually either the level specified in `outline-heading-alist' | |
415 or else the number of characters matched by `outline-regexp'." | |
416 (or (cdr (assoc (match-string 0) outline-heading-alist)) | |
417 (- (match-end 0) (match-beginning 0)))) | |
418 | |
419 (defun outline-next-preface () | |
420 "Skip forward to just before the next heading line. | |
421 If there's no following heading line, stop before the newline | |
422 at the end of the buffer." | |
423 (if (re-search-forward (concat "\n\\(?:" outline-regexp "\\)") | |
424 nil 'move) | |
425 (goto-char (match-beginning 0))) | |
55273
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
426 (if (and (bolp) (or outline-blank-line (eobp)) (not (bobp))) |
51347 | 427 (forward-char -1))) |
428 | |
429 (defun outline-next-heading () | |
430 "Move to the next (possibly invisible) heading line." | |
431 (interactive) | |
432 ;; Make sure we don't match the heading we're at. | |
433 (if (and (bolp) (not (eobp))) (forward-char 1)) | |
434 (if (re-search-forward (concat "^\\(?:" outline-regexp "\\)") | |
435 nil 'move) | |
436 (goto-char (match-beginning 0)))) | |
437 | |
438 (defun outline-previous-heading () | |
439 "Move to the previous (possibly invisible) heading line." | |
440 (interactive) | |
441 (re-search-backward (concat "^\\(?:" outline-regexp "\\)") | |
442 nil 'move)) | |
443 | |
444 (defsubst outline-invisible-p (&optional pos) | |
445 "Non-nil if the character after point is invisible." | |
446 (get-char-property (or pos (point)) 'invisible)) | |
447 | |
448 (defun outline-visible () | |
449 (not (outline-invisible-p))) | |
94164
73d630d21dcc
(outline-visible): Add WHEN to obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
93893
diff
changeset
|
450 (make-obsolete 'outline-visible 'outline-invisible-p "21.1") |
51347 | 451 |
452 (defun outline-back-to-heading (&optional invisible-ok) | |
453 "Move to previous heading line, or beg of this line if it's a heading. | |
454 Only visible heading lines are considered, unless INVISIBLE-OK is non-nil." | |
455 (beginning-of-line) | |
456 (or (outline-on-heading-p invisible-ok) | |
457 (let (found) | |
458 (save-excursion | |
459 (while (not found) | |
460 (or (re-search-backward (concat "^\\(?:" outline-regexp "\\)") | |
461 nil t) | |
462 (error "before first heading")) | |
463 (setq found (and (or invisible-ok (not (outline-invisible-p))) | |
464 (point))))) | |
465 (goto-char found) | |
466 found))) | |
467 | |
468 (defun outline-on-heading-p (&optional invisible-ok) | |
469 "Return t if point is on a (visible) heading line. | |
470 If INVISIBLE-OK is non-nil, an invisible heading line is ok too." | |
471 (save-excursion | |
472 (beginning-of-line) | |
473 (and (bolp) (or invisible-ok (not (outline-invisible-p))) | |
474 (looking-at outline-regexp)))) | |
475 | |
476 (defun outline-insert-heading () | |
477 "Insert a new heading at same depth at point." | |
478 (interactive) | |
479 (let ((head (save-excursion | |
480 (condition-case nil | |
481 (outline-back-to-heading) | |
482 (error (outline-next-heading))) | |
483 (if (eobp) | |
484 (or (caar outline-heading-alist) "") | |
485 (match-string 0))))) | |
486 (unless (or (string-match "[ \t]\\'" head) | |
53648
cb1748b5a52b
(outline-insert-heading): Tighten up match.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
487 (not (string-match (concat "\\`\\(?:" outline-regexp "\\)") |
cb1748b5a52b
(outline-insert-heading): Tighten up match.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
488 (concat head " ")))) |
51347 | 489 (setq head (concat head " "))) |
490 (unless (bolp) (end-of-line) (newline)) | |
491 (insert head) | |
492 (unless (eolp) | |
493 (save-excursion (newline-and-indent))) | |
494 (run-hooks 'outline-insert-heading-hook))) | |
495 | |
65158
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
496 (defun outline-invent-heading (head up) |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
497 (save-match-data |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
498 ;; Let's try to invent one by repeating or deleting the last char. |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
499 (let ((new-head (if up (substring head 0 -1) |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
500 (concat head (substring head -1))))) |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
501 (if (string-match (concat "\\`\\(?:" outline-regexp "\\)") |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
502 new-head) |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
503 ;; Why bother checking that it is indeed higher/lower level ? |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
504 new-head |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
505 ;; Didn't work, so ask what to do. |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
506 (read-string (format "%s heading for `%s': " |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
507 (if up "Parent" "Demoted") head) |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
508 head nil nil t))))) |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
509 |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
510 (defun outline-promote (&optional which) |
51347 | 511 "Promote headings higher up the tree. |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
512 If transient-mark-mode is on, and mark is active, promote headings in |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
513 the region (from a Lisp program, pass `region' for WHICH). Otherwise: |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
514 without prefix argument, promote current heading and all headings in the |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
515 subtree (from a Lisp program, pass `subtree' for WHICH); with prefix |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
516 argument, promote just the current heading (from a Lisp program, pass |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
517 nil for WHICH, or do not pass any argument)." |
51347 | 518 (interactive |
519 (list (if (and transient-mark-mode mark-active) 'region | |
520 (outline-back-to-heading) | |
521 (if current-prefix-arg nil 'subtree)))) | |
522 (cond | |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
523 ((eq which 'region) |
51347 | 524 (outline-map-region 'outline-promote (region-beginning) (region-end))) |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
525 (which |
51347 | 526 (outline-map-region 'outline-promote |
527 (point) | |
528 (save-excursion (outline-get-next-sibling) (point)))) | |
529 (t | |
530 (outline-back-to-heading t) | |
65147
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
531 (let* ((head (match-string-no-properties 0)) |
51347 | 532 (level (save-match-data (funcall outline-level))) |
533 (up-head (or (outline-head-from-level (1- level) head) | |
65147
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
534 ;; Use the parent heading, if it is really |
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
535 ;; one level less. |
51347 | 536 (save-excursion |
537 (save-match-data | |
538 (outline-up-heading 1 t) | |
65147
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
539 (and (= (1- level) (funcall outline-level)) |
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
540 (match-string-no-properties 0)))) |
65158
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
541 ;; Bummer!! There is no lower level heading. |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
542 (outline-invent-heading head 'up)))) |
52067
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
543 |
51347 | 544 (unless (rassoc level outline-heading-alist) |
545 (push (cons head level) outline-heading-alist)) | |
52067
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
546 |
51347 | 547 (replace-match up-head nil t))))) |
548 | |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
549 (defun outline-demote (&optional which) |
51347 | 550 "Demote headings lower down the tree. |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
551 If transient-mark-mode is on, and mark is active, demote headings in |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
552 the region (from a Lisp program, pass `region' for WHICH). Otherwise: |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
553 without prefix argument, demote current heading and all headings in the |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
554 subtree (from a Lisp program, pass `subtree' for WHICH); with prefix |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
555 argument, demote just the current heading (from a Lisp program, pass |
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
556 nil for WHICH, or do not pass any argument)." |
51347 | 557 (interactive |
558 (list (if (and transient-mark-mode mark-active) 'region | |
559 (outline-back-to-heading) | |
560 (if current-prefix-arg nil 'subtree)))) | |
561 (cond | |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
562 ((eq which 'region) |
51347 | 563 (outline-map-region 'outline-demote (region-beginning) (region-end))) |
75441
6e4c04850090
(outline-promote, outline-demote): Doc fix. Rename the arg CHILDREN -> WHICH.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
564 (which |
51347 | 565 (outline-map-region 'outline-demote |
566 (point) | |
567 (save-excursion (outline-get-next-sibling) (point)))) | |
568 (t | |
65147
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
569 (let* ((head (match-string-no-properties 0)) |
51347 | 570 (level (save-match-data (funcall outline-level))) |
571 (down-head | |
572 (or (outline-head-from-level (1+ level) head) | |
573 (save-excursion | |
574 (save-match-data | |
575 (while (and (progn (outline-next-heading) (not (eobp))) | |
576 (<= (funcall outline-level) level))) | |
577 (when (eobp) | |
578 ;; Try again from the beginning of the buffer. | |
579 (goto-char (point-min)) | |
580 (while (and (progn (outline-next-heading) (not (eobp))) | |
581 (<= (funcall outline-level) level)))) | |
582 (unless (eobp) | |
583 (looking-at outline-regexp) | |
65147
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
584 (match-string-no-properties 0)))) |
65158
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
585 ;; Bummer!! There is no higher-level heading in the buffer. |
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
586 (outline-invent-heading head nil)))) |
51347 | 587 |
65147
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
588 (unless (rassoc level outline-heading-alist) |
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
589 (push (cons head level) outline-heading-alist)) |
c5c1bf7f3c59
(outline-promote): Try shortening the heading.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
590 (replace-match down-head nil t))))) |
51347 | 591 |
592 (defun outline-head-from-level (level head &optional alist) | |
593 "Get new heading with level LEVEL from ALIST. | |
594 If there are no such entries, return nil. | |
595 ALIST defaults to `outline-heading-alist'. | |
596 Similar to (car (rassoc LEVEL ALIST)). | |
597 If there are several different entries with same new level, choose | |
107146
149c0b848923
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
598 the one with the smallest distance to the association of HEAD in the alist. |
51347 | 599 This makes it possible for promotion to work in modes with several |
600 independent sets of headings (numbered, unnumbered, appendix...)" | |
601 (unless alist (setq alist outline-heading-alist)) | |
602 (let ((l (rassoc level alist)) | |
603 ll h hl l2 l2l) | |
604 (cond | |
605 ((null l) nil) | |
606 ;; If there's no HEAD after L, any other entry for LEVEL after L | |
607 ;; can't be much better than L. | |
608 ((null (setq h (assoc head (setq ll (memq l alist))))) (car l)) | |
609 ;; If there's no other entry for LEVEL, just keep L. | |
610 ((null (setq l2 (rassoc level (cdr ll)))) (car l)) | |
611 ;; Now we have L, L2, and H: see if L2 seems better than L. | |
612 ;; If H is after L2, L2 is better. | |
613 ((memq h (setq l2l (memq l2 (cdr ll)))) | |
614 (outline-head-from-level level head l2l)) | |
615 ;; Now we have H between L and L2. | |
616 ;; If there's a separator between L and H, prefer L2. | |
617 ((memq h (memq nil ll)) | |
618 (outline-head-from-level level head l2l)) | |
619 ;; If there's a separator between L2 and H, prefer L. | |
620 ((memq l2 (memq nil (setq hl (memq h ll)))) (car l)) | |
621 ;; No separator between L and L2, check the distance. | |
622 ((< (* 2 (length hl)) (+ (length ll) (length l2l))) | |
623 (outline-head-from-level level head l2l)) | |
624 ;; If all else fails, just keep L. | |
625 (t (car l))))) | |
626 | |
627 (defun outline-map-region (fun beg end) | |
628 "Call FUN for every heading between BEG and END. | |
629 When FUN is called, point is at the beginning of the heading and | |
630 the match data is set appropriately." | |
631 (save-excursion | |
632 (setq end (copy-marker end)) | |
633 (goto-char beg) | |
634 (when (re-search-forward (concat "^\\(?:" outline-regexp "\\)") end t) | |
635 (goto-char (match-beginning 0)) | |
636 (funcall fun) | |
637 (while (and (progn | |
638 (outline-next-heading) | |
639 (< (point) end)) | |
640 (not (eobp))) | |
641 (funcall fun))))) | |
642 | |
643 ;; Vertical tree motion | |
644 | |
645 (defun outline-move-subtree-up (&optional arg) | |
646 "Move the currrent subtree up past ARG headlines of the same level." | |
647 (interactive "p") | |
648 (outline-move-subtree-down (- arg))) | |
649 | |
650 (defun outline-move-subtree-down (&optional arg) | |
651 "Move the currrent subtree down past ARG headlines of the same level." | |
652 (interactive "p") | |
65158
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
653 (let ((movfunc (if (> arg 0) 'outline-get-next-sibling |
51347 | 654 'outline-get-last-sibling)) |
655 (ins-point (make-marker)) | |
656 (cnt (abs arg)) | |
65158
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
657 beg end folded) |
51347 | 658 ;; Select the tree |
659 (outline-back-to-heading) | |
660 (setq beg (point)) | |
52067
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
661 (save-match-data |
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
662 (save-excursion (outline-end-of-heading) |
51347 | 663 (setq folded (outline-invisible-p))) |
664 (outline-end-of-subtree)) | |
665 (if (= (char-after) ?\n) (forward-char 1)) | |
666 (setq end (point)) | |
667 ;; Find insertion point, with error handling | |
668 (goto-char beg) | |
669 (while (> cnt 0) | |
670 (or (funcall movfunc) | |
671 (progn (goto-char beg) | |
672 (error "Cannot move past superior level"))) | |
673 (setq cnt (1- cnt))) | |
674 (if (> arg 0) | |
675 ;; Moving forward - still need to move over subtree | |
52067
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
676 (progn (outline-end-of-subtree) |
51347 | 677 (if (= (char-after) ?\n) (forward-char 1)))) |
678 (move-marker ins-point (point)) | |
679 (insert (delete-and-extract-region beg end)) | |
680 (goto-char ins-point) | |
681 (if folded (hide-subtree)) | |
682 (move-marker ins-point nil))) | |
683 | |
684 (defun outline-end-of-heading () | |
685 (if (re-search-forward outline-heading-end-regexp nil 'move) | |
686 (forward-char -1))) | |
687 | |
688 (defun outline-next-visible-heading (arg) | |
689 "Move to the next visible heading line. | |
690 With argument, repeats or can move backward if negative. | |
691 A heading line is one that starts with a `*' (or that | |
692 `outline-regexp' matches)." | |
693 (interactive "p") | |
694 (if (< arg 0) | |
695 (beginning-of-line) | |
696 (end-of-line)) | |
74823
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
697 (let (found-heading-p) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
698 (while (and (not (bobp)) (< arg 0)) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
699 (while (and (not (bobp)) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
700 (setq found-heading-p |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
701 (re-search-backward |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
702 (concat "^\\(?:" outline-regexp "\\)") |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
703 nil 'move)) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
704 (outline-invisible-p))) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
705 (setq arg (1+ arg))) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
706 (while (and (not (eobp)) (> arg 0)) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
707 (while (and (not (eobp)) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
708 (setq found-heading-p |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
709 (re-search-forward |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
710 (concat "^\\(?:" outline-regexp "\\)") |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
711 nil 'move)) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
712 (outline-invisible-p (match-beginning 0)))) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
713 (setq arg (1- arg))) |
dfa668ddf262
(outline-next-visible-heading): Fix the case with a header at end-of-file
Eli Zaretskii <eliz@gnu.org>
parents:
74669
diff
changeset
|
714 (if found-heading-p (beginning-of-line)))) |
51347 | 715 |
716 (defun outline-previous-visible-heading (arg) | |
717 "Move to the previous heading line. | |
718 With argument, repeats or can move forward if negative. | |
719 A heading line is one that starts with a `*' (or that | |
720 `outline-regexp' matches)." | |
721 (interactive "p") | |
722 (outline-next-visible-heading (- arg))) | |
723 | |
724 (defun outline-mark-subtree () | |
725 "Mark the current subtree in an outlined document. | |
726 This puts point at the start of the current subtree, and mark at the end." | |
727 (interactive) | |
728 (let ((beg)) | |
729 (if (outline-on-heading-p) | |
730 ;; we are already looking at a heading | |
731 (beginning-of-line) | |
732 ;; else go back to previous heading | |
733 (outline-previous-visible-heading 1)) | |
734 (setq beg (point)) | |
735 (outline-end-of-subtree) | |
65842
6b4c115f4d14
(outline-mark-subtree): Activate the mark.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65294
diff
changeset
|
736 (push-mark (point) nil t) |
51347 | 737 (goto-char beg))) |
738 | |
739 | |
74669
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
740 (defvar outline-isearch-open-invisible-function nil |
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
741 "Function called if `isearch' finishes in an invisible overlay. |
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
742 The function is called with the overlay as its only argument. |
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
743 If nil, `show-entry' is called to reveal the invisible text.") |
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
744 |
51347 | 745 (put 'outline 'reveal-toggle-invisible 'outline-reveal-toggle-invisible) |
746 (defun outline-flag-region (from to flag) | |
747 "Hide or show lines from FROM to TO, according to FLAG. | |
748 If FLAG is nil then text is shown, while if FLAG is t the text is hidden." | |
749 (remove-overlays from to 'invisible 'outline) | |
750 (when flag | |
78752
0475afda0917
(outline-flag-region): Use front-advance.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
751 ;; We use `front-advance' here because the invisible text begins at the |
0475afda0917
(outline-flag-region): Use front-advance.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
752 ;; very end of the heading, before the newline, so text inserted at FROM |
0475afda0917
(outline-flag-region): Use front-advance.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
753 ;; belongs to the heading rather than to the entry. |
0475afda0917
(outline-flag-region): Use front-advance.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
754 (let ((o (make-overlay from to nil 'front-advance))) |
51347 | 755 (overlay-put o 'invisible 'outline) |
74669
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
756 (overlay-put o 'isearch-open-invisible |
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
757 (or outline-isearch-open-invisible-function |
900d63313056
(outline-isearch-open-invisible-function): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
74384
diff
changeset
|
758 'outline-isearch-open-invisible)))) |
51347 | 759 ;; Seems only used by lazy-lock. I.e. obsolete. |
760 (run-hooks 'outline-view-change-hook)) | |
761 | |
762 (defun outline-reveal-toggle-invisible (o hidep) | |
763 (save-excursion | |
764 (goto-char (overlay-start o)) | |
765 (if hidep | |
766 ;; When hiding the area again, we could just clean it up and let | |
767 ;; reveal do the rest, by simply doing: | |
768 ;; (remove-overlays (overlay-start o) (overlay-end o) | |
769 ;; 'invisible 'outline) | |
52067
36323dc1a2ac
(outline-mode-hook): Define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
51347
diff
changeset
|
770 ;; |
51347 | 771 ;; That works fine as long as everything is in sync, but if the |
772 ;; structure of the document is changed while revealing parts of it, | |
773 ;; the resulting behavior can be ugly. I.e. we need to make | |
774 ;; sure that we hide exactly a subtree. | |
775 (progn | |
776 (let ((end (overlay-end o))) | |
777 (delete-overlay o) | |
778 (while (progn | |
779 (hide-subtree) | |
780 (outline-next-visible-heading 1) | |
781 (and (not (eobp)) (< (point) end)))))) | |
782 | |
783 ;; When revealing, we just need to reveal sublevels. If point is | |
784 ;; inside one of the sublevels, reveal will call us again. | |
785 ;; But we need to preserve the original overlay. | |
786 (let ((o1 (copy-overlay o))) | |
787 (overlay-put o 'invisible nil) ;Show (most of) the text. | |
788 (while (progn | |
789 (show-entry) | |
790 (show-children) | |
791 ;; Normally just the above is needed. | |
792 ;; But in odd cases, the above might fail to show anything. | |
793 ;; To avoid an infinite loop, we have to make sure that | |
794 ;; *something* gets shown. | |
795 (and (equal (overlay-start o) (overlay-start o1)) | |
796 (< (point) (overlay-end o)) | |
797 (= 0 (forward-line 1))))) | |
798 ;; If still nothing was shown, just kill the damn thing. | |
799 (when (equal (overlay-start o) (overlay-start o1)) | |
800 ;; I've seen it happen at the end of buffer. | |
801 (delete-overlay o1)))))) | |
802 | |
803 ;; Function to be set as an outline-isearch-open-invisible' property | |
804 ;; to the overlay that makes the outline invisible (see | |
805 ;; `outline-flag-region'). | |
806 (defun outline-isearch-open-invisible (overlay) | |
807 ;; We rely on the fact that isearch places point on the matched text. | |
808 (show-entry)) | |
809 | |
810 (defun hide-entry () | |
811 "Hide the body directly following this heading." | |
812 (interactive) | |
813 (save-excursion | |
65214
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
814 (outline-back-to-heading) |
55228
53c5c7a2f4a8
(outline-next-preface, outline-show-heading): Don't leave unhidden blank line before heading.
Juri Linkov <juri@jurta.org>
parents:
53648
diff
changeset
|
815 (outline-end-of-heading) |
51347 | 816 (outline-flag-region (point) (progn (outline-next-preface) (point)) t))) |
817 | |
818 (defun show-entry () | |
819 "Show the body directly following this heading. | |
820 Show the heading too, if it is currently invisible." | |
821 (interactive) | |
822 (save-excursion | |
823 (outline-back-to-heading t) | |
824 (outline-flag-region (1- (point)) | |
825 (progn (outline-next-preface) (point)) nil))) | |
826 | |
827 (defun hide-body () | |
57974
be8ba6e58a49
(hide-body): Don't hide lines at the top of the file
Eli Zaretskii <eliz@gnu.org>
parents:
57527
diff
changeset
|
828 "Hide all body lines in buffer, leaving all headings visible." |
51347 | 829 (interactive) |
830 (hide-region-body (point-min) (point-max))) | |
831 | |
832 (defun hide-region-body (start end) | |
833 "Hide all body lines in the region, but not headings." | |
834 ;; Nullify the hook to avoid repeated calls to `outline-flag-region' | |
835 ;; wasting lots of time running `lazy-lock-fontify-after-outline' | |
836 ;; and run the hook finally. | |
837 (let (outline-view-change-hook) | |
838 (save-excursion | |
839 (save-restriction | |
840 (narrow-to-region start end) | |
841 (goto-char (point-min)) | |
842 (if (outline-on-heading-p) | |
57974
be8ba6e58a49
(hide-body): Don't hide lines at the top of the file
Eli Zaretskii <eliz@gnu.org>
parents:
57527
diff
changeset
|
843 (outline-end-of-heading) |
be8ba6e58a49
(hide-body): Don't hide lines at the top of the file
Eli Zaretskii <eliz@gnu.org>
parents:
57527
diff
changeset
|
844 (outline-next-preface)) |
51347 | 845 (while (not (eobp)) |
846 (outline-flag-region (point) | |
847 (progn (outline-next-preface) (point)) t) | |
848 (unless (eobp) | |
849 (forward-char (if (looking-at "\n\n") 2 1)) | |
850 (outline-end-of-heading)))))) | |
851 (run-hooks 'outline-view-change-hook)) | |
852 | |
853 (defun show-all () | |
854 "Show all of the text in the buffer." | |
855 (interactive) | |
856 (outline-flag-region (point-min) (point-max) nil)) | |
857 | |
858 (defun hide-subtree () | |
859 "Hide everything after this heading at deeper levels." | |
860 (interactive) | |
861 (outline-flag-subtree t)) | |
862 | |
863 (defun hide-leaves () | |
68269
4747977f1afa
(hide-leaves): Don't call outline-end-of-heading.
Richard M. Stallman <rms@gnu.org>
parents:
65842
diff
changeset
|
864 "Hide the body after this heading and at deeper levels." |
51347 | 865 (interactive) |
866 (save-excursion | |
65214
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
867 (outline-back-to-heading) |
68279 | 868 ;; Turned off to fix bug reported by Otto Maddox on 22 Nov 2005. |
68269
4747977f1afa
(hide-leaves): Don't call outline-end-of-heading.
Richard M. Stallman <rms@gnu.org>
parents:
65842
diff
changeset
|
869 ;; (outline-end-of-heading) |
51347 | 870 (hide-region-body (point) (progn (outline-end-of-subtree) (point))))) |
871 | |
872 (defun show-subtree () | |
873 "Show everything after this heading at deeper levels." | |
874 (interactive) | |
875 (outline-flag-subtree nil)) | |
876 | |
877 (defun outline-show-heading () | |
878 "Show the current heading and move to its end." | |
55273
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
879 (outline-flag-region (- (point) |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
880 (if (bobp) 0 |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
881 (if (and outline-blank-line |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
882 (eq (char-before (1- (point))) ?\n)) |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
883 2 1))) |
51347 | 884 (progn (outline-end-of-heading) (point)) |
885 nil)) | |
886 | |
887 (defun hide-sublevels (levels) | |
888 "Hide everything but the top LEVELS levels of headers, in whole buffer." | |
69297
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
889 (interactive (list |
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
890 (cond |
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
891 (current-prefix-arg (prefix-numeric-value current-prefix-arg)) |
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
892 ((save-excursion (beginning-of-line) |
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
893 (looking-at outline-regexp)) |
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
894 (funcall outline-level)) |
c379d6c262b1
(hide-sublevels): Provide better interactive default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
895 (t 1)))) |
51347 | 896 (if (< levels 1) |
897 (error "Must keep at least one level of headers")) | |
76024
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
898 (save-excursion |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
899 (let* (outline-view-change-hook |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
900 (beg (progn |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
901 (goto-char (point-min)) |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
902 ;; Skip the prelude, if any. |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
903 (unless (outline-on-heading-p t) (outline-next-heading)) |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
904 (point))) |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
905 (end (progn |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
906 (goto-char (point-max)) |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
907 ;; Keep empty last line, if available. |
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
908 (if (bolp) (1- (point)) (point))))) |
102985
3123154d96e0
* outline.el (hide-sublevels): Ensure that arguments are passed to
Chong Yidong <cyd@stupidchicken.com>
parents:
100908
diff
changeset
|
909 (if (< end beg) |
3123154d96e0
* outline.el (hide-sublevels): Ensure that arguments are passed to
Chong Yidong <cyd@stupidchicken.com>
parents:
100908
diff
changeset
|
910 (setq beg (prog1 end (setq end beg)))) |
51347 | 911 ;; First hide everything. |
76024
00669875e4fe
(hide-sublevels): Keep empty last line, if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75441
diff
changeset
|
912 (outline-flag-region beg end t) |
51347 | 913 ;; Then unhide the top level headers. |
914 (outline-map-region | |
915 (lambda () | |
916 (if (<= (funcall outline-level) levels) | |
107446
93cf07b171cc
(hide-sublevels): Unfix the paren non-typo! (bug#5738).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107429
diff
changeset
|
917 (outline-show-heading))) |
93cf07b171cc
(hide-sublevels): Unfix the paren non-typo! (bug#5738).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107429
diff
changeset
|
918 beg end) |
93cf07b171cc
(hide-sublevels): Unfix the paren non-typo! (bug#5738).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107429
diff
changeset
|
919 ;; Finally unhide any trailing newline. |
93cf07b171cc
(hide-sublevels): Unfix the paren non-typo! (bug#5738).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107429
diff
changeset
|
920 (goto-char (point-max)) |
93cf07b171cc
(hide-sublevels): Unfix the paren non-typo! (bug#5738).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107429
diff
changeset
|
921 (if (and (bolp) (not (bobp)) (outline-invisible-p (1- (point)))) |
93cf07b171cc
(hide-sublevels): Unfix the paren non-typo! (bug#5738).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107429
diff
changeset
|
922 (outline-flag-region (1- (point)) (point) nil)))) |
51347 | 923 (run-hooks 'outline-view-change-hook)) |
924 | |
925 (defun hide-other () | |
926 "Hide everything except current body and parent and top-level headings." | |
927 (interactive) | |
928 (hide-sublevels 1) | |
929 (let (outline-view-change-hook) | |
930 (save-excursion | |
931 (outline-back-to-heading t) | |
932 (show-entry) | |
57527
21785c190853
(hide-other): Call outline-up-heading with INVISIBLE-OK=t.
Richard M. Stallman <rms@gnu.org>
parents:
55273
diff
changeset
|
933 (while (condition-case nil (progn (outline-up-heading 1 t) (not (bobp))) |
51347 | 934 (error nil)) |
935 (outline-flag-region (1- (point)) | |
936 (save-excursion (forward-line 1) (point)) | |
937 nil)))) | |
938 (run-hooks 'outline-view-change-hook)) | |
939 | |
940 (defun outline-toggle-children () | |
941 "Show or hide the current subtree depending on its current state." | |
942 (interactive) | |
65214
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
943 (save-excursion |
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
944 (outline-back-to-heading) |
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
945 (if (not (outline-invisible-p (line-end-position))) |
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
946 (hide-subtree) |
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
947 (show-children) |
aefa34357e06
(hide-entry, hide-leaves, outline-toggle-children):
Juri Linkov <juri@jurta.org>
parents:
65158
diff
changeset
|
948 (show-entry)))) |
51347 | 949 |
950 (defun outline-flag-subtree (flag) | |
951 (save-excursion | |
952 (outline-back-to-heading) | |
953 (outline-end-of-heading) | |
954 (outline-flag-region (point) | |
955 (progn (outline-end-of-subtree) (point)) | |
956 flag))) | |
957 | |
958 (defun outline-end-of-subtree () | |
959 (outline-back-to-heading) | |
65158
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
960 (let ((first t) |
51347 | 961 (level (funcall outline-level))) |
962 (while (and (not (eobp)) | |
963 (or first (> (funcall outline-level) level))) | |
964 (setq first nil) | |
965 (outline-next-heading)) | |
74384
4bb58e866a28
(outline-end-of-subtree): Don't leave an empty
Richard M. Stallman <rms@gnu.org>
parents:
70590
diff
changeset
|
966 (if (and (bolp) (not (eolp))) |
4bb58e866a28
(outline-end-of-subtree): Don't leave an empty
Richard M. Stallman <rms@gnu.org>
parents:
70590
diff
changeset
|
967 ;; We stopped at a nonempty line (the next heading). |
51347 | 968 (progn |
969 ;; Go to end of line before heading | |
55273
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
970 (forward-char -1) |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
971 (if (and outline-blank-line (bolp)) |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
972 ;; leave blank line before heading |
8362eef794e3
(outline-blank-line): New var.
Juri Linkov <juri@jurta.org>
parents:
55228
diff
changeset
|
973 (forward-char -1)))))) |
51347 | 974 |
975 (defun show-branches () | |
976 "Show all subheadings of this heading, but not their bodies." | |
977 (interactive) | |
978 (show-children 1000)) | |
979 | |
980 (defun show-children (&optional level) | |
981 "Show all direct subheadings of this heading. | |
982 Prefix arg LEVEL is how many levels below the current level should be shown. | |
983 Default is enough to cause the following heading to appear." | |
984 (interactive "P") | |
985 (setq level | |
986 (if level (prefix-numeric-value level) | |
987 (save-excursion | |
988 (outline-back-to-heading) | |
989 (let ((start-level (funcall outline-level))) | |
990 (outline-next-heading) | |
991 (if (eobp) | |
992 1 | |
993 (max 1 (- (funcall outline-level) start-level))))))) | |
994 (let (outline-view-change-hook) | |
995 (save-excursion | |
996 (outline-back-to-heading) | |
997 (setq level (+ level (funcall outline-level))) | |
998 (outline-map-region | |
999 (lambda () | |
1000 (if (<= (funcall outline-level) level) | |
1001 (outline-show-heading))) | |
1002 (point) | |
1003 (progn (outline-end-of-subtree) | |
1004 (if (eobp) (point-max) (1+ (point))))))) | |
1005 (run-hooks 'outline-view-change-hook)) | |
1006 | |
1007 | |
1008 | |
1009 (defun outline-up-heading (arg &optional invisible-ok) | |
1010 "Move to the visible heading line of which the present line is a subheading. | |
1011 With argument, move up ARG levels. | |
1012 If INVISIBLE-OK is non-nil, also consider invisible lines." | |
1013 (interactive "p") | |
55228
53c5c7a2f4a8
(outline-next-preface, outline-show-heading): Don't leave unhidden blank line before heading.
Juri Linkov <juri@jurta.org>
parents:
53648
diff
changeset
|
1014 (and (eq this-command 'outline-up-heading) |
53c5c7a2f4a8
(outline-next-preface, outline-show-heading): Don't leave unhidden blank line before heading.
Juri Linkov <juri@jurta.org>
parents:
53648
diff
changeset
|
1015 (or (eq last-command 'outline-up-heading) (push-mark))) |
51347 | 1016 (outline-back-to-heading invisible-ok) |
1017 (let ((start-level (funcall outline-level))) | |
87881
9145a42d68ae
(outline-up-heading): Fix check for top level to
Martin Rudalics <rudalics@gmx.at>
parents:
87649
diff
changeset
|
1018 (when (<= start-level 1) |
9145a42d68ae
(outline-up-heading): Fix check for top level to
Martin Rudalics <rudalics@gmx.at>
parents:
87649
diff
changeset
|
1019 (error "Already at top level of the outline")) |
51347 | 1020 (while (and (> start-level 1) (> arg 0) (not (bobp))) |
1021 (let ((level start-level)) | |
1022 (while (not (or (< level start-level) (bobp))) | |
1023 (if invisible-ok | |
1024 (outline-previous-heading) | |
1025 (outline-previous-visible-heading 1)) | |
1026 (setq level (funcall outline-level))) | |
1027 (setq start-level level)) | |
1028 (setq arg (- arg 1)))) | |
1029 (looking-at outline-regexp)) | |
1030 | |
1031 (defun outline-forward-same-level (arg) | |
1032 "Move forward to the ARG'th subheading at same level as this one. | |
1033 Stop at the first and last subheadings of a superior heading." | |
1034 (interactive "p") | |
1035 (outline-back-to-heading) | |
1036 (while (> arg 0) | |
1037 (let ((point-to-move-to (save-excursion | |
1038 (outline-get-next-sibling)))) | |
1039 (if point-to-move-to | |
1040 (progn | |
1041 (goto-char point-to-move-to) | |
1042 (setq arg (1- arg))) | |
1043 (progn | |
1044 (setq arg 0) | |
1045 (error "No following same-level heading")))))) | |
1046 | |
1047 (defun outline-get-next-sibling () | |
77152
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1048 "Move to next heading of the same level, and return point. |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1049 If there is no such heading, return nil." |
51347 | 1050 (let ((level (funcall outline-level))) |
1051 (outline-next-visible-heading 1) | |
1052 (while (and (not (eobp)) (> (funcall outline-level) level)) | |
1053 (outline-next-visible-heading 1)) | |
1054 (if (or (eobp) (< (funcall outline-level) level)) | |
1055 nil | |
1056 (point)))) | |
1057 | |
1058 (defun outline-backward-same-level (arg) | |
1059 "Move backward to the ARG'th subheading at same level as this one. | |
1060 Stop at the first and last subheadings of a superior heading." | |
1061 (interactive "p") | |
1062 (outline-back-to-heading) | |
1063 (while (> arg 0) | |
1064 (let ((point-to-move-to (save-excursion | |
1065 (outline-get-last-sibling)))) | |
1066 (if point-to-move-to | |
1067 (progn | |
1068 (goto-char point-to-move-to) | |
1069 (setq arg (1- arg))) | |
1070 (progn | |
1071 (setq arg 0) | |
1072 (error "No previous same-level heading")))))) | |
1073 | |
1074 (defun outline-get-last-sibling () | |
77152
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1075 "Move to previous heading of the same level, and return point. |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1076 If there is no such heading, return nil." |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1077 (let ((opoint (point)) |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1078 (level (funcall outline-level))) |
51347 | 1079 (outline-previous-visible-heading 1) |
77152
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1080 (when (and (/= (point) opoint) (outline-on-heading-p)) |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1081 (while (and (> (funcall outline-level) level) |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1082 (not (bobp))) |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1083 (outline-previous-visible-heading 1)) |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1084 (if (< (funcall outline-level) level) |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1085 nil |
54e83bd9ac02
* outline.el (outline-get-next-sibling): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
76024
diff
changeset
|
1086 (point))))) |
51347 | 1087 |
1088 (defun outline-headers-as-kill (beg end) | |
1089 "Save the visible outline headers in region at the start of the kill ring. | |
1090 | |
1091 Text shown between the headers isn't copied. Two newlines are | |
1092 inserted between saved headers. Yanking the result may be a | |
1093 convenient way to make a table of contents of the buffer." | |
1094 (interactive "r") | |
1095 (save-excursion | |
1096 (save-restriction | |
1097 (narrow-to-region beg end) | |
1098 (goto-char (point-min)) | |
1099 (let ((buffer (current-buffer)) | |
1100 start end) | |
1101 (with-temp-buffer | |
1102 (with-current-buffer buffer | |
1103 ;; Boundary condition: starting on heading: | |
1104 (when (outline-on-heading-p) | |
1105 (outline-back-to-heading) | |
1106 (setq start (point) | |
1107 end (progn (outline-end-of-heading) | |
1108 (point))) | |
1109 (insert-buffer-substring buffer start end) | |
1110 (insert "\n\n"))) | |
1111 (let ((temp-buffer (current-buffer))) | |
1112 (with-current-buffer buffer | |
1113 (while (outline-next-heading) | |
1114 (unless (outline-invisible-p) | |
1115 (setq start (point) | |
1116 end (progn (outline-end-of-heading) (point))) | |
1117 (with-current-buffer temp-buffer | |
1118 (insert-buffer-substring buffer start end) | |
1119 (insert "\n\n")))))) | |
1120 (kill-new (buffer-string))))))) | |
1121 | |
1122 (provide 'outline) | |
1123 (provide 'noutline) | |
1124 | |
65158
1dc0c9b5d66a
(outline-invent-heading): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65147
diff
changeset
|
1125 ;; arch-tag: 1724410e-7d4d-4f46-b801-49e18171e874 |
51347 | 1126 ;;; outline.el ends here |