Mercurial > emacs
annotate lisp/textmodes/outline.el @ 89087:bab63e51dbaa
(set-case-syntax-pair): Remove check on byte
lengths.
author | Dave Love <fx@gnu.org> |
---|---|
date | Sat, 07 Sep 2002 23:54:43 +0000 |
parents | eea433180987 |
children | 5d3b861665f0 |
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) |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
85 map)) |
10950 | 86 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
87 (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
|
88 (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
|
89 |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
90 (define-key map [hide] (cons "Hide" (make-sparse-keymap "Hide"))) |
10950 | 91 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
92 (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
|
93 (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
|
94 (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
|
95 (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
|
96 (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
|
97 (define-key map [hide hide-leaves] '("Hide Leaves" . hide-leaves)) |
10950 | 98 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
99 (define-key map [show] (cons "Show" (make-sparse-keymap "Show"))) |
10950 | 100 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
101 (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
|
102 (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
|
103 (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
|
104 (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
|
105 (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
|
106 |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
107 (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
|
108 (cons "Headings" (make-sparse-keymap "Headings"))) |
10950 | 109 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
110 (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
|
111 '(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
|
112 :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
|
113 (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
|
114 '("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
|
115 (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
|
116 '("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
|
117 (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
|
118 '("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
|
119 (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
|
120 '("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
|
121 (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
|
122 '("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
|
123 map)) |
10950 | 124 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
125 (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
|
126 (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
|
127 (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
|
128 (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
|
129 (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
|
130 ;; 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
|
131 (cdr |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
132 ;; 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
|
133 (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
|
134 (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
|
135 (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
|
136 ;; 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
|
137 ;; 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
|
138 (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
|
139 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
|
140 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 |
10950 | 142 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
143 (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
|
144 (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
|
145 (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
|
146 (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
|
147 map)) |
10950 | 148 |
149 (defvar outline-font-lock-keywords | |
20175
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
150 '(;; |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
151 ;; Highlight headings according to the level. |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
152 (eval . (list (concat "^" outline-regexp ".+") |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
153 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
|
154 ;; FIXME: this is silly! |
20175
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
155 '((1 . font-lock-function-name-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
156 (2 . font-lock-variable-name-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
157 (3 . font-lock-keyword-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
158 (4 . font-lock-builtin-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
159 (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
|
160 (6 . font-lock-constant-face) |
20175
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
161 (7 . font-lock-type-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
162 (8 . font-lock-string-face)))) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
163 font-lock-warning-face) |
ea977d99058b
(outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents:
20062
diff
changeset
|
164 nil t))) |
10950 | 165 "Additional expressions to highlight in Outline mode.") |
166 | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
167 (defun outline-font-lock-level () |
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
168 (let ((count 1)) |
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
169 (save-excursion |
25148
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
170 (outline-back-to-heading t) |
37751
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
171 (while (and (not (bobp)) |
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
172 (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
|
173 (outline-up-heading 1 t) |
37751
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
174 (setq count (1+ count))) |
ac83181a33d0
(outline-font-lock-level): Remove the
Gerd Moellmann <gerd@gnu.org>
parents:
35485
diff
changeset
|
175 count))) |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
176 |
13259
11899bfa541c
(outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
12604
diff
changeset
|
177 (defvar outline-view-change-hook nil |
11899bfa541c
(outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
12604
diff
changeset
|
178 "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
|
179 |
17688
b02bb31c98b0
(outline-mode): Autoload cookie added.
Richard M. Stallman <rms@gnu.org>
parents:
17687
diff
changeset
|
180 ;;;###autoload |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
181 (define-derived-mode outline-mode text-mode "Outline" |
10950 | 182 "Set major mode for editing outlines with selective display. |
183 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
|
184 two for subheadings, etc. Lines not starting with asterisks are body lines. |
10950 | 185 |
186 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
|
187 invisible, or visible again. Invisible lines are attached to the end |
10950 | 188 of the heading, so they move with it, if the line is killed and yanked |
189 back. A heading with text hidden under it is marked with an ellipsis (...). | |
190 | |
191 Commands:\\<outline-mode-map> | |
192 \\[outline-next-visible-heading] outline-next-visible-heading move by visible headings | |
193 \\[outline-previous-visible-heading] outline-previous-visible-heading | |
194 \\[outline-forward-same-level] outline-forward-same-level similar but skip subheadings | |
195 \\[outline-backward-same-level] outline-backward-same-level | |
196 \\[outline-up-heading] outline-up-heading move from subheading to heading | |
197 | |
198 \\[hide-body] make all text invisible (not headings). | |
199 \\[show-all] make everything in buffer visible. | |
200 | |
201 The remaining commands are used when point is on a heading line. | |
202 They apply to some of the body or subheadings of that heading. | |
203 \\[hide-subtree] hide-subtree make body and subheadings invisible. | |
204 \\[show-subtree] show-subtree make body and subheadings visible. | |
205 \\[show-children] show-children make direct subheadings visible. | |
206 No effect on body, or subheadings 2 or more levels down. | |
207 With arg N, affects subheadings N levels down. | |
208 \\[hide-entry] make immediately following body invisible. | |
209 \\[show-entry] make it visible. | |
210 \\[hide-leaves] make body under heading and under its subheadings invisible. | |
211 The subheadings remain visible. | |
212 \\[show-branches] make all subheadings at all levels visible. | |
213 | |
214 The variable `outline-regexp' can be changed to control what is a heading. | |
215 A line is a heading if `outline-regexp' matches something at the | |
216 beginning of the line. The longer the match, the deeper the level. | |
217 | |
218 Turning on outline mode calls the value of `text-mode-hook' and then of | |
219 `outline-mode-hook', if they are non-nil." | |
220 (make-local-variable 'line-move-ignore-invisible) | |
221 (setq line-move-ignore-invisible t) | |
222 ;; 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
|
223 (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
|
224 (set (make-local-variable 'paragraph-start) |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
225 (concat paragraph-start "\\|\\(" outline-regexp "\\)")) |
10950 | 226 ;; 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
|
227 (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
|
228 (set (make-local-variable 'paragraph-separate) |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
229 (concat paragraph-separate "\\|\\(" outline-regexp "\\)")) |
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
230 (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
|
231 '(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
|
232 (setq imenu-generic-expression |
39238
7370effcd55c
(outline-mode): Use `^' and a shy group
Gerd Moellmann <gerd@gnu.org>
parents:
37920
diff
changeset
|
233 (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
|
234 (add-hook 'change-major-mode-hook 'show-all nil t)) |
10950 | 235 |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
236 (defcustom outline-minor-mode-prefix "\C-c@" |
10950 | 237 "*Prefix key to use for Outline commands in Outline minor mode. |
238 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
|
239 After that, changing the prefix key requires manipulating keymaps." |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
240 :type 'string |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
241 :group 'outlines) |
10950 | 242 |
17688
b02bb31c98b0
(outline-mode): Autoload cookie added.
Richard M. Stallman <rms@gnu.org>
parents:
17687
diff
changeset
|
243 ;;;###autoload |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
244 (define-minor-mode outline-minor-mode |
10950 | 245 "Toggle Outline minor mode. |
246 With arg, turn Outline minor mode on if arg is positive, off otherwise. | |
247 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
|
248 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
|
249 (cons outline-minor-mode-prefix outline-mode-prefix-map)) |
10950 | 250 (if outline-minor-mode |
251 (progn | |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
252 ;; 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
|
253 (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
|
254 (lambda () (outline-minor-mode -1)) |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
255 nil t) |
31986
350d5ee0e430
(outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30881
diff
changeset
|
256 (set (make-local-variable 'line-move-ignore-invisible) t) |
10950 | 257 ;; 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
|
258 (add-to-invisibility-spec '(outline . t))) |
10950 | 259 (setq line-move-ignore-invisible nil) |
260 ;; 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
|
261 (remove-from-invisibility-spec '(outline . t)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
262 ;; 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
|
263 (show-all))) |
10950 | 264 |
17687
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
265 (defcustom outline-level 'outline-level |
e6d5322b810c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17249
diff
changeset
|
266 "*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
|
267 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
|
268 :type 'function |
17690
3fa9da85b3ea
Fix customization change.
Richard M. Stallman <rms@gnu.org>
parents:
17688
diff
changeset
|
269 :group 'outlines) |
10950 | 270 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
271 (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
|
272 "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
|
273 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
|
274 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
|
275 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
|
276 (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
|
277 |
10950 | 278 ;; This used to count columns rather than characters, but that made ^L |
279 ;; appear to be at level 2 instead of 1. Columns would be better for | |
280 ;; tab handling, but the default regexp doesn't use tabs, and anyone | |
281 ;; who changes the regexp can also redefine the outline-level variable | |
282 ;; as appropriate. | |
283 (defun outline-level () | |
284 "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
|
285 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
|
286 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
|
287 or else the number of characters matched by `outline-regexp'." |
10950 | 288 (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
|
289 (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
|
290 ;; 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
|
291 1000 |
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
292 (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
|
293 (- (match-end 0) (match-beginning 0)))))) |
10950 | 294 |
295 (defun outline-next-preface () | |
296 "Skip forward to just before the next heading line. | |
297 If there's no following heading line, stop before the newline | |
298 at the end of the buffer." | |
299 (if (re-search-forward (concat "\n\\(" outline-regexp "\\)") | |
300 nil 'move) | |
301 (goto-char (match-beginning 0))) | |
20426 | 302 (if (and (bolp) (not (bobp))) |
10950 | 303 (forward-char -1))) |
304 | |
305 (defun outline-next-heading () | |
306 "Move to the next (possibly invisible) heading line." | |
307 (interactive) | |
10998 | 308 (if (re-search-forward (concat "\n\\(" outline-regexp "\\)") |
10950 | 309 nil 'move) |
310 (goto-char (1+ (match-beginning 0))))) | |
311 | |
25177
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
312 (defun outline-previous-heading () |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
313 "Move to the previous (possibly invisible) heading line." |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
314 (interactive) |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
315 (re-search-backward (concat "^\\(" outline-regexp "\\)") |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
316 nil 'move)) |
0ac130f2181a
(outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
25148
diff
changeset
|
317 |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
318 (defsubst outline-invisible-p () |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
319 "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
|
320 (get-char-property (point) 'invisible)) |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
321 (defun outline-visible () |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
322 "Obsolete. Use `outline-invisible-p'." |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
323 (not (outline-invisible-p))) |
10950 | 324 |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
325 (defun outline-back-to-heading (&optional invisible-ok) |
10950 | 326 "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
|
327 Only visible heading lines are considered, unless INVISIBLE-OK is non-nil." |
10950 | 328 (beginning-of-line) |
24457
5ab0869ed2c8
(outline-back-to-heading): fix invisible-ok.
Karl Heuer <kwzh@gnu.org>
parents:
24442
diff
changeset
|
329 (or (outline-on-heading-p invisible-ok) |
10950 | 330 (let (found) |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
331 (save-excursion |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
332 (while (not found) |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
333 (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
|
334 nil t) |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
335 (error "before first heading")) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
336 (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
|
337 (point))))) |
15518
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
338 (goto-char found) |
d01e58c9e431
(outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents:
15466
diff
changeset
|
339 found))) |
10950 | 340 |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
341 (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
|
342 "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
|
343 If INVISIBLE-OK is non-nil, an invisible heading line is ok too." |
10950 | 344 (save-excursion |
345 (beginning-of-line) | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
346 (and (bolp) (or invisible-ok (not (outline-invisible-p))) |
10950 | 347 (looking-at outline-regexp)))) |
348 | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
349 (defun outline-insert-heading () |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
350 "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
|
351 (interactive) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
352 (let ((head (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
353 (condition-case nil |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
354 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
355 (error (outline-next-heading))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
356 (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
|
357 (or (caar outline-heading-alist) "") |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
358 (match-string 0))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
359 (unless (or (string-match "[ \t]\\'" head) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
360 (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
|
361 (setq head (concat head " "))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
362 (unless (bolp) (end-of-line) (newline)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
363 (insert head) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
364 (unless (eolp) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
365 (save-excursion (newline-and-indent))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
366 (run-hooks 'outline-insert-heading-hook))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
367 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
368 (defun outline-promote (&optional children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
369 "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
|
370 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
|
371 (interactive "P") |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
372 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
373 (let* ((head (match-string 0)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
374 (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
|
375 (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
|
376 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
377 (save-match-data |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
378 (outline-up-heading 1 t) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
379 (match-string 0)))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
380 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
381 (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
|
382 (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
|
383 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
384 (replace-match up-head nil t) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
385 (when children |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
386 (outline-map-tree 'outline-promote level)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
387 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
388 (defun outline-demote (&optional children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
389 "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
|
390 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
|
391 (interactive "P") |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
392 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
393 (let* ((head (match-string 0)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
394 (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
|
395 (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
|
396 (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
|
397 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
398 (save-match-data |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
399 (while (and (not (eobp)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
400 (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
401 (outline-next-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
402 (<= (funcall outline-level) level)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
403 (when (eobp) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
404 ;; 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
|
405 (goto-char (point-min)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
406 (while (and (not (eobp)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
407 (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
408 (outline-next-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
409 (<= (funcall outline-level) level))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
410 (unless (eobp) (match-string 0)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
411 (save-match-data |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
412 ;; 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
|
413 ;; 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
|
414 (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
|
415 (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
|
416 ;; 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
|
417 new-head |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
418 ;; 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
|
419 head)))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
420 |
41782
eea433180987
(outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41700
diff
changeset
|
421 (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
|
422 (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
|
423 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
424 (replace-match down-head nil t) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
425 (when children |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
426 (outline-map-tree 'outline-demote level)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
427 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
428 (defun outline-map-tree (fun level) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
429 "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
|
430 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
431 (while (and (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
432 (outline-next-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
433 (> (funcall outline-level) level)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
434 (not (eobp))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
435 (funcall fun)))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
436 |
10950 | 437 (defun outline-end-of-heading () |
438 (if (re-search-forward outline-heading-end-regexp nil 'move) | |
439 (forward-char -1))) | |
440 | |
441 (defun outline-next-visible-heading (arg) | |
442 "Move to the next visible heading line. | |
443 With argument, repeats or can move backward if negative. | |
444 A heading line is one that starts with a `*' (or that | |
445 `outline-regexp' matches)." | |
446 (interactive "p") | |
447 (if (< arg 0) | |
448 (beginning-of-line) | |
449 (end-of-line)) | |
12604
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
450 (while (and (not (bobp)) (< arg 0)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
451 (while (and (not (bobp)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
452 (re-search-backward (concat "^\\(" outline-regexp "\\)") |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
453 nil 'move) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
454 (outline-invisible-p))) |
12604
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
455 (setq arg (1+ arg))) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
456 (while (and (not (eobp)) (> arg 0)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
457 (while (and (not (eobp)) |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
458 (re-search-forward (concat "^\\(" outline-regexp "\\)") |
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
459 nil 'move) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
460 (outline-invisible-p))) |
12604
140e46e751a0
(outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents:
11736
diff
changeset
|
461 (setq arg (1- arg))) |
10950 | 462 (beginning-of-line)) |
463 | |
464 (defun outline-previous-visible-heading (arg) | |
465 "Move to the previous heading line. | |
466 With argument, repeats or can move forward if negative. | |
467 A heading line is one that starts with a `*' (or that | |
468 `outline-regexp' matches)." | |
469 (interactive "p") | |
470 (outline-next-visible-heading (- arg))) | |
471 | |
17249
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
472 (defun outline-mark-subtree () |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
473 "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
|
474 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
|
475 (interactive) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
476 (let ((beg)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
477 (if (outline-on-heading-p) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
478 ;; we are already looking at a heading |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
479 (beginning-of-line) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
480 ;; else go back to previous heading |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
481 (outline-previous-visible-heading 1)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
482 (setq beg (point)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
483 (outline-end-of-subtree) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
484 (push-mark (point)) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
485 (goto-char beg))) |
2dfc334bdc6f
(outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents:
17248
diff
changeset
|
486 |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
487 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
488 (put 'outline 'reveal-toggle-invisible 'outline-reveal-toggle-invisible) |
10950 | 489 (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
|
490 "Hide or show lines from FROM to TO, according to FLAG. |
10950 | 491 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
|
492 (remove-overlays from to 'invisible 'outline) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
493 (when flag |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
494 (let ((o (make-overlay from to))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
495 (overlay-put o 'invisible 'outline) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
496 (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
|
497 ;; 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
|
498 (run-hooks 'outline-view-change-hook)) |
10996
356f658dbd65
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
10950
diff
changeset
|
499 |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
500 (defun outline-reveal-toggle-invisible (o revealp) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
501 (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
502 (goto-char (overlay-start o)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
503 (if (null revealp) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
504 ;; 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
|
505 ;; 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
|
506 ;; (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
|
507 ;; 'invisible 'outline) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
508 ;; |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
509 ;; 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
|
510 ;; 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
|
511 ;; 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
|
512 ;; 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
|
513 (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
514 (let ((end (overlay-end o))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
515 (delete-overlay o) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
516 (while (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
517 (hide-subtree) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
518 (outline-next-visible-heading 1) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
519 (and (not (eobp)) (< (point) end)))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
520 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
521 ;; 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
|
522 ;; 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
|
523 ;; 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
|
524 (let ((o1 (copy-overlay o))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
525 (overlay-put o1 'invisible 'outline) ;We rehide some of the text. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
526 (while (progn |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
527 (show-entry) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
528 (show-children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
529 ;; Normally just the above is needed. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
530 ;; 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
|
531 ;; 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
|
532 ;; *something* gets shown. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
533 (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
|
534 (< (point) (overlay-end o)) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
535 (= 0 (forward-line 1))))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
536 ;; 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
|
537 (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
|
538 ;; 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
|
539 (delete-overlay o1)))))) |
21439
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
540 |
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
541 ;; 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
|
542 ;; to the overlay that makes the outline invisible (see |
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
543 ;; `outline-flag-region'). |
2280d06ab327
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21438
diff
changeset
|
544 (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
|
545 ;; 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
|
546 (show-entry)) |
10950 | 547 |
548 (defun hide-entry () | |
549 "Hide the body directly following this heading." | |
550 (interactive) | |
551 (outline-back-to-heading) | |
552 (outline-end-of-heading) | |
553 (save-excursion | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
554 (outline-flag-region (point) (progn (outline-next-preface) (point)) t))) |
10950 | 555 |
556 (defun show-entry () | |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
557 "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
|
558 Show the heading too, if it is currently invisible." |
10950 | 559 (interactive) |
560 (save-excursion | |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
561 (outline-back-to-heading t) |
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
562 (outline-flag-region (1- (point)) |
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
563 (progn (outline-next-preface) (point)) nil))) |
10950 | 564 |
565 (defun hide-body () | |
566 "Hide all of buffer except headings." | |
567 (interactive) | |
568 (hide-region-body (point-min) (point-max))) | |
569 | |
570 (defun hide-region-body (start end) | |
571 "Hide all body lines in the region, but not headings." | |
23366 | 572 ;; Nullify the hook to avoid repeated calls to `outline-flag-region' |
573 ;; wasting lots of time running `lazy-lock-fontify-after-outline' | |
574 ;; and run the hook finally. | |
575 (let (outline-view-change-hook) | |
576 (save-excursion | |
577 (save-restriction | |
578 (narrow-to-region start end) | |
579 (goto-char (point-min)) | |
580 (if (outline-on-heading-p) | |
581 (outline-end-of-heading)) | |
582 (while (not (eobp)) | |
583 (outline-flag-region (point) | |
584 (progn (outline-next-preface) (point)) t) | |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
585 (unless (eobp) |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
586 (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
|
587 (outline-end-of-heading)))))) |
23366 | 588 (run-hooks 'outline-view-change-hook)) |
10950 | 589 |
590 (defun show-all () | |
591 "Show all of the text in the buffer." | |
592 (interactive) | |
593 (outline-flag-region (point-min) (point-max) nil)) | |
594 | |
595 (defun hide-subtree () | |
596 "Hide everything after this heading at deeper levels." | |
597 (interactive) | |
598 (outline-flag-subtree t)) | |
599 | |
600 (defun hide-leaves () | |
601 "Hide all body after this heading at deeper levels." | |
602 (interactive) | |
603 (outline-back-to-heading) | |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
604 (save-excursion |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
605 (outline-end-of-heading) |
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
606 (hide-region-body (point) (progn (outline-end-of-subtree) (point))))) |
10950 | 607 |
608 (defun show-subtree () | |
609 "Show everything after this heading at deeper levels." | |
610 (interactive) | |
611 (outline-flag-subtree nil)) | |
612 | |
613 (defun hide-sublevels (levels) | |
614 "Hide everything but the top LEVELS levels of headers, in whole buffer." | |
615 (interactive "p") | |
616 (if (< levels 1) | |
617 (error "Must keep at least one level of headers")) | |
618 (setq levels (1- levels)) | |
23366 | 619 (let (outline-view-change-hook) |
620 (save-excursion | |
621 (goto-char (point-min)) | |
622 ;; Keep advancing to the next top-level heading. | |
623 (while (or (and (bobp) (outline-on-heading-p)) | |
624 (outline-next-heading)) | |
625 (let ((end (save-excursion (outline-end-of-subtree) (point)))) | |
626 ;; Hide everything under that. | |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
627 (outline-end-of-heading) |
23366 | 628 (outline-flag-region (point) end t) |
629 ;; Show the first LEVELS levels under that. | |
630 (if (> levels 0) | |
631 (show-children levels)) | |
632 ;; Move to the next, since we already found it. | |
633 (goto-char end))))) | |
634 (run-hooks 'outline-view-change-hook)) | |
10950 | 635 |
636 (defun hide-other () | |
20062
bf3f4dc09cc0
(outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents:
19959
diff
changeset
|
637 "Hide everything except current body and parent and top-level headings." |
10950 | 638 (interactive) |
639 (hide-sublevels 1) | |
23366 | 640 (let (outline-view-change-hook) |
641 (save-excursion | |
642 (outline-back-to-heading t) | |
643 (show-entry) | |
37920
abf444fe5166
(outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37751
diff
changeset
|
644 (while (condition-case nil (progn (outline-up-heading 1) (not (bobp))) |
23366 | 645 (error nil)) |
646 (outline-flag-region (1- (point)) | |
647 (save-excursion (forward-line 1) (point)) | |
648 nil)))) | |
649 (run-hooks 'outline-view-change-hook)) | |
10950 | 650 |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
651 (defun outline-toggle-children () |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
652 "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
|
653 (interactive) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
654 (outline-back-to-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
655 (if (save-excursion |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
656 (end-of-line) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
657 (not (outline-invisible-p))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
658 (hide-subtree) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
659 (show-children) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
660 (show-entry))) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
661 |
10950 | 662 (defun outline-flag-subtree (flag) |
663 (save-excursion | |
664 (outline-back-to-heading) | |
665 (outline-end-of-heading) | |
666 (outline-flag-region (point) | |
667 (progn (outline-end-of-subtree) (point)) | |
668 flag))) | |
669 | |
670 (defun outline-end-of-subtree () | |
671 (outline-back-to-heading) | |
672 (let ((opoint (point)) | |
673 (first t) | |
674 (level (funcall outline-level))) | |
675 (while (and (not (eobp)) | |
676 (or first (> (funcall outline-level) level))) | |
677 (setq first nil) | |
678 (outline-next-heading)) | |
679 (if (bolp) | |
680 (progn | |
681 ;; Go to end of line before heading | |
682 (forward-char -1) | |
683 (if (bolp) | |
684 ;; leave blank line before heading | |
685 (forward-char -1)))))) | |
686 | |
687 (defun show-branches () | |
688 "Show all subheadings of this heading, but not their bodies." | |
689 (interactive) | |
690 (show-children 1000)) | |
691 | |
692 (defun show-children (&optional level) | |
693 "Show all direct subheadings of this heading. | |
694 Prefix arg LEVEL is how many levels below the current level should be shown. | |
695 Default is enough to cause the following heading to appear." | |
696 (interactive "P") | |
697 (setq level | |
698 (if level (prefix-numeric-value level) | |
699 (save-excursion | |
700 (outline-back-to-heading) | |
701 (let ((start-level (funcall outline-level))) | |
702 (outline-next-heading) | |
703 (if (eobp) | |
704 1 | |
705 (max 1 (- (funcall outline-level) start-level))))))) | |
23366 | 706 (let (outline-view-change-hook) |
707 (save-excursion | |
708 (save-restriction | |
709 (outline-back-to-heading) | |
710 (setq level (+ level (funcall outline-level))) | |
711 (narrow-to-region (point) | |
712 (progn (outline-end-of-subtree) | |
713 (if (eobp) (point-max) (1+ (point))))) | |
714 (goto-char (point-min)) | |
715 (while (and (not (eobp)) | |
716 (progn | |
717 (outline-next-heading) | |
718 (not (eobp)))) | |
719 (if (<= (funcall outline-level) level) | |
720 (save-excursion | |
721 (outline-flag-region (save-excursion | |
722 (forward-char -1) | |
723 (if (bolp) | |
724 (forward-char -1)) | |
725 (point)) | |
726 (progn (outline-end-of-heading) (point)) | |
727 nil))))))) | |
728 (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
|
729 |
10950 | 730 |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
731 |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
732 (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
|
733 "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
|
734 With argument, move up ARG levels. |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
735 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
|
736 (interactive "p") |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
737 (outline-back-to-heading invisible-ok) |
25148
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
738 (if (eq (funcall outline-level) 1) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
739 (error "Already at top level of the outline")) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
740 (while (and (> (funcall outline-level) 1) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
741 (> arg 0) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
742 (not (bobp))) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
743 (let ((present-level (funcall outline-level))) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
744 (while (and (not (< (funcall outline-level) present-level)) |
01b59199fcbc
(outline-next-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents:
24627
diff
changeset
|
745 (not (bobp))) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
746 (if invisible-ok |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
747 (outline-previous-heading) |
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
748 (outline-previous-visible-heading 1))) |
10950 | 749 (setq arg (- arg 1))))) |
750 | |
751 (defun outline-forward-same-level (arg) | |
752 "Move forward to the ARG'th subheading at same level as this one. | |
753 Stop at the first and last subheadings of a superior heading." | |
754 (interactive "p") | |
755 (outline-back-to-heading) | |
756 (while (> arg 0) | |
757 (let ((point-to-move-to (save-excursion | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
758 (outline-get-next-sibling)))) |
10950 | 759 (if point-to-move-to |
760 (progn | |
761 (goto-char point-to-move-to) | |
762 (setq arg (1- arg))) | |
763 (progn | |
764 (setq arg 0) | |
15466
5affe3230dfb
(outline-up-heading): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
765 (error "No following same-level heading")))))) |
10950 | 766 |
767 (defun outline-get-next-sibling () | |
768 "Move to next heading of the same level, and return point or nil if none." | |
769 (let ((level (funcall outline-level))) | |
770 (outline-next-visible-heading 1) | |
771 (while (and (> (funcall outline-level) level) | |
772 (not (eobp))) | |
773 (outline-next-visible-heading 1)) | |
774 (if (< (funcall outline-level) level) | |
775 nil | |
776 (point)))) | |
21544
95ec24fc6d78
(outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents:
21439
diff
changeset
|
777 |
10950 | 778 (defun outline-backward-same-level (arg) |
779 "Move backward to the ARG'th subheading at same level as this one. | |
780 Stop at the first and last subheadings of a superior heading." | |
781 (interactive "p") | |
782 (outline-back-to-heading) | |
783 (while (> arg 0) | |
784 (let ((point-to-move-to (save-excursion | |
785 (outline-get-last-sibling)))) | |
786 (if point-to-move-to | |
787 (progn | |
788 (goto-char point-to-move-to) | |
789 (setq arg (1- arg))) | |
790 (progn | |
791 (setq arg 0) | |
15466
5affe3230dfb
(outline-up-heading): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
792 (error "No previous same-level heading")))))) |
10950 | 793 |
794 (defun outline-get-last-sibling () | |
24442
252453d80f53
(outline-get-last-sibling): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23366
diff
changeset
|
795 "Move to previous heading of the same level, and return point or nil if none." |
10950 | 796 (let ((level (funcall outline-level))) |
797 (outline-previous-visible-heading 1) | |
798 (while (and (> (funcall outline-level) level) | |
799 (not (bobp))) | |
800 (outline-previous-visible-heading 1)) | |
801 (if (< (funcall outline-level) level) | |
802 nil | |
803 (point)))) | |
27204
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
804 |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
805 (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
|
806 "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
|
807 |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
808 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
|
809 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
|
810 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
|
811 (interactive "r") |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
812 (save-excursion |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
813 (save-restriction |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
814 (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
|
815 (goto-char (point-min)) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
816 (let ((buffer (current-buffer)) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
817 start end) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
818 (with-temp-buffer |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
819 (with-current-buffer buffer |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
820 ;; 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
|
821 (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
|
822 (outline-back-to-heading) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
823 (setq start (point) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
824 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
|
825 (point))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
826 (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
|
827 (insert "\n\n"))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
828 (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
|
829 (with-current-buffer buffer |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
830 (while (outline-next-heading) |
41657
4f8e9cc04af5
(outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39261
diff
changeset
|
831 (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
|
832 (setq start (point) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
833 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
|
834 (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
|
835 (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
|
836 (insert "\n\n")))))) |
ce06277761dc
(outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents:
25177
diff
changeset
|
837 (kill-new (buffer-string))))))) |
10950 | 838 |
839 (provide 'outline) | |
11736
07ac8009368c
Provide noutline as well as outline.
Richard M. Stallman <rms@gnu.org>
parents:
11713
diff
changeset
|
840 (provide 'noutline) |
10950 | 841 |
842 ;;; outline.el ends here |