Mercurial > emacs
annotate lisp/textmodes/outline.el @ 46677:86e8d59e2e49
*** empty log message ***
author | Dave Love <fx@gnu.org> |
---|---|
date | Wed, 24 Jul 2002 23:01:32 +0000 |
parents | 5d3b861665f0 |
children | 0d2e42a6fd1c |
rev | line source |
---|---|
10950 | 1 ;;; outline.el --- outline mode commands for Emacs |
14169 | 2 |
37751
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
3 ;; Copyright (C) 1986, 93, 94, 95, 97, 2000, 2001 |
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
10950 | 5 |
6 ;; Maintainer: FSF | |
11455 | 7 ;; Keywords: outlines |
10950 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
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 | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
10950 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;; This package is a major mode for editing outline-format documents. | |
29 ;; An outline can be `abstracted' to show headers at any given level, | |
30 ;; with all stuff below hidden. See the Emacs manual for details. | |
31 | |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
32 ;;; Todo: |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
33 |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
34 ;; - subtree-terminators |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
35 ;; - better handle comments before function bodies (i.e. heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
36 ;; - don't bother hiding whitespace |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
37 |
10950 | 38 ;;; Code: |
39 | |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
40 (defgroup outlines nil |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
41 "Support for hierarchical outlining" |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
42 :prefix "outline-" |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
43 :group 'editing) |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
44 |
39261
fc133c103640
(outline-regexp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
39238
diff
changeset
|
45 (defcustom outline-regexp "[*\^L]+" |
10950 | 46 "*Regular expression to match the beginning of a heading. |
47 Any line whose beginning matches this regexp is considered to start a heading. | |
39261
fc133c103640
(outline-regexp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
39238
diff
changeset
|
48 Note that Outline mode only checks this regexp at the start of a line, |
fc133c103640
(outline-regexp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
39238
diff
changeset
|
49 so the regexp need not (and usually does not) start with `^'. |
10950 | 50 The recommended way to set this is with a Local Variables: list |
24627 | 51 in the file it applies to. See also `outline-heading-end-regexp'." |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
52 :type '(choice regexp (const nil)) |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
53 :group 'outlines) |
10950 | 54 |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
55 (defcustom outline-heading-end-regexp "\n" |
10950 | 56 "*Regular expression to match the end of a heading line. |
57 You can assume that point is at the beginning of a heading when this | |
58 regexp is searched for. The heading ends at the end of the match. | |
59 The recommended way to set this is with a `Local Variables:' list | |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
60 in the file it applies to." |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
61 :type 'regexp |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
62 :group 'outlines) |
10950 | 63 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
64 (defvar outline-mode-prefix-map |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
65 (let ((map (make-sparse-keymap))) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
66 (define-key map "@" 'outline-mark-subtree) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
67 (define-key map "\C-n" 'outline-next-visible-heading) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
68 (define-key map "\C-p" 'outline-previous-visible-heading) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
69 (define-key map "\C-i" 'show-children) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
70 (define-key map "\C-s" 'show-subtree) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
71 (define-key map "\C-d" 'hide-subtree) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
72 (define-key map "\C-u" 'outline-up-heading) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
73 (define-key map "\C-f" 'outline-forward-same-level) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
74 (define-key map "\C-b" 'outline-backward-same-level) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
75 (define-key map "\C-t" 'hide-body) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
76 (define-key map "\C-a" 'show-all) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
77 (define-key map "\C-c" 'hide-entry) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
78 (define-key map "\C-e" 'show-entry) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
79 (define-key map "\C-l" 'hide-leaves) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
80 (define-key map "\C-k" 'show-branches) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
81 (define-key map "\C-q" 'hide-sublevels) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
82 (define-key map "\C-o" 'hide-other) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
83 (define-key map "\C-^" 'outline-promote) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
84 (define-key map "\C-v" 'outline-demote) |
45429
5d3b861665f0
(outline-reveal-toggle-invisible): Reverse the meaning of the second arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41782
diff
changeset
|
85 ;; Where to bind toggle and insert-heading ? |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
86 map)) |
10950 | 87 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
88 (defvar outline-mode-menu-bar-map |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
89 (let ((map (make-sparse-keymap))) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
90 |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
91 (define-key map [hide] (cons "Hide" (make-sparse-keymap "Hide"))) |
10950 | 92 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
93 (define-key map [hide hide-other] '("Hide Other" . hide-other)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
94 (define-key map [hide hide-sublevels] '("Hide Sublevels" . hide-sublevels)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
95 (define-key map [hide hide-subtree] '("Hide Subtree" . hide-subtree)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
96 (define-key map [hide hide-entry] '("Hide Entry" . hide-entry)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
97 (define-key map [hide hide-body] '("Hide Body" . hide-body)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
98 (define-key map [hide hide-leaves] '("Hide Leaves" . hide-leaves)) |
10950 | 99 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
100 (define-key map [show] (cons "Show" (make-sparse-keymap "Show"))) |
10950 | 101 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
102 (define-key map [show show-subtree] '("Show Subtree" . show-subtree)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
103 (define-key map [show show-children] '("Show Children" . show-children)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
104 (define-key map [show show-branches] '("Show Branches" . show-branches)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
105 (define-key map [show show-entry] '("Show Entry" . show-entry)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
106 (define-key map [show show-all] '("Show All" . show-all)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
107 |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
108 (define-key map [headings] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
109 (cons "Headings" (make-sparse-keymap "Headings"))) |
10950 | 110 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
111 (define-key map [headings copy] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
112 '(menu-item "Copy to kill ring" outline-headers-as-kill |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
113 :enable mark-active)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
114 (define-key map [headings outline-backward-same-level] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
115 '("Previous Same Level" . outline-backward-same-level)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
116 (define-key map [headings outline-forward-same-level] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
117 '("Next Same Level" . outline-forward-same-level)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
118 (define-key map [headings outline-previous-visible-heading] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
119 '("Previous" . outline-previous-visible-heading)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
120 (define-key map [headings outline-next-visible-heading] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
121 '("Next" . outline-next-visible-heading)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
122 (define-key map [headings outline-up-heading] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
123 '("Up" . outline-up-heading)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
124 map)) |
10950 | 125 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
126 (defvar outline-minor-mode-menu-bar-map |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
127 (let ((map (make-sparse-keymap))) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
128 (define-key map [outline] |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
129 (cons "Outline" |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
130 (nconc (make-sparse-keymap "Outline") |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
131 ;; Remove extra separator |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
132 (cdr |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
133 ;; Flatten the major mode's menus into a single menu. |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
134 (apply 'append |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
135 (mapcar (lambda (x) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
136 (if (consp x) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
137 ;; Add a separator between each |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
138 ;; part of the unified menu. |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
139 (cons '(--- "---") (cdr x)))) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
140 outline-mode-menu-bar-map)))))) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
141 map)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
142 |
10950 | 143 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
144 (defvar outline-mode-map |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
145 (let ((map (make-sparse-keymap))) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
146 (define-key map "\C-c" outline-mode-prefix-map) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
147 (define-key map [menu-bar] outline-mode-menu-bar-map) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
148 map)) |
10950 | 149 |
150 (defvar outline-font-lock-keywords | |
20175
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
151 '(;; |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
152 ;; Highlight headings according to the level. |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
153 (eval . (list (concat "^" outline-regexp ".+") |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
154 0 '(or (cdr (assq (outline-font-lock-level) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
155 ;; FIXME: this is silly! |
20175
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
156 '((1 . font-lock-function-name-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
157 (2 . font-lock-variable-name-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
158 (3 . font-lock-keyword-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
159 (4 . font-lock-builtin-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
160 (5 . font-lock-comment-face) |
20953
f3f9df46d008
Changed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20426
diff
changeset
|
161 (6 . font-lock-constant-face) |
20175
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
162 (7 . font-lock-type-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
163 (8 . font-lock-string-face)))) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
164 font-lock-warning-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
165 nil t))) |
10950 | 166 "Additional expressions to highlight in Outline mode.") |
167 | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
168 (defun outline-font-lock-level () |
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
169 (let ((count 1)) |
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
170 (save-excursion |
25148
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
171 (outline-back-to-heading t) |
37751
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
172 (while (and (not (bobp)) |
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
173 (not (eq (funcall outline-level) 1))) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
174 (outline-up-heading 1 t) |
37751
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
175 (setq count (1+ count))) |
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
176 count))) |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
177 |
13259
11899bfa541c
(outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
12604
diff
changeset
|
178 (defvar outline-view-change-hook nil |
11899bfa541c
(outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
12604
diff
changeset
|
179 "Normal hook to be run after outline visibility changes.") |
11899bfa541c
(outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
12604
diff
changeset
|
180 |
17688
b02bb31c98b0
(outline-mode): Autoload cookie added.
Richard M. Stallman <rms@gnu.org>
parents:
17687
diff
changeset
|
181 ;;;###autoload |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
182 (define-derived-mode outline-mode text-mode "Outline" |
10950 | 183 "Set major mode for editing outlines with selective display. |
184 Headings are lines which start with asterisks: one for major headings, | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
185 two for subheadings, etc. Lines not starting with asterisks are body lines. |
10950 | 186 |
187 Body text or subheadings under a heading can be made temporarily | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
188 invisible, or visible again. Invisible lines are attached to the end |
10950 | 189 of the heading, so they move with it, if the line is killed and yanked |
190 back. A heading with text hidden under it is marked with an ellipsis (...). | |
191 | |
192 Commands:\\<outline-mode-map> | |
193 \\[outline-next-visible-heading] outline-next-visible-heading move by visible headings | |
194 \\[outline-previous-visible-heading] outline-previous-visible-heading | |
195 \\[outline-forward-same-level] outline-forward-same-level similar but skip subheadings | |
196 \\[outline-backward-same-level] outline-backward-same-level | |
197 \\[outline-up-heading] outline-up-heading move from subheading to heading | |
198 | |
199 \\[hide-body] make all text invisible (not headings). | |
200 \\[show-all] make everything in buffer visible. | |
201 | |
202 The remaining commands are used when point is on a heading line. | |
203 They apply to some of the body or subheadings of that heading. | |
204 \\[hide-subtree] hide-subtree make body and subheadings invisible. | |
205 \\[show-subtree] show-subtree make body and subheadings visible. | |
206 \\[show-children] show-children make direct subheadings visible. | |
207 No effect on body, or subheadings 2 or more levels down. | |
208 With arg N, affects subheadings N levels down. | |
209 \\[hide-entry] make immediately following body invisible. | |
210 \\[show-entry] make it visible. | |
211 \\[hide-leaves] make body under heading and under its subheadings invisible. | |
212 The subheadings remain visible. | |
213 \\[show-branches] make all subheadings at all levels visible. | |
214 | |
215 The variable `outline-regexp' can be changed to control what is a heading. | |
216 A line is a heading if `outline-regexp' matches something at the | |
217 beginning of the line. The longer the match, the deeper the level. | |
218 | |
219 Turning on outline mode calls the value of `text-mode-hook' and then of | |
220 `outline-mode-hook', if they are non-nil." | |
221 (make-local-variable 'line-move-ignore-invisible) | |
222 (setq line-move-ignore-invisible t) | |
223 ;; Cause use of ellipses for invisible text. | |
17853
3af728d1f6cf
(outline-mode): Use `add-to-invisibility-spec' and
Richard M. Stallman <rms@gnu.org>
parents:
17690
diff
changeset
|
224 (add-to-invisibility-spec '(outline . t)) |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
225 (set (make-local-variable 'paragraph-start) |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
226 (concat paragraph-start "\\|\\(" outline-regexp "\\)")) |
10950 | 227 ;; Inhibit auto-filling of header lines. |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
228 (set (make-local-variable 'auto-fill-inhibit-regexp) outline-regexp) |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
229 (set (make-local-variable 'paragraph-separate) |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
230 (concat paragraph-separate "\\|\\(" outline-regexp "\\)")) |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
231 (set (make-local-variable 'font-lock-defaults) |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
232 '(outline-font-lock-keywords t nil nil backward-paragraph)) |
27204
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
233 (setq imenu-generic-expression |
39238
7370effcd55c
(outline-mode): Use `^' and a shy group
Gerd Moellmann <gerd@gnu.org>
parents:
37920
diff
changeset
|
234 (list (list nil (concat "^\\(?:" outline-regexp "\\).*$") 0))) |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
235 (add-hook 'change-major-mode-hook 'show-all nil t)) |
10950 | 236 |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
237 (defcustom outline-minor-mode-prefix "\C-c@" |
10950 | 238 "*Prefix key to use for Outline commands in Outline minor mode. |
239 The value of this variable is checked as part of loading Outline mode. | |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
240 After that, changing the prefix key requires manipulating keymaps." |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
241 :type 'string |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
242 :group 'outlines) |
10950 | 243 |
17688
b02bb31c98b0
(outline-mode): Autoload cookie added.
Richard M. Stallman <rms@gnu.org>
parents:
17687
diff
changeset
|
244 ;;;###autoload |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
245 (define-minor-mode outline-minor-mode |
10950 | 246 "Toggle Outline minor mode. |
247 With arg, turn Outline minor mode on if arg is positive, off otherwise. | |
248 See the command `outline-mode' for more information on this mode." | |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
249 nil " Outl" (list (cons [menu-bar] outline-minor-mode-menu-bar-map) |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
250 (cons outline-minor-mode-prefix outline-mode-prefix-map)) |
10950 | 251 (if outline-minor-mode |
252 (progn | |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
253 ;; Turn off this mode if we change major modes. |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
254 (add-hook 'change-major-mode-hook |
30881
4758e306c41e
(outline-minor-mode): Don't quote lambda.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27548
diff
changeset
|
255 (lambda () (outline-minor-mode -1)) |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
256 nil t) |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
257 (set (make-local-variable 'line-move-ignore-invisible) t) |
10950 | 258 ;; Cause use of ellipses for invisible text. |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
259 (add-to-invisibility-spec '(outline . t))) |
10950 | 260 (setq line-move-ignore-invisible nil) |
261 ;; Cause use of ellipses for invisible text. | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
262 (remove-from-invisibility-spec '(outline . t)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
263 ;; When turning off outline mode, get rid of any outline hiding. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
264 (show-all))) |
10950 | 265 |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
266 (defcustom outline-level 'outline-level |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
267 "*Function of no args to compute a header's nesting level in an outline. |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
268 It can assume point is at the beginning of a header line." |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
269 :type 'function |
17690
3fa9da85b3ea
Fix customization change.
Richard M. Stallman <rms@gnu.org>
parents:
17688
diff
changeset
|
270 :group 'outlines) |
10950 | 271 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
272 (defvar outline-heading-alist () |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
273 "Alist associating a heading for every possible level. |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
274 Each entry is of the form (HEADING . LEVEL). |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
275 This alist is used both to find the heading corresponding to |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
276 a given level and to find the level of a given heading.") |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
277 (make-variable-buffer-local 'outline-heading-alist) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
278 |
10950 | 279 ;; This used to count columns rather than characters, but that made ^L |
280 ;; appear to be at level 2 instead of 1. Columns would be better for | |
281 ;; tab handling, but the default regexp doesn't use tabs, and anyone | |
282 ;; who changes the regexp can also redefine the outline-level variable | |
283 ;; as appropriate. | |
284 (defun outline-level () | |
285 "Return the depth to which a statement is nested in the outline. | |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
286 Point must be at the beginning of a header line. |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
287 This is actually either the level specified in `outline-heading-alist' |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
288 or else the number of characters matched by `outline-regexp'." |
10950 | 289 (save-excursion |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
290 (if (not (looking-at outline-regexp)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
291 ;; This should never happen |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
292 1000 |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
293 (or (cdr (assoc (match-string 0) outline-heading-alist)) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
294 (- (match-end 0) (match-beginning 0)))))) |
10950 | 295 |
296 (defun outline-next-preface () | |
297 "Skip forward to just before the next heading line. | |
298 If there's no following heading line, stop before the newline | |
299 at the end of the buffer." | |
300 (if (re-search-forward (concat "\n\\(" outline-regexp "\\)") | |
301 nil 'move) | |
302 (goto-char (match-beginning 0))) | |
20426 | 303 (if (and (bolp) (not (bobp))) |
10950 | 304 (forward-char -1))) |
305 | |
306 (defun outline-next-heading () | |
307 "Move to the next (possibly invisible) heading line." | |
308 (interactive) | |
10998 | 309 (if (re-search-forward (concat "\n\\(" outline-regexp "\\)") |
10950 | 310 nil 'move) |
311 (goto-char (1+ (match-beginning 0))))) | |
312 | |
25177
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
313 (defun outline-previous-heading () |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
314 "Move to the previous (possibly invisible) heading line." |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
315 (interactive) |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
316 (re-search-backward (concat "^\\(" outline-regexp "\\)") |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
317 nil 'move)) |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
318 |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
319 (defsubst outline-invisible-p () |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
320 "Non-nil if the character after point is invisible." |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
321 (get-char-property (point) 'invisible)) |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
322 (defun outline-visible () |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
323 "Obsolete. Use `outline-invisible-p'." |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
324 (not (outline-invisible-p))) |
10950 | 325 |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
326 (defun outline-back-to-heading (&optional invisible-ok) |
10950 | 327 "Move to previous heading line, or beg of this line if it's a heading. |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
328 Only visible heading lines are considered, unless INVISIBLE-OK is non-nil." |
10950 | 329 (beginning-of-line) |
24457
5ab0869ed2c8
(outline-back-to-heading): fix invisible-ok.
Karl Heuer <kwzh@gnu.org>
parents:
24442
diff
changeset
|
330 (or (outline-on-heading-p invisible-ok) |
10950 | 331 (let (found) |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
332 (save-excursion |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
333 (while (not found) |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
334 (or (re-search-backward (concat "^\\(" outline-regexp "\\)") |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
335 nil t) |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
336 (error "before first heading")) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
337 (setq found (and (or invisible-ok (not (outline-invisible-p))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
338 (point))))) |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
339 (goto-char found) |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
340 found))) |
10950 | 341 |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
342 (defun outline-on-heading-p (&optional invisible-ok) |
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
343 "Return t if point is on a (visible) heading line. |
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
344 If INVISIBLE-OK is non-nil, an invisible heading line is ok too." |
10950 | 345 (save-excursion |
346 (beginning-of-line) | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
347 (and (bolp) (or invisible-ok (not (outline-invisible-p))) |
10950 | 348 (looking-at outline-regexp)))) |
349 | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
350 (defun outline-insert-heading () |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
351 "Insert a new heading at same depth at point." |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
352 (interactive) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
353 (let ((head (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
354 (condition-case nil |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
355 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
356 (error (outline-next-heading))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
357 (if (eobp) |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
358 (or (caar outline-heading-alist) "") |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
359 (match-string 0))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
360 (unless (or (string-match "[ \t]\\'" head) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
361 (not (string-match outline-regexp (concat head " ")))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
362 (setq head (concat head " "))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
363 (unless (bolp) (end-of-line) (newline)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
364 (insert head) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
365 (unless (eolp) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
366 (save-excursion (newline-and-indent))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
367 (run-hooks 'outline-insert-heading-hook))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
368 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
369 (defun outline-promote (&optional children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
370 "Promote the current heading higher up the tree. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
371 If prefix argument CHILDREN is given, promote also all the children." |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
372 (interactive "P") |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
373 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
374 (let* ((head (match-string 0)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
375 (level (save-match-data (funcall outline-level))) |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
376 (up-head (or (car (rassoc (1- level) outline-heading-alist)) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
377 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
378 (save-match-data |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
379 (outline-up-heading 1 t) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
380 (match-string 0)))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
381 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
382 (unless (rassoc level outline-heading-alist) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
383 (push (cons head level) outline-heading-alist)) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
384 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
385 (replace-match up-head nil t) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
386 (when children |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
387 (outline-map-tree 'outline-promote level)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
388 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
389 (defun outline-demote (&optional children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
390 "Demote the current heading lower down the tree. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
391 If prefix argument CHILDREN is given, demote also all the children." |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
392 (interactive "P") |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
393 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
394 (let* ((head (match-string 0)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
395 (level (save-match-data (funcall outline-level))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
396 (down-head |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
397 (or (car (rassoc (1+ level) outline-heading-alist)) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
398 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
399 (save-match-data |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
400 (while (and (not (eobp)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
401 (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
402 (outline-next-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
403 (<= (funcall outline-level) level)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
404 (when (eobp) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
405 ;; Try again from the beginning of the buffer. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
406 (goto-char (point-min)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
407 (while (and (not (eobp)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
408 (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
409 (outline-next-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
410 (<= (funcall outline-level) level))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
411 (unless (eobp) (match-string 0)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
412 (save-match-data |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
413 ;; Bummer!! There is no lower heading in the buffer. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
414 ;; Let's try to invent one by repeating the first char. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
415 (let ((new-head (concat (substring head 0 1) head))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
416 (if (string-match (concat "\\`" outline-regexp) new-head) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
417 ;; Why bother checking that it is indeed of lower level ? |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
418 new-head |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
419 ;; Didn't work: keep it as is so it's still a heading. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
420 head)))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
421 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
422 (unless (rassoc level outline-heading-alist) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
423 (push (cons head level) outline-heading-alist)) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
424 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
425 (replace-match down-head nil t) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
426 (when children |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
427 (outline-map-tree 'outline-demote level)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
428 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
429 (defun outline-map-tree (fun level) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
430 "Call FUN for every heading underneath the current one." |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
431 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
432 (while (and (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
433 (outline-next-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
434 (> (funcall outline-level) level)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
435 (not (eobp))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
436 (funcall fun)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
437 |
10950 | 438 (defun outline-end-of-heading () |
439 (if (re-search-forward outline-heading-end-regexp nil 'move) | |
440 (forward-char -1))) | |
441 | |
442 (defun outline-next-visible-heading (arg) | |
443 "Move to the next visible heading line. | |
444 With argument, repeats or can move backward if negative. | |
445 A heading line is one that starts with a `*' (or that | |
446 `outline-regexp' matches)." | |
447 (interactive "p") | |
448 (if (< arg 0) | |
449 (beginning-of-line) | |
450 (end-of-line)) | |
12604
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
451 (while (and (not (bobp)) (< arg 0)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
452 (while (and (not (bobp)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
453 (re-search-backward (concat "^\\(" outline-regexp "\\)") |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
454 nil 'move) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
455 (outline-invisible-p))) |
12604
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
456 (setq arg (1+ arg))) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
457 (while (and (not (eobp)) (> arg 0)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
458 (while (and (not (eobp)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
459 (re-search-forward (concat "^\\(" outline-regexp "\\)") |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
460 nil 'move) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
461 (outline-invisible-p))) |
12604
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
462 (setq arg (1- arg))) |
10950 | 463 (beginning-of-line)) |
464 | |
465 (defun outline-previous-visible-heading (arg) | |
466 "Move to the previous heading line. | |
467 With argument, repeats or can move forward if negative. | |
468 A heading line is one that starts with a `*' (or that | |
469 `outline-regexp' matches)." | |
470 (interactive "p") | |
471 (outline-next-visible-heading (- arg))) | |
472 | |
17249
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
473 (defun outline-mark-subtree () |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
474 "Mark the current subtree in an outlined document. |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
475 This puts point at the start of the current subtree, and mark at the end." |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
476 (interactive) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
477 (let ((beg)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
478 (if (outline-on-heading-p) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
479 ;; we are already looking at a heading |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
480 (beginning-of-line) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
481 ;; else go back to previous heading |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
482 (outline-previous-visible-heading 1)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
483 (setq beg (point)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
484 (outline-end-of-subtree) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
485 (push-mark (point)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
486 (goto-char beg))) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
487 |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
488 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
489 (put 'outline 'reveal-toggle-invisible 'outline-reveal-toggle-invisible) |
10950 | 490 (defun outline-flag-region (from to flag) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
491 "Hide or show lines from FROM to TO, according to FLAG. |
10950 | 492 If FLAG is nil then text is shown, while if FLAG is t the text is hidden." |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
493 (remove-overlays from to 'invisible 'outline) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
494 (when flag |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
495 (let ((o (make-overlay from to))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
496 (overlay-put o 'invisible 'outline) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
497 (overlay-put o 'isearch-open-invisible 'outline-isearch-open-invisible))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
498 ;; Seems only used by lazy-lock. I.e. obsolete. |
13259
11899bfa541c
(outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
12604
diff
changeset
|
499 (run-hooks 'outline-view-change-hook)) |
10996
356f658dbd65
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
10950
diff
changeset
|
500 |
45429
5d3b861665f0
(outline-reveal-toggle-invisible): Reverse the meaning of the second arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41782
diff
changeset
|
501 (defun outline-reveal-toggle-invisible (o hidep) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
502 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
503 (goto-char (overlay-start o)) |
45429
5d3b861665f0
(outline-reveal-toggle-invisible): Reverse the meaning of the second arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41782
diff
changeset
|
504 (if hidep |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
505 ;; When hiding the area again, we could just clean it up and let |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
506 ;; reveal do the rest, by simply doing: |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
507 ;; (remove-overlays (overlay-start o) (overlay-end o) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
508 ;; 'invisible 'outline) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
509 ;; |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
510 ;; That works fine as long as everything is in sync, but if the |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
511 ;; structure of the document is changed while revealing parts of it, |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
512 ;; the resulting behavior can be ugly. I.e. we need to make |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
513 ;; sure that we hide exactly a subtree. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
514 (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
515 (let ((end (overlay-end o))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
516 (delete-overlay o) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
517 (while (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
518 (hide-subtree) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
519 (outline-next-visible-heading 1) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
520 (and (not (eobp)) (< (point) end)))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
521 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
522 ;; When revealing, we just need to reveal sublevels. If point is |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
523 ;; inside one of the sublevels, reveal will call us again. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
524 ;; But we need to preserve the original overlay. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
525 (let ((o1 (copy-overlay o))) |
45429
5d3b861665f0
(outline-reveal-toggle-invisible): Reverse the meaning of the second arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41782
diff
changeset
|
526 (overlay-put o 'invisible nil) ;Show (most of) the text. |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
527 (while (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
528 (show-entry) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
529 (show-children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
530 ;; Normally just the above is needed. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
531 ;; But in odd cases, the above might fail to show anything. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
532 ;; To avoid an infinite loop, we have to make sure that |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
533 ;; *something* gets shown. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
534 (and (equal (overlay-start o) (overlay-start o1)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
535 (< (point) (overlay-end o)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
536 (= 0 (forward-line 1))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
537 ;; If still nothing was shown, just kill the damn thing. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
538 (when (equal (overlay-start o) (overlay-start o1)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
539 ;; I've seen it happen at the end of buffer. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
540 (delete-overlay o1)))))) |
21439
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
541 |
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
542 ;; Function to be set as an outline-isearch-open-invisible' property |
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
543 ;; to the overlay that makes the outline invisible (see |
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
544 ;; `outline-flag-region'). |
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
545 (defun outline-isearch-open-invisible (overlay) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
546 ;; We rely on the fact that isearch places point on the matched text. |
33797
b5df14d31790
(outline-flag-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31986
diff
changeset
|
547 (show-entry)) |
10950 | 548 |
549 (defun hide-entry () | |
550 "Hide the body directly following this heading." | |
551 (interactive) | |
552 (outline-back-to-heading) | |
553 (outline-end-of-heading) | |
554 (save-excursion | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
555 (outline-flag-region (point) (progn (outline-next-preface) (point)) t))) |
10950 | 556 |
557 (defun show-entry () | |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
558 "Show the body directly following this heading. |
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
559 Show the heading too, if it is currently invisible." |
10950 | 560 (interactive) |
561 (save-excursion | |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
562 (outline-back-to-heading t) |
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
563 (outline-flag-region (1- (point)) |
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
564 (progn (outline-next-preface) (point)) nil))) |
10950 | 565 |
566 (defun hide-body () | |
567 "Hide all of buffer except headings." | |
568 (interactive) | |
569 (hide-region-body (point-min) (point-max))) | |
570 | |
571 (defun hide-region-body (start end) | |
572 "Hide all body lines in the region, but not headings." | |
23366 | 573 ;; Nullify the hook to avoid repeated calls to `outline-flag-region' |
574 ;; wasting lots of time running `lazy-lock-fontify-after-outline' | |
575 ;; and run the hook finally. | |
576 (let (outline-view-change-hook) | |
577 (save-excursion | |
578 (save-restriction | |
579 (narrow-to-region start end) | |
580 (goto-char (point-min)) | |
581 (if (outline-on-heading-p) | |
582 (outline-end-of-heading)) | |
583 (while (not (eobp)) | |
584 (outline-flag-region (point) | |
585 (progn (outline-next-preface) (point)) t) | |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
586 (unless (eobp) |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
587 (forward-char (if (looking-at "\n\n") 2 1)) |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
588 (outline-end-of-heading)))))) |
23366 | 589 (run-hooks 'outline-view-change-hook)) |
10950 | 590 |
591 (defun show-all () | |
592 "Show all of the text in the buffer." | |
593 (interactive) | |
594 (outline-flag-region (point-min) (point-max) nil)) | |
595 | |
596 (defun hide-subtree () | |
597 "Hide everything after this heading at deeper levels." | |
598 (interactive) | |
599 (outline-flag-subtree t)) | |
600 | |
601 (defun hide-leaves () | |
602 "Hide all body after this heading at deeper levels." | |
603 (interactive) | |
604 (outline-back-to-heading) | |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
605 (save-excursion |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
606 (outline-end-of-heading) |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
607 (hide-region-body (point) (progn (outline-end-of-subtree) (point))))) |
10950 | 608 |
609 (defun show-subtree () | |
610 "Show everything after this heading at deeper levels." | |
611 (interactive) | |
612 (outline-flag-subtree nil)) | |
613 | |
614 (defun hide-sublevels (levels) | |
615 "Hide everything but the top LEVELS levels of headers, in whole buffer." | |
616 (interactive "p") | |
617 (if (< levels 1) | |
618 (error "Must keep at least one level of headers")) | |
619 (setq levels (1- levels)) | |
23366 | 620 (let (outline-view-change-hook) |
621 (save-excursion | |
622 (goto-char (point-min)) | |
623 ;; Keep advancing to the next top-level heading. | |
624 (while (or (and (bobp) (outline-on-heading-p)) | |
625 (outline-next-heading)) | |
626 (let ((end (save-excursion (outline-end-of-subtree) (point)))) | |
627 ;; Hide everything under that. | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
628 (outline-end-of-heading) |
23366 | 629 (outline-flag-region (point) end t) |
630 ;; Show the first LEVELS levels under that. | |
631 (if (> levels 0) | |
632 (show-children levels)) | |
633 ;; Move to the next, since we already found it. | |
634 (goto-char end))))) | |
635 (run-hooks 'outline-view-change-hook)) | |
10950 | 636 |
637 (defun hide-other () | |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
638 "Hide everything except current body and parent and top-level headings." |
10950 | 639 (interactive) |
640 (hide-sublevels 1) | |
23366 | 641 (let (outline-view-change-hook) |
642 (save-excursion | |
643 (outline-back-to-heading t) | |
644 (show-entry) | |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
645 (while (condition-case nil (progn (outline-up-heading 1) (not (bobp))) |
23366 | 646 (error nil)) |
647 (outline-flag-region (1- (point)) | |
648 (save-excursion (forward-line 1) (point)) | |
649 nil)))) | |
650 (run-hooks 'outline-view-change-hook)) | |
10950 | 651 |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
652 (defun outline-toggle-children () |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
653 "Show or hide the current subtree depending on its current state." |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
654 (interactive) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
655 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
656 (if (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
657 (end-of-line) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
658 (not (outline-invisible-p))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
659 (hide-subtree) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
660 (show-children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
661 (show-entry))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
662 |
10950 | 663 (defun outline-flag-subtree (flag) |
664 (save-excursion | |
665 (outline-back-to-heading) | |
666 (outline-end-of-heading) | |
667 (outline-flag-region (point) | |
668 (progn (outline-end-of-subtree) (point)) | |
669 flag))) | |
670 | |
671 (defun outline-end-of-subtree () | |
672 (outline-back-to-heading) | |
673 (let ((opoint (point)) | |
674 (first t) | |
675 (level (funcall outline-level))) | |
676 (while (and (not (eobp)) | |
677 (or first (> (funcall outline-level) level))) | |
678 (setq first nil) | |
679 (outline-next-heading)) | |
680 (if (bolp) | |
681 (progn | |
682 ;; Go to end of line before heading | |
683 (forward-char -1) | |
684 (if (bolp) | |
685 ;; leave blank line before heading | |
686 (forward-char -1)))))) | |
687 | |
688 (defun show-branches () | |
689 "Show all subheadings of this heading, but not their bodies." | |
690 (interactive) | |
691 (show-children 1000)) | |
692 | |
693 (defun show-children (&optional level) | |
694 "Show all direct subheadings of this heading. | |
695 Prefix arg LEVEL is how many levels below the current level should be shown. | |
696 Default is enough to cause the following heading to appear." | |
697 (interactive "P") | |
698 (setq level | |
699 (if level (prefix-numeric-value level) | |
700 (save-excursion | |
701 (outline-back-to-heading) | |
702 (let ((start-level (funcall outline-level))) | |
703 (outline-next-heading) | |
704 (if (eobp) | |
705 1 | |
706 (max 1 (- (funcall outline-level) start-level))))))) | |
23366 | 707 (let (outline-view-change-hook) |
708 (save-excursion | |
709 (save-restriction | |
710 (outline-back-to-heading) | |
711 (setq level (+ level (funcall outline-level))) | |
712 (narrow-to-region (point) | |
713 (progn (outline-end-of-subtree) | |
714 (if (eobp) (point-max) (1+ (point))))) | |
715 (goto-char (point-min)) | |
716 (while (and (not (eobp)) | |
717 (progn | |
718 (outline-next-heading) | |
719 (not (eobp)))) | |
720 (if (<= (funcall outline-level) level) | |
721 (save-excursion | |
722 (outline-flag-region (save-excursion | |
723 (forward-char -1) | |
724 (if (bolp) | |
725 (forward-char -1)) | |
726 (point)) | |
727 (progn (outline-end-of-heading) (point)) | |
728 nil))))))) | |
729 (run-hooks 'outline-view-change-hook)) | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
730 |
10950 | 731 |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
732 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
733 (defun outline-up-heading (arg &optional invisible-ok) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
734 "Move to the visible heading line of which the present line is a subheading. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
735 With argument, move up ARG levels. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
736 If INVISIBLE-OK is non-nil, also consider invisible lines." |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
737 (interactive "p") |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
738 (outline-back-to-heading invisible-ok) |
25148
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
739 (if (eq (funcall outline-level) 1) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
740 (error "Already at top level of the outline")) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
741 (while (and (> (funcall outline-level) 1) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
742 (> arg 0) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
743 (not (bobp))) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
744 (let ((present-level (funcall outline-level))) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
745 (while (and (not (< (funcall outline-level) present-level)) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
746 (not (bobp))) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
747 (if invisible-ok |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
748 (outline-previous-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
749 (outline-previous-visible-heading 1))) |
10950 | 750 (setq arg (- arg 1))))) |
751 | |
752 (defun outline-forward-same-level (arg) | |
753 "Move forward to the ARG'th subheading at same level as this one. | |
754 Stop at the first and last subheadings of a superior heading." | |
755 (interactive "p") | |
756 (outline-back-to-heading) | |
757 (while (> arg 0) | |
758 (let ((point-to-move-to (save-excursion | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
759 (outline-get-next-sibling)))) |
10950 | 760 (if point-to-move-to |
761 (progn | |
762 (goto-char point-to-move-to) | |
763 (setq arg (1- arg))) | |
764 (progn | |
765 (setq arg 0) | |
15466
5affe3230dfb
(outline-up-heading): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
766 (error "No following same-level heading")))))) |
10950 | 767 |
768 (defun outline-get-next-sibling () | |
769 "Move to next heading of the same level, and return point or nil if none." | |
770 (let ((level (funcall outline-level))) | |
771 (outline-next-visible-heading 1) | |
772 (while (and (> (funcall outline-level) level) | |
773 (not (eobp))) | |
774 (outline-next-visible-heading 1)) | |
775 (if (< (funcall outline-level) level) | |
776 nil | |
777 (point)))) | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
778 |
10950 | 779 (defun outline-backward-same-level (arg) |
780 "Move backward to the ARG'th subheading at same level as this one. | |
781 Stop at the first and last subheadings of a superior heading." | |
782 (interactive "p") | |
783 (outline-back-to-heading) | |
784 (while (> arg 0) | |
785 (let ((point-to-move-to (save-excursion | |
786 (outline-get-last-sibling)))) | |
787 (if point-to-move-to | |
788 (progn | |
789 (goto-char point-to-move-to) | |
790 (setq arg (1- arg))) | |
791 (progn | |
792 (setq arg 0) | |
15466
5affe3230dfb
(outline-up-heading): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
793 (error "No previous same-level heading")))))) |
10950 | 794 |
795 (defun outline-get-last-sibling () | |
24442
252453d80f53
(outline-get-last-sibling): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23366
diff
changeset
|
796 "Move to previous heading of the same level, and return point or nil if none." |
10950 | 797 (let ((level (funcall outline-level))) |
798 (outline-previous-visible-heading 1) | |
799 (while (and (> (funcall outline-level) level) | |
800 (not (bobp))) | |
801 (outline-previous-visible-heading 1)) | |
802 (if (< (funcall outline-level) level) | |
803 nil | |
804 (point)))) | |
27204
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
805 |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
806 (defun outline-headers-as-kill (beg end) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
807 "Save the visible outline headers in region at the start of the kill ring. |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
808 |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
809 Text shown between the headers isn't copied. Two newlines are |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
810 inserted between saved headers. Yanking the result may be a |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
811 convenient way to make a table of contents of the buffer." |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
812 (interactive "r") |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
813 (save-excursion |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
814 (save-restriction |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
815 (narrow-to-region beg end) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
816 (goto-char (point-min)) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
817 (let ((buffer (current-buffer)) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
818 start end) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
819 (with-temp-buffer |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
820 (with-current-buffer buffer |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
821 ;; Boundary condition: starting on heading: |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
822 (when (outline-on-heading-p) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
823 (outline-back-to-heading) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
824 (setq start (point) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
825 end (progn (outline-end-of-heading) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
826 (point))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
827 (insert-buffer-substring buffer start end) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
828 (insert "\n\n"))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
829 (let ((temp-buffer (current-buffer))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
830 (with-current-buffer buffer |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
831 (while (outline-next-heading) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
832 (unless (outline-invisible-p) |
27204
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
833 (setq start (point) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
834 end (progn (outline-end-of-heading) (point))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
835 (with-current-buffer temp-buffer |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
836 (insert-buffer-substring buffer start end) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
837 (insert "\n\n")))))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
838 (kill-new (buffer-string))))))) |
10950 | 839 |
840 (provide 'outline) | |
11736
07ac8009368c
Provide noutline as well as outline.
Richard M. Stallman <rms@gnu.org>
parents:
11713
diff
changeset
|
841 (provide 'noutline) |
10950 | 842 |
843 ;;; outline.el ends here |