annotate lisp/textmodes/outline.el @ 50842:b64d29a02737

(ad-make-advised-docstring): Adjust usage for new help-add-fundoc-usage.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 06 May 2003 13:58:30 +0000
parents 8921868c5af3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1 ;;; outline.el --- outline mode commands for Emacs
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
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
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6 ;; Maintainer: FSF
11455
4235784197f3 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 10998
diff changeset
7 ;; Keywords: outlines
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; any later version.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
24 ;; Boston, MA 02111-1307, USA.
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26 ;;; Commentary:
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28 ;; This package is a major mode for editing outline-format documents.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29 ;; An outline can be `abstracted' to show headers at any given level,
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30 ;; with all stuff below hidden. See the Emacs manual for details.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 ;;; Code:
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 "*Regular expression to match the beginning of a heading.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50 The recommended way to set this is with a Local Variables: list
24627
a08dbf9b97ed (outline-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 24457
diff changeset
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
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
56 "*Regular expression to match the end of a heading line.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
57 You can assume that point is at the beginning of a heading when this
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
58 regexp is searched for. The heading ends at the end of the match.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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)
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
83 (define-key map "\C-^" 'outline-move-subtree-up)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
84 (define-key map "\C-v" 'outline-move-subtree-down)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
85 (define-key map [(control ?<)] 'outline-promote)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
86 (define-key map [(control ?>)] 'outline-demote)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
87 (define-key map "\C-m" 'outline-insert-heading)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
88 ;; Where to bind outline-cycle ?
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
89 map))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
91 (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
92 (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
93
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] (cons "Hide" (make-sparse-keymap "Hide")))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95
41782
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-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
97 (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
98 (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
99 (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
100 (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
101 (define-key map [hide hide-leaves] '("Hide Leaves" . hide-leaves))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
102
41782
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] (cons "Show" (make-sparse-keymap "Show")))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104
41782
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-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
106 (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
107 (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
108 (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
109 (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
110
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
111 (define-key map [headings]
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
112 (cons "Headings" (make-sparse-keymap "Headings")))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
113
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
114 (define-key map [headings demote-subtree]
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
115 '(menu-item "Demote subtree" outline-demote))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
116 (define-key map [headings promote-subtree]
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
117 '(menu-item "Promote subtree" outline-promote))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
118 (define-key map [headings move-subtree-down]
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
119 '(menu-item "Move subtree down" outline-move-subtree-down))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
120 (define-key map [headings move-subtree-up]
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
121 '(menu-item "Move subtree up" outline-move-subtree-up))
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
122 (define-key map [headings copy]
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
123 '(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
124 :enable mark-active))
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
125 (define-key map [headings outline-insert-heading]
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
126 '("New heading" . outline-insert-heading))
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
127 (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
128 '("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
129 (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
130 '("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
131 (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
132 '("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
133 (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
134 '("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
135 (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
136 '("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
137 map))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
138
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
139 (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
140 (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
141 (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
142 (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
143 (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
144 ;; 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
145 (cdr
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
146 ;; 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
147 (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
148 (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
149 (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
150 ;; 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
151 ;; 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
152 (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
153 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
154 map))
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
155
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
156
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
157 (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
158 (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
159 (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
160 (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
161 map))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
162
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
163 (defvar outline-font-lock-keywords
20175
ea977d99058b (outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents: 20062
diff changeset
164 '(;;
ea977d99058b (outline-font-lock-keywords): Highlight the
Karl Heuer <kwzh@gnu.org>
parents: 20062
diff changeset
165 ;; Highlight headings according to the level.
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
166 (eval . (list (concat "^\\(?:" outline-regexp "\\).+")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
167 0 '(outline-font-lock-face) nil t)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
168 "Additional expressions to highlight in Outline mode.")
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
169
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
170 (defface outline-1 '((t :inherit font-lock-function-name-face)) "Level 1.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
171 (defface outline-2 '((t :inherit font-lock-variable-name-face)) "Level 2.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
172 (defface outline-3 '((t :inherit font-lock-keyword-face)) "Level 3.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
173 (defface outline-4 '((t :inherit font-lock-builtin-face)) "Level 4.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
174 (defface outline-5 '((t :inherit font-lock-comment-face)) "Level 5.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
175 (defface outline-6 '((t :inherit font-lock-constant-face)) "Level 6.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
176 (defface outline-7 '((t :inherit font-lock-type-face)) "Level 7.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
177 (defface outline-8 '((t :inherit font-lock-string-face)) "Level 8.")
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
178
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
179 (defvar outline-font-lock-faces
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
180 [outline-1 outline-2 outline-3 outline-4
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
181 outline-5 outline-6 outline-7 outline-8])
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
182
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
183 (defvar outline-font-lock-levels nil)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
184 (make-variable-buffer-local 'outline-font-lock-levels)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
185
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
186 (defun outline-font-lock-face ()
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
187 ;; (save-excursion
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
188 ;; (outline-back-to-heading t)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
189 ;; (let* ((count 0)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
190 ;; (start-level (funcall outline-level))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
191 ;; (level start-level)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
192 ;; face-level)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
193 ;; (while (not (setq face-level
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
194 ;; (if (or (bobp) (eq level 1)) 0
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
195 ;; (cdr (assq level outline-font-lock-levels)))))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
196 ;; (outline-up-heading 1 t)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
197 ;; (setq count (1+ count))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
198 ;; (setq level (funcall outline-level)))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
199 ;; ;; Remember for later.
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
200 ;; (unless (zerop count)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
201 ;; (setq face-level (+ face-level count))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
202 ;; (push (cons start-level face-level) outline-font-lock-levels))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
203 ;; (condition-case nil
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
204 ;; (aref outline-font-lock-faces face-level)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
205 ;; (error font-lock-warning-face))))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
206 (save-excursion
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
207 (goto-char (match-beginning 0))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
208 (looking-at outline-regexp)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
209 (condition-case nil
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
210 (aref outline-font-lock-faces (1- (funcall outline-level)))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
211 (error font-lock-warning-face))))
21544
95ec24fc6d78 (outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents: 21439
diff changeset
212
13259
11899bfa541c (outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents: 12604
diff changeset
213 (defvar outline-view-change-hook nil
11899bfa541c (outline-view-change-hook): New hook variable.
Richard M. Stallman <rms@gnu.org>
parents: 12604
diff changeset
214 "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
215
17688
b02bb31c98b0 (outline-mode): Autoload cookie added.
Richard M. Stallman <rms@gnu.org>
parents: 17687
diff changeset
216 ;;;###autoload
31986
350d5ee0e430 (outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30881
diff changeset
217 (define-derived-mode outline-mode text-mode "Outline"
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
218 "Set major mode for editing outlines with selective display.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
219 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
220 two for subheadings, etc. Lines not starting with asterisks are body lines.
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
221
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
222 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
223 invisible, or visible again. Invisible lines are attached to the end
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
224 of the heading, so they move with it, if the line is killed and yanked
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
225 back. A heading with text hidden under it is marked with an ellipsis (...).
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
226
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
227 Commands:\\<outline-mode-map>
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
228 \\[outline-next-visible-heading] outline-next-visible-heading move by visible headings
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
229 \\[outline-previous-visible-heading] outline-previous-visible-heading
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
230 \\[outline-forward-same-level] outline-forward-same-level similar but skip subheadings
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
231 \\[outline-backward-same-level] outline-backward-same-level
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
232 \\[outline-up-heading] outline-up-heading move from subheading to heading
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
233
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
234 \\[hide-body] make all text invisible (not headings).
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
235 \\[show-all] make everything in buffer visible.
48675
8da64061d63d (outline-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48001
diff changeset
236 \\[hide-sublevels] make only the first N levels of headers visible.
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
237
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
238 The remaining commands are used when point is on a heading line.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
239 They apply to some of the body or subheadings of that heading.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
240 \\[hide-subtree] hide-subtree make body and subheadings invisible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
241 \\[show-subtree] show-subtree make body and subheadings visible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
242 \\[show-children] show-children make direct subheadings visible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
243 No effect on body, or subheadings 2 or more levels down.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
244 With arg N, affects subheadings N levels down.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
245 \\[hide-entry] make immediately following body invisible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
246 \\[show-entry] make it visible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
247 \\[hide-leaves] make body under heading and under its subheadings invisible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
248 The subheadings remain visible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
249 \\[show-branches] make all subheadings at all levels visible.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
250
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
251 The variable `outline-regexp' can be changed to control what is a heading.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
252 A line is a heading if `outline-regexp' matches something at the
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
253 beginning of the line. The longer the match, the deeper the level.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
254
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
255 Turning on outline mode calls the value of `text-mode-hook' and then of
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
256 `outline-mode-hook', if they are non-nil."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
257 (make-local-variable 'line-move-ignore-invisible)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
258 (setq line-move-ignore-invisible t)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
259 ;; 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
260 (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
261 (set (make-local-variable 'paragraph-start)
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
262 (concat paragraph-start "\\|\\(?:" outline-regexp "\\)"))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
263 ;; 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
264 (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
265 (set (make-local-variable 'paragraph-separate)
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
266 (concat paragraph-separate "\\|\\(?:" outline-regexp "\\)"))
31986
350d5ee0e430 (outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30881
diff changeset
267 (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
268 '(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
269 (setq imenu-generic-expression
39238
7370effcd55c (outline-mode): Use `^' and a shy group
Gerd Moellmann <gerd@gnu.org>
parents: 37920
diff changeset
270 (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
271 (add-hook 'change-major-mode-hook 'show-all nil t))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
272
17687
e6d5322b810c Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17249
diff changeset
273 (defcustom outline-minor-mode-prefix "\C-c@"
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
274 "*Prefix key to use for Outline commands in Outline minor mode.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
275 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
276 After that, changing the prefix key requires manipulating keymaps."
e6d5322b810c Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17249
diff changeset
277 :type 'string
e6d5322b810c Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17249
diff changeset
278 :group 'outlines)
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
279
17688
b02bb31c98b0 (outline-mode): Autoload cookie added.
Richard M. Stallman <rms@gnu.org>
parents: 17687
diff changeset
280 ;;;###autoload
31986
350d5ee0e430 (outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30881
diff changeset
281 (define-minor-mode outline-minor-mode
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
282 "Toggle Outline minor mode.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
283 With arg, turn Outline minor mode on if arg is positive, off otherwise.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
284 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
285 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
286 (cons outline-minor-mode-prefix outline-mode-prefix-map))
47988
c392f8b359aa (outline-minor-mode): Add customization group.
Juanma Barranquero <lekktu@gmail.com>
parents: 47735
diff changeset
287 :group 'outlines
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
288 (if outline-minor-mode
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
289 (progn
15518
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
290 ;; 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
291 (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
292 (lambda () (outline-minor-mode -1))
15518
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
293 nil t)
31986
350d5ee0e430 (outline-minor-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30881
diff changeset
294 (set (make-local-variable 'line-move-ignore-invisible) t)
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
295 ;; 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
296 (add-to-invisibility-spec '(outline . t)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
297 (setq line-move-ignore-invisible nil)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
298 ;; 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
299 (remove-from-invisibility-spec '(outline . t))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
300 ;; 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
301 (show-all)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
302
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
303 (defvar outline-level 'outline-level
17687
e6d5322b810c Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17249
diff changeset
304 "*Function of no args to compute a header's nesting level in an outline.
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
305 It can assume point is at the beginning of a header line and that the match
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
306 data reflects the `outline-regexp'.")
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
307
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
308 (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
309 "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
310 Each entry is of the form (HEADING . LEVEL).
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
311 This alist is used two ways: to find the heading corresponding to
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
312 a given level and to find the level of a given heading.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
313 If a mode or document needs several sets of outline headings (for example
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
314 numbered and unnumbered sections), list them set by set and sorted by level
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
315 within each set. For example in texinfo mode:
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
316
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
317 (setq outline-heading-alist
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
318 '((\"@chapter\" . 2) (\"@section\" . 3) (\"@subsection\" . 4)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
319 (\"@subsubsection\" . 5)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
320 (\"@unnumbered\" . 2) (\"@unnumberedsec\" . 3)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
321 (\"@unnumberedsubsec\" . 4) (\"@unnumberedsubsubsec\" . 5)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
322 (\"@appendix\" . 2) (\"@appendixsec\" . 3)...
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
323 (\"@appendixsubsec\" . 4) (\"@appendixsubsubsec\" . 5) ..))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
324
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
325 Instead of sorting the entries in each set, you can also separate the
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
326 sets with nil.")
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
327 (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
328
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
329 ;; This used to count columns rather than characters, but that made ^L
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
330 ;; appear to be at level 2 instead of 1. Columns would be better for
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
331 ;; tab handling, but the default regexp doesn't use tabs, and anyone
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
332 ;; who changes the regexp can also redefine the outline-level variable
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
333 ;; as appropriate.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
334 (defun outline-level ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
335 "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
336 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
337 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
338 or else the number of characters matched by `outline-regexp'."
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
339 (or (cdr (assoc (match-string 0) outline-heading-alist))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
340 (- (match-end 0) (match-beginning 0))))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
341
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
342 (defun outline-next-preface ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
343 "Skip forward to just before the next heading line.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
344 If there's no following heading line, stop before the newline
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
345 at the end of the buffer."
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
346 (if (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
347 nil 'move)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
348 (goto-char (match-beginning 0)))
20426
f3debcf1d078 (outline-next-preface):
Karl Heuer <kwzh@gnu.org>
parents: 20175
diff changeset
349 (if (and (bolp) (not (bobp)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
350 (forward-char -1)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
351
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
352 (defun outline-next-heading ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
353 "Move to the next (possibly invisible) heading line."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
354 (interactive)
48001
4e7ef1c1f0dd (outline-next-heading): Make sure the match-data is correct where returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47988
diff changeset
355 ;; Make sure we don't match the heading we're at.
4e7ef1c1f0dd (outline-next-heading): Make sure the match-data is correct where returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47988
diff changeset
356 (if (and (bolp) (not (eobp))) (forward-char 1))
4e7ef1c1f0dd (outline-next-heading): Make sure the match-data is correct where returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47988
diff changeset
357 (if (re-search-forward (concat "^\\(?:" outline-regexp "\\)")
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
358 nil 'move)
48001
4e7ef1c1f0dd (outline-next-heading): Make sure the match-data is correct where returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47988
diff changeset
359 (goto-char (match-beginning 0))))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
360
25177
0ac130f2181a (outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents: 25148
diff changeset
361 (defun outline-previous-heading ()
0ac130f2181a (outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents: 25148
diff changeset
362 "Move to the previous (possibly invisible) heading line."
0ac130f2181a (outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents: 25148
diff changeset
363 (interactive)
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
364 (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
25177
0ac130f2181a (outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents: 25148
diff changeset
365 nil 'move))
0ac130f2181a (outline-previous-heading): New function.
Richard M. Stallman <rms@gnu.org>
parents: 25148
diff changeset
366
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
367 (defsubst outline-invisible-p (&optional pos)
37920
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
368 "Non-nil if the character after point is invisible."
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
369 (get-char-property (or pos (point)) 'invisible))
49622
d32039b77774 (outline-visible): Add obsolescence declaration and remove redundant info from
Juanma Barranquero <lekktu@gmail.com>
parents: 49599
diff changeset
370
37920
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
371 (defun outline-visible ()
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
372 (not (outline-invisible-p)))
49622
d32039b77774 (outline-visible): Add obsolescence declaration and remove redundant info from
Juanma Barranquero <lekktu@gmail.com>
parents: 49599
diff changeset
373 (make-obsolete 'outline-visible 'outline-invisible-p)
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
374
20062
bf3f4dc09cc0 (outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents: 19959
diff changeset
375 (defun outline-back-to-heading (&optional invisible-ok)
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
376 "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
377 Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
378 (beginning-of-line)
24457
5ab0869ed2c8 (outline-back-to-heading): fix invisible-ok.
Karl Heuer <kwzh@gnu.org>
parents: 24442
diff changeset
379 (or (outline-on-heading-p invisible-ok)
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
380 (let (found)
15518
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
381 (save-excursion
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
382 (while (not found)
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
383 (or (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
15518
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
384 nil t)
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
385 (error "before first heading"))
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
386 (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
387 (point)))))
15518
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
388 (goto-char found)
d01e58c9e431 (outline-minor-mode): No longer permanent local.
Richard M. Stallman <rms@gnu.org>
parents: 15466
diff changeset
389 found)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
390
20062
bf3f4dc09cc0 (outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents: 19959
diff changeset
391 (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
392 "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
393 If INVISIBLE-OK is non-nil, an invisible heading line is ok too."
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
394 (save-excursion
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
395 (beginning-of-line)
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
396 (and (bolp) (or invisible-ok (not (outline-invisible-p)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
397 (looking-at outline-regexp))))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
398
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
399 (defun outline-insert-heading ()
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
400 "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
401 (interactive)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
402 (let ((head (save-excursion
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
403 (condition-case nil
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
404 (outline-back-to-heading)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
405 (error (outline-next-heading)))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
406 (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
407 (or (caar outline-heading-alist) "")
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
408 (match-string 0)))))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
409 (unless (or (string-match "[ \t]\\'" head)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
410 (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
411 (setq head (concat head " ")))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
412 (unless (bolp) (end-of-line) (newline))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
413 (insert head)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
414 (unless (eolp)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
415 (save-excursion (newline-and-indent)))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
416 (run-hooks 'outline-insert-heading-hook)))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
417
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
418 (defun outline-promote (&optional children)
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
419 "Promote headings higher up the tree.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
420 If prefix argument CHILDREN is given, promote also all the children.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
421 If the region is active in `transient-mark-mode', promote all headings
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
422 in the region."
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
423 (interactive
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
424 (list (if (and transient-mark-mode mark-active) 'region
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
425 (outline-back-to-heading)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
426 (if current-prefix-arg nil 'subtree))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
427 (cond
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
428 ((eq children 'region)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
429 (outline-map-region 'outline-promote (region-beginning) (region-end)))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
430 (children
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
431 (outline-map-region 'outline-promote
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
432 (point)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
433 (save-excursion (outline-get-next-sibling) (point))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
434 (t
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
435 (outline-back-to-heading t)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
436 (let* ((head (match-string 0))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
437 (level (save-match-data (funcall outline-level)))
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
438 (up-head (or (outline-head-from-level (1- level) head)
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
439 (save-excursion
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
440 (save-match-data
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
441 (outline-up-heading 1 t)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
442 (match-string 0))))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
443
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
444 (unless (rassoc level outline-heading-alist)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
445 (push (cons head level) outline-heading-alist))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
446
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
447 (replace-match up-head nil t)))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
448
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
449 (defun outline-demote (&optional children)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
450 "Demote headings lower down the tree.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
451 If prefix argument CHILDREN is given, demote also all the children.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
452 If the region is active in `transient-mark-mode', demote all headings
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
453 in the region."
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
454 (interactive
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
455 (list (if (and transient-mark-mode mark-active) 'region
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
456 (outline-back-to-heading)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
457 (if current-prefix-arg nil 'subtree))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
458 (cond
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
459 ((eq children 'region)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
460 (outline-map-region 'outline-demote (region-beginning) (region-end)))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
461 (children
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
462 (outline-map-region 'outline-demote
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
463 (point)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
464 (save-excursion (outline-get-next-sibling) (point))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
465 (t
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
466 (let* ((head (match-string 0))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
467 (level (save-match-data (funcall outline-level)))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
468 (down-head
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
469 (or (outline-head-from-level (1+ level) head)
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
470 (save-excursion
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
471 (save-match-data
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
472 (while (and (progn (outline-next-heading) (not (eobp)))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
473 (<= (funcall outline-level) level)))
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
474 (when (eobp)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
475 ;; Try again from the beginning of the buffer.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
476 (goto-char (point-min))
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
477 (while (and (progn (outline-next-heading) (not (eobp)))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
478 (<= (funcall outline-level) level))))
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
479 (unless (eobp)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
480 (looking-at outline-regexp)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
481 (match-string 0))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
482 (save-match-data
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
483 ;; Bummer!! There is no lower heading in the buffer.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
484 ;; Let's try to invent one by repeating the first char.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
485 (let ((new-head (concat (substring head 0 1) head)))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
486 (if (string-match (concat "\\`" outline-regexp) new-head)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
487 ;; Why bother checking that it is indeed lower level ?
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
488 new-head
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
489 ;; Didn't work: keep it as is so it's still a heading.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
490 head))))))
49599
5ade352e8d1c Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48930
diff changeset
491
41782
eea433180987 (outline-mode-prefix-map): Add bindings for outline-promote and outline-demote.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41700
diff changeset
492 (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
493 (push (cons head level) outline-heading-alist))
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
494 (replace-match down-head nil t)))))
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
495
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
496 (defun outline-head-from-level (level head &optional alist)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
497 "Get new heading with level LEVEL from ALIST.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
498 If there are no such entries, return nil.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
499 ALIST defaults to `outline-heading-alist'.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
500 Similar to (car (rassoc LEVEL ALIST)).
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
501 If there are several different entries with same new level, choose
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
502 the one with the smallest distance to the assocation of HEAD in the alist.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
503 This makes it possible for promotion to work in modes with several
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
504 independent sets of headings (numbered, unnumbered, appendix...)"
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
505 (unless alist (setq alist outline-heading-alist))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
506 (let ((l (rassoc level alist))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
507 ll h hl l2 l2l)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
508 (cond
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
509 ((null l) nil)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
510 ;; If there's no HEAD after L, any other entry for LEVEL after L
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
511 ;; can't be much better than L.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
512 ((null (setq h (assoc head (setq ll (memq l alist))))) (car l))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
513 ;; If there's no other entry for LEVEL, just keep L.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
514 ((null (setq l2 (rassoc level (cdr ll)))) (car l))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
515 ;; Now we have L, L2, and H: see if L2 seems better than L.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
516 ;; If H is after L2, L2 is better.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
517 ((memq h (setq l2l (memq l2 (cdr ll))))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
518 (outline-head-from-level level head l2l))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
519 ;; Now we have H between L and L2.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
520 ;; If there's a separator between L and H, prefer L2.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
521 ((memq h (memq nil ll))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
522 (outline-head-from-level level head l2l))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
523 ;; If there's a separator between L2 and H, prefer L.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
524 ((memq l2 (memq nil (setq hl (memq h ll)))) (car l))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
525 ;; No separator between L and L2, check the distance.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
526 ((< (* 2 (length hl)) (+ (length ll) (length l2l)))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
527 (outline-head-from-level level head l2l))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
528 ;; If all else fails, just keep L.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
529 (t (car l)))))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
530
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
531 (defun outline-map-region (fun beg end)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
532 "Call FUN for every heading between BEG and END.
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
533 When FUN is called, point is at the beginning of the heading and
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
534 the match data is set appropriately."
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
535 (save-excursion
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
536 (setq end (copy-marker end))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
537 (goto-char beg)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
538 (when (re-search-forward (concat "^\\(?:" outline-regexp "\\)") end t)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
539 (goto-char (match-beginning 0))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
540 (funcall fun)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
541 (while (and (progn
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
542 (outline-next-heading)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
543 (< (point) end))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
544 (not (eobp)))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
545 (funcall fun)))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
546
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
547 ;; Vertical tree motion
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
548
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
549 (defun outline-move-subtree-up (&optional arg)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
550 "Move the currrent subtree up past ARG headlines of the same level."
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
551 (interactive "p")
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
552 (outline-move-subtree-down (- arg)))
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
553
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
554 (defun outline-move-subtree-down (&optional arg)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
555 "Move the currrent subtree down past ARG headlines of the same level."
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
556 (interactive "p")
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
557 (let ((re (concat "^" outline-regexp))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
558 (movfunc (if (> arg 0) 'outline-get-next-sibling
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
559 'outline-get-last-sibling))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
560 (ins-point (make-marker))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
561 (cnt (abs arg))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
562 beg end txt folded)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
563 ;; Select the tree
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
564 (outline-back-to-heading)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
565 (setq beg (point))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
566 (save-match-data
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
567 (save-excursion (outline-end-of-heading)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
568 (setq folded (outline-invisible-p)))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
569 (outline-end-of-subtree))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
570 (if (= (char-after) ?\n) (forward-char 1))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
571 (setq end (point))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
572 ;; Find insertion point, with error handling
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
573 (goto-char beg)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
574 (while (> cnt 0)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
575 (or (funcall movfunc)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
576 (progn (goto-char beg)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
577 (error "Cannot move past superior level")))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
578 (setq cnt (1- cnt)))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
579 (if (> arg 0)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
580 ;; Moving forward - still need to move over subtree
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
581 (progn (outline-end-of-subtree)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
582 (if (= (char-after) ?\n) (forward-char 1))))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
583 (move-marker ins-point (point))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
584 (insert (delete-and-extract-region beg end))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
585 (goto-char ins-point)
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
586 (if folded (hide-subtree))
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
587 (move-marker ins-point nil)))
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
588
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
589 (defun outline-end-of-heading ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
590 (if (re-search-forward outline-heading-end-regexp nil 'move)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
591 (forward-char -1)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
592
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
593 (defun outline-next-visible-heading (arg)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
594 "Move to the next visible heading line.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
595 With argument, repeats or can move backward if negative.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
596 A heading line is one that starts with a `*' (or that
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
597 `outline-regexp' matches)."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
598 (interactive "p")
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
599 (if (< arg 0)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
600 (beginning-of-line)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
601 (end-of-line))
12604
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
602 (while (and (not (bobp)) (< arg 0))
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
603 (while (and (not (bobp))
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
604 (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
12604
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
605 nil 'move)
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
606 (outline-invisible-p)))
12604
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
607 (setq arg (1+ arg)))
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
608 (while (and (not (eobp)) (> arg 0))
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
609 (while (and (not (eobp))
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
610 (re-search-forward (concat "^\\(?:" outline-regexp "\\)")
12604
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
611 nil 'move)
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
612 (outline-invisible-p (match-beginning 0))))
12604
140e46e751a0 (outline-next-visible-heading): Rewritten to handle
Richard M. Stallman <rms@gnu.org>
parents: 11736
diff changeset
613 (setq arg (1- arg)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
614 (beginning-of-line))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
615
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
616 (defun outline-previous-visible-heading (arg)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
617 "Move to the previous heading line.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
618 With argument, repeats or can move forward if negative.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
619 A heading line is one that starts with a `*' (or that
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
620 `outline-regexp' matches)."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
621 (interactive "p")
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
622 (outline-next-visible-heading (- arg)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
623
17249
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
624 (defun outline-mark-subtree ()
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
625 "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
626 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
627 (interactive)
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
628 (let ((beg))
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
629 (if (outline-on-heading-p)
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
630 ;; we are already looking at a heading
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
631 (beginning-of-line)
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
632 ;; else go back to previous heading
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
633 (outline-previous-visible-heading 1))
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
634 (setq beg (point))
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
635 (outline-end-of-subtree)
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
636 (push-mark (point))
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
637 (goto-char beg)))
2dfc334bdc6f (outline-discard-overlays): Fix the case
Richard M. Stallman <rms@gnu.org>
parents: 17248
diff changeset
638
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
639
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
640 (put 'outline 'reveal-toggle-invisible 'outline-reveal-toggle-invisible)
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
641 (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
642 "Hide or show lines from FROM to TO, according to FLAG.
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
643 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
644 (remove-overlays from to 'invisible 'outline)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
645 (when flag
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
646 (let ((o (make-overlay from to)))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
647 (overlay-put o 'invisible 'outline)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
648 (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
649 ;; 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
650 (run-hooks 'outline-view-change-hook))
10996
356f658dbd65 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 10950
diff changeset
651
45429
5d3b861665f0 (outline-reveal-toggle-invisible): Reverse the meaning of the second arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41782
diff changeset
652 (defun outline-reveal-toggle-invisible (o hidep)
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
653 (save-excursion
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
654 (goto-char (overlay-start o))
45429
5d3b861665f0 (outline-reveal-toggle-invisible): Reverse the meaning of the second arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41782
diff changeset
655 (if hidep
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
656 ;; 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
657 ;; 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
658 ;; (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
659 ;; 'invisible 'outline)
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
660 ;;
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
661 ;; 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
662 ;; 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
663 ;; 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
664 ;; 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
665 (progn
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
666 (let ((end (overlay-end o)))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
667 (delete-overlay o)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
668 (while (progn
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
669 (hide-subtree)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
670 (outline-next-visible-heading 1)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
671 (and (not (eobp)) (< (point) end))))))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
672
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
673 ;; 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
674 ;; 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
675 ;; 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
676 (let ((o1 (copy-overlay o)))
45429
5d3b861665f0 (outline-reveal-toggle-invisible): Reverse the meaning of the second arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41782
diff changeset
677 (overlay-put o 'invisible nil) ;Show (most of) the text.
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
678 (while (progn
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
679 (show-entry)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
680 (show-children)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
681 ;; Normally just the above is needed.
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
682 ;; 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
683 ;; 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
684 ;; *something* gets shown.
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
685 (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
686 (< (point) (overlay-end o))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
687 (= 0 (forward-line 1)))))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
688 ;; 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
689 (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
690 ;; 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
691 (delete-overlay o1))))))
21439
2280d06ab327 *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21438
diff changeset
692
2280d06ab327 *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21438
diff changeset
693 ;; 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
694 ;; to the overlay that makes the outline invisible (see
2280d06ab327 *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21438
diff changeset
695 ;; `outline-flag-region').
2280d06ab327 *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21438
diff changeset
696 (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
697 ;; 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
698 (show-entry))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
699
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
700 (defun hide-entry ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
701 "Hide the body directly following this heading."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
702 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
703 (outline-back-to-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
704 (outline-end-of-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
705 (save-excursion
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
706 (outline-flag-region (point) (progn (outline-next-preface) (point)) t)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
707
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
708 (defun show-entry ()
20062
bf3f4dc09cc0 (outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents: 19959
diff changeset
709 "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
710 Show the heading too, if it is currently invisible."
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
711 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
712 (save-excursion
20062
bf3f4dc09cc0 (outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents: 19959
diff changeset
713 (outline-back-to-heading t)
bf3f4dc09cc0 (outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents: 19959
diff changeset
714 (outline-flag-region (1- (point))
bf3f4dc09cc0 (outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents: 19959
diff changeset
715 (progn (outline-next-preface) (point)) nil)))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
716
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
717 (defun hide-body ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
718 "Hide all of buffer except headings."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
719 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
720 (hide-region-body (point-min) (point-max)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
721
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
722 (defun hide-region-body (start end)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
723 "Hide all body lines in the region, but not headings."
23366
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
724 ;; Nullify the hook to avoid repeated calls to `outline-flag-region'
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
725 ;; wasting lots of time running `lazy-lock-fontify-after-outline'
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
726 ;; and run the hook finally.
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
727 (let (outline-view-change-hook)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
728 (save-excursion
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
729 (save-restriction
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
730 (narrow-to-region start end)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
731 (goto-char (point-min))
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
732 (if (outline-on-heading-p)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
733 (outline-end-of-heading))
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
734 (while (not (eobp))
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
735 (outline-flag-region (point)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
736 (progn (outline-next-preface) (point)) t)
37920
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
737 (unless (eobp)
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
738 (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
739 (outline-end-of-heading))))))
23366
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
740 (run-hooks 'outline-view-change-hook))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
741
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
742 (defun show-all ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
743 "Show all of the text in the buffer."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
744 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
745 (outline-flag-region (point-min) (point-max) nil))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
746
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
747 (defun hide-subtree ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
748 "Hide everything after this heading at deeper levels."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
749 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
750 (outline-flag-subtree t))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
751
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
752 (defun hide-leaves ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
753 "Hide all body after this heading at deeper levels."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
754 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
755 (outline-back-to-heading)
37920
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
756 (save-excursion
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
757 (outline-end-of-heading)
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
758 (hide-region-body (point) (progn (outline-end-of-subtree) (point)))))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
759
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
760 (defun show-subtree ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
761 "Show everything after this heading at deeper levels."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
762 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
763 (outline-flag-subtree nil))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
764
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
765 (defun outline-show-heading ()
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
766 "Show the current heading and move to its end."
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
767 (outline-flag-region (- (point)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
768 (if (bobp) 0
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
769 (if (eq (char-before (1- (point))) ?\n)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
770 2 1)))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
771 (progn (outline-end-of-heading) (point))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
772 nil))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
773
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
774 (defun hide-sublevels (levels)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
775 "Hide everything but the top LEVELS levels of headers, in whole buffer."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
776 (interactive "p")
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
777 (if (< levels 1)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
778 (error "Must keep at least one level of headers"))
23366
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
779 (let (outline-view-change-hook)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
780 (save-excursion
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
781 (goto-char (point-min))
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
782 ;; Skip the prelude, if any.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
783 (unless (outline-on-heading-p t) (outline-next-heading))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
784 ;; First hide everything.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
785 (outline-flag-region (point) (point-max) t)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
786 ;; Then unhide the top level headers.
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
787 (outline-map-region
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
788 (lambda ()
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
789 (if (<= (funcall outline-level) levels)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
790 (outline-show-heading)))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
791 (point) (point-max))))
23366
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
792 (run-hooks 'outline-view-change-hook))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
793
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
794 (defun hide-other ()
20062
bf3f4dc09cc0 (outline-back-to-heading): New arg INVISIBLE-OK.
Karl Heuer <kwzh@gnu.org>
parents: 19959
diff changeset
795 "Hide everything except current body and parent and top-level headings."
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
796 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
797 (hide-sublevels 1)
23366
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
798 (let (outline-view-change-hook)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
799 (save-excursion
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
800 (outline-back-to-heading t)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
801 (show-entry)
37920
abf444fe5166 (outline-mode): Fix font-lock-defaults.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37751
diff changeset
802 (while (condition-case nil (progn (outline-up-heading 1) (not (bobp)))
23366
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
803 (error nil))
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
804 (outline-flag-region (1- (point))
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
805 (save-excursion (forward-line 1) (point))
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
806 nil))))
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
807 (run-hooks 'outline-view-change-hook))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
808
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
809 (defun outline-toggle-children ()
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
810 "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
811 (interactive)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
812 (outline-back-to-heading)
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
813 (if (not (outline-invisible-p (line-end-position)))
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
814 (hide-subtree)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
815 (show-children)
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
816 (show-entry)))
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
817
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
818 (defun outline-flag-subtree (flag)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
819 (save-excursion
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
820 (outline-back-to-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
821 (outline-end-of-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
822 (outline-flag-region (point)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
823 (progn (outline-end-of-subtree) (point))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
824 flag)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
825
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
826 (defun outline-end-of-subtree ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
827 (outline-back-to-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
828 (let ((opoint (point))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
829 (first t)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
830 (level (funcall outline-level)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
831 (while (and (not (eobp))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
832 (or first (> (funcall outline-level) level)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
833 (setq first nil)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
834 (outline-next-heading))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
835 (if (bolp)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
836 (progn
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
837 ;; Go to end of line before heading
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
838 (forward-char -1)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
839 (if (bolp)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
840 ;; leave blank line before heading
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
841 (forward-char -1))))))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
842
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
843 (defun show-branches ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
844 "Show all subheadings of this heading, but not their bodies."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
845 (interactive)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
846 (show-children 1000))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
847
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
848 (defun show-children (&optional level)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
849 "Show all direct subheadings of this heading.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
850 Prefix arg LEVEL is how many levels below the current level should be shown.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
851 Default is enough to cause the following heading to appear."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
852 (interactive "P")
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
853 (setq level
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
854 (if level (prefix-numeric-value level)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
855 (save-excursion
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
856 (outline-back-to-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
857 (let ((start-level (funcall outline-level)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
858 (outline-next-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
859 (if (eobp)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
860 1
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
861 (max 1 (- (funcall outline-level) start-level)))))))
23366
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
862 (let (outline-view-change-hook)
431ec936e2da (hide-region-body): Bind
Dave Love <fx@gnu.org>
parents: 21782
diff changeset
863 (save-excursion
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
864 (outline-back-to-heading)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
865 (setq level (+ level (funcall outline-level)))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
866 (outline-map-region
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
867 (lambda ()
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
868 (if (<= (funcall outline-level) level)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
869 (outline-show-heading)))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
870 (point)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
871 (progn (outline-end-of-subtree)
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
872 (if (eobp) (point-max) (1+ (point)))))))
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
873 (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
874
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
875
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
876
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
877 (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
878 "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
879 With argument, move up ARG levels.
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
880 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
881 (interactive "p")
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
882 (outline-back-to-heading invisible-ok)
47735
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
883 (let ((start-level (funcall outline-level)))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
884 (if (eq start-level 1)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
885 (error "Already at top level of the outline"))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
886 (while (and (> start-level 1) (> arg 0) (not (bobp)))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
887 (let ((level start-level))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
888 (while (not (or (< level start-level) (bobp)))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
889 (if invisible-ok
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
890 (outline-previous-heading)
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
891 (outline-previous-visible-heading 1))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
892 (setq level (funcall outline-level)))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
893 (setq start-level level))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
894 (setq arg (- arg 1))))
0d2e42a6fd1c (outline-1, outline-2, outline-3, outline-4)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45429
diff changeset
895 (looking-at outline-regexp))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
896
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
897 (defun outline-forward-same-level (arg)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
898 "Move forward to the ARG'th subheading at same level as this one.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
899 Stop at the first and last subheadings of a superior heading."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
900 (interactive "p")
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
901 (outline-back-to-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
902 (while (> arg 0)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
903 (let ((point-to-move-to (save-excursion
21544
95ec24fc6d78 (outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents: 21439
diff changeset
904 (outline-get-next-sibling))))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
905 (if point-to-move-to
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
906 (progn
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
907 (goto-char point-to-move-to)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
908 (setq arg (1- arg)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
909 (progn
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
910 (setq arg 0)
15466
5affe3230dfb (outline-up-heading): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
911 (error "No following same-level heading"))))))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
912
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
913 (defun outline-get-next-sibling ()
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
914 "Move to next heading of the same level, and return point or nil if none."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
915 (let ((level (funcall outline-level)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
916 (outline-next-visible-heading 1)
50133
8921868c5af3 (outline-level): Demote it to defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50124
diff changeset
917 (while (and (not (eobp)) (> (funcall outline-level) level))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
918 (outline-next-visible-heading 1))
50124
d4f965eb8fd5 (outline-mode-menu-bar-map): Add entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49622
diff changeset
919 (if (or (eobp) (< (funcall outline-level) level))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
920 nil
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
921 (point))))
21544
95ec24fc6d78 (outline-font-lock-level): New function.
Karl Heuer <kwzh@gnu.org>
parents: 21439
diff changeset
922
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
923 (defun outline-backward-same-level (arg)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
924 "Move backward to the ARG'th subheading at same level as this one.
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
925 Stop at the first and last subheadings of a superior heading."
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
926 (interactive "p")
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
927 (outline-back-to-heading)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
928 (while (> arg 0)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
929 (let ((point-to-move-to (save-excursion
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
930 (outline-get-last-sibling))))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
931 (if point-to-move-to
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
932 (progn
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
933 (goto-char point-to-move-to)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
934 (setq arg (1- arg)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
935 (progn
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
936 (setq arg 0)
15466
5affe3230dfb (outline-up-heading): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
937 (error "No previous same-level heading"))))))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
938
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
939 (defun outline-get-last-sibling ()
24442
252453d80f53 (outline-get-last-sibling): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23366
diff changeset
940 "Move to previous heading of the same level, and return point or nil if none."
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
941 (let ((level (funcall outline-level)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
942 (outline-previous-visible-heading 1)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
943 (while (and (> (funcall outline-level) level)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
944 (not (bobp)))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
945 (outline-previous-visible-heading 1))
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
946 (if (< (funcall outline-level) level)
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
947 nil
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
948 (point))))
27204
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
949
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
950 (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
951 "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
952
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
953 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
954 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
955 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
956 (interactive "r")
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
957 (save-excursion
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
958 (save-restriction
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
959 (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
960 (goto-char (point-min))
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
961 (let ((buffer (current-buffer))
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
962 start end)
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
963 (with-temp-buffer
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
964 (with-current-buffer buffer
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
965 ;; 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
966 (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
967 (outline-back-to-heading)
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
968 (setq start (point)
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
969 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
970 (point)))
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
971 (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
972 (insert "\n\n")))
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
973 (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
974 (with-current-buffer buffer
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
975 (while (outline-next-heading)
41657
4f8e9cc04af5 (outline-up-heading): Add `invisible-ok' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39261
diff changeset
976 (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
977 (setq start (point)
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
978 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
979 (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
980 (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
981 (insert "\n\n"))))))
ce06277761dc (outline-mode-menu-bar-map): Add outline-headers-as-kill.
Dave Love <fx@gnu.org>
parents: 25177
diff changeset
982 (kill-new (buffer-string)))))))
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
983
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
984 (provide 'outline)
11736
07ac8009368c Provide noutline as well as outline.
Richard M. Stallman <rms@gnu.org>
parents: 11713
diff changeset
985 (provide 'noutline)
10950
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
986
d1990c517cc9 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
987 ;;; outline.el ends here