Mercurial > emacs
annotate lisp/progmodes/hideshow.el @ 83220:fe1db7935e1a
Fix core dump in redisplay window. (Reported by Yoshiaki Kasahara.) Plus cleanups.
* src/xdisp.c (handle_single_display_prop): Use FRAME_WINDOW_P instead of
checking against specific frame types. Ignore images on non-window
frames.
(echo_area_display): Use FRAME_INITIAL_P to check for initial frame.
(redisplay_preserve_echo_area): Update for multi-tty support.
(redisplay_window): Don't bother with toolbars, fringe bitmaps or
vertical borders on tty frames.
(display_line): Remove superflous #ifdefs.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-260
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 14 Oct 2004 14:58:43 +0000 |
parents | 2f6d31064afd |
children | b449e405ed0d |
rev | line source |
---|---|
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
1 ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks |
10276 | 2 |
36784 | 3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation |
14169 | 4 |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
5 ;; Author: Thien-Thi Nguyen <ttn@gnu.org> |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
6 ;; Dan Nicolaescu <dann@ics.uci.edu> |
18070
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
7 ;; Keywords: C C++ java lisp tools editing comments blocks hiding outlines |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
8 ;; Maintainer-Version: 5.31 |
14169 | 9 ;; Time-of-Day-Author-Most-Likely-to-be-Recalcitrant: early morning |
10276 | 10 |
14169 | 11 ;; This file is part of GNU Emacs. |
10276 | 12 |
14169 | 13 ;; GNU Emacs is free software; you can redistribute it and/or modify |
14 ;; it under the terms of the GNU General Public License as published by | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
16 ;; any later version. | |
10276 | 17 |
14169 | 18 ;; GNU Emacs is distributed in the hope that it will be useful, |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
10276 | 22 |
14169 | 23 ;; You should have received a copy of the GNU General Public License |
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
26 ;; Boston, MA 02111-1307, USA. | |
27 | |
10276 | 28 ;;; Commentary: |
29 | |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
30 ;; * Commands provided |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
31 ;; |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
32 ;; This file provides Hideshow Minor Mode. When active, nine commands |
27029
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
33 ;; are available, implementing block hiding and showing. They (and their |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
34 ;; keybindings) are: |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
35 ;; |
36784 | 36 ;; hs-hide-block C-c @ C-h |
37 ;; hs-show-block C-c @ C-s | |
38 ;; hs-hide-all C-c @ C-M-h | |
39 ;; hs-show-all C-c @ C-M-s | |
40 ;; hs-hide-level C-c @ C-l | |
41 ;; hs-toggle-hiding C-c @ C-c | |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
42 ;; hs-mouse-toggle-hiding [(shift mouse-2)] |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
43 ;; hs-hide-initial-comment-block |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
44 ;; |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
45 ;; Blocks are defined per mode. In c-mode, c++-mode and java-mode, they |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
46 ;; are simply text between curly braces, while in Lisp-ish modes parens |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
47 ;; are used. Multi-line comment blocks can also be hidden. Read-only |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
48 ;; buffers are not a problem, since hideshow doesn't modify the text. |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
49 ;; |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
50 ;; The command `M-x hs-minor-mode' toggles the minor mode or sets it |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
51 ;; (similar to other minor modes). |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
52 |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
53 ;; * Suggested usage |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
54 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
55 ;; First make sure hideshow.el is in a directory in your `load-path'. |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
56 ;; You can optionally byte-compile it using `M-x byte-compile-file'. |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
57 ;; Then, add the following to your ~/.emacs: |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
58 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
59 ;; (load-library "hideshow") |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
60 ;; (add-hook 'X-mode-hook ; other modes similarly |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
61 ;; '(lambda () (hs-minor-mode 1))) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
62 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
63 ;; where X = {emacs-lisp,c,c++,perl,...}. You can also manually toggle |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
64 ;; hideshow minor mode by typing `M-x hs-minor-mode'. After hideshow is |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
65 ;; activated or deactivated, `hs-minor-mode-hook' is run w/ `run-hooks'. |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
66 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
67 ;; Additionally, Joseph Eydelnant writes: |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
68 ;; I enjoy your package hideshow.el Ver. 5.24 2001/02/13 |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
69 ;; a lot and I've been looking for the following functionality: |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
70 ;; toggle hide/show all with a single key. |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
71 ;; Here are a few lines of code that lets me do just that. |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
72 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
73 ;; (defvar my-hs-hide nil "Current state of hideshow for toggling all.") |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
74 ;; ;;;###autoload |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
75 ;; (defun my-toggle-hideshow-all () "Toggle hideshow all." |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
76 ;; (interactive) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
77 ;; (setq my-hs-hide (not my-hs-hide)) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
78 ;; (if my-hs-hide |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
79 ;; (hs-hide-all) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
80 ;; (hs-show-all))) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
81 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
82 ;; [Your hideshow hacks here!] |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
83 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
84 ;; * Customization |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
85 ;; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
86 ;; You can use `M-x customize-variable' on the following variables: |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
87 ;; |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
88 ;; - hs-hide-comments-when-hiding-all -- self-explanatory! |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
89 ;; - hs-hide-all-non-comment-function -- if non-nil, when doing a |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
90 ;; `hs-hide-all', this function |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
91 ;; is called w/ no arguments |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
92 ;; - hs-isearch-open -- what kind of hidden blocks to |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
93 ;; open when doing isearch |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
94 ;; |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
95 ;; Some languages (e.g., Java) are deeply nested, so the normal behavior |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
96 ;; of `hs-hide-all' (hiding all but top-level blocks) results in very |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
97 ;; little information shown, which is not very useful. You can use the |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
98 ;; variable `hs-hide-all-non-comment-function' to implement your idea of |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
99 ;; what is more useful. For example, the following code shows the next |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
100 ;; nested level in addition to the top-level: |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
101 ;; |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
102 ;; (defun ttn-hs-hide-level-1 () |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
103 ;; (hs-hide-level 1) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
104 ;; (forward-sexp 1)) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
105 ;; (setq hs-hide-all-non-comment-function 'ttn-hs-hide-level-1) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
106 ;; |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
107 ;; Hideshow works w/ incremental search (isearch) by setting the variable |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
108 ;; `hs-headline', which is the line of text at the beginning of a hidden |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
109 ;; block that contains a match for the search. You can have this show up |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
110 ;; in the mode line by modifying the variable `mode-line-format'. For |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
111 ;; example, the following code prepends this info to the mode line: |
14169 | 112 ;; |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
113 ;; (unless (memq 'hs-headline mode-line-format) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
114 ;; (setq mode-line-format |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
115 ;; (append '("-" hs-headline) mode-line-format))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
116 ;; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
117 ;; See documentation for `mode-line-format' for more info. |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
118 ;; |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
119 ;; Hooks are run after some commands: |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
120 ;; |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
121 ;; hs-hide-hook in hs-hide-block, hs-hide-all, hs-hide-level |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
122 ;; hs-show-hook hs-show-block, hs-show-all |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
123 ;; |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
124 ;; One of `hs-hide-hook' or `hs-show-hook' is run for the toggling |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
125 ;; commands when the result of the toggle is to hide or show blocks, |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
126 ;; respectively. All hooks are run w/ `run-hooks'. See docs for each |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
127 ;; variable or hook for more info. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
128 ;; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
129 ;; Normally, hideshow tries to determine appropriate values for block |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
130 ;; and comment definitions by examining the buffer's major mode. If |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
131 ;; there are problems, hideshow will not activate and in that case you |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
132 ;; may wish to override hideshow's heuristics by adding an entry to |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
133 ;; variable `hs-special-modes-alist'. Packages that use hideshow should |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
134 ;; do something like: |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
135 ;; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
136 ;; (let ((my-mode-hs-info '(my-mode "{{" "}}" ...))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
137 ;; (if (not (member my-mode-hs-info hs-special-modes-alist)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
138 ;; (setq hs-special-modes-alist |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
139 ;; (cons my-mode-hs-info hs-special-modes-alist)))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
140 ;; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
141 ;; If you have an entry that works particularly well, consider |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
142 ;; submitting it for inclusion in hideshow.el. See docstring for |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
143 ;; `hs-special-modes-alist' for more info on the entry format. |
10276 | 144 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
145 ;; * Bugs |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
146 ;; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
147 ;; (1) Hideshow does not work w/ emacs 18 because emacs 18 lacks the |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
148 ;; function `forward-comment' (among other things). If someone |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
149 ;; writes this, please send me a copy. |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
150 ;; |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
151 ;; (2) Sometimes `hs-headline' can become out of sync. To reset, type |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
152 ;; `M-x hs-minor-mode' twice (that is, deactivate then re-activate |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
153 ;; hideshow). |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
154 ;; |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
155 ;; (3) Hideshow 5.x is developed and tested on GNU Emacs 20.7. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
156 ;; XEmacs compatibility may have bitrotted since 4.29. |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
157 ;; |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
158 ;; (4) Some buffers can't be `byte-compile-file'd properly. This is because |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
159 ;; `byte-compile-file' inserts the file to be compiled in a temporary |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
160 ;; buffer and switches `normal-mode' on. In the case where you have |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
161 ;; `hs-hide-initial-comment-block' in `hs-minor-mode-hook', the hiding of |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
162 ;; the initial comment sometimes hides parts of the first statement (seems |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
163 ;; to be only in `normal-mode'), so there are unbalanced "(" and ")". |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
164 ;; |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
165 ;; The workaround is to clear `hs-minor-mode-hook' when byte-compiling: |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
166 ;; |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
167 ;; (defadvice byte-compile-file (around |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
168 ;; byte-compile-file-hideshow-off |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
169 ;; act) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
170 ;; (let ((hs-minor-mode-hook nil)) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
171 ;; ad-do-it)) |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
172 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
173 ;; (5) Hideshow interacts badly with Ediff and `vc-diff'. At the moment, the |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
174 ;; suggested workaround is to turn off hideshow entirely, for example: |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
175 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
176 ;; (defun turn-off-hideshow () (hs-minor-mode -1)) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
177 ;; (add-hook 'ediff-prepare-buffer-hook 'turn-off-hideshow) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
178 ;; (add-hook 'vc-before-checkin-hook 'turn-off-hideshow) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
179 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
180 ;; In the case of `vc-diff', here is a less invasive workaround: |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
181 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
182 ;; (add-hook 'vc-before-checkin-hook |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
183 ;; '(lambda () |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
184 ;; (goto-char (point-min)) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
185 ;; (hs-show-block))) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
186 ;; |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
187 ;; Unfortunately, these workarounds do not restore hideshow state. |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
188 ;; If someone figures out a better way, please let me know. |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
189 |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
190 ;; * Correspondance |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
191 ;; |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
192 ;; Correspondance welcome; please indicate version number. Send bug |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
193 ;; reports and inquiries to <ttn@gnu.org>. |
10276 | 194 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
195 ;; * Thanks |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
196 ;; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
197 ;; Thanks go to the following people for valuable ideas, code and |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
198 ;; bug reports. |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
199 ;; |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
200 ;; Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
201 ;; Love, Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray, |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
202 ;; Moody Ahmad, Preston F. Crow, Lars Lindberg, Reto Zimmermann, |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
203 ;; Keith Sheffield, Chew Meng Kuan, Tony Lam, Pete Ware, François |
52666
35f18ddf38e0
Thank Michael Ernst; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
204 ;; Pinard, Stefan Monnier, Joseph Eydelnant, Michael Ernst |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
205 ;; |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
206 ;; Special thanks go to Dan Nicolaescu, who reimplemented hideshow using |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
207 ;; overlays (rather than selective display), added isearch magic, folded |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
208 ;; in custom.el compatibility, generalized comment handling, incorporated |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
209 ;; mouse support, and maintained the code in general. Version 4.0 is |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
210 ;; largely due to his efforts. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
211 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
212 ;; * History |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
213 ;; |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
214 ;; Hideshow was inspired when I learned about selective display. It was |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
215 ;; reimplemented to use overlays for 4.0 (see above). WRT older history, |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
216 ;; entries in the masterfile corresponding to versions 1.x and 2.x have |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
217 ;; been lost. XEmacs support is reliable as of 4.29. State save and |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
218 ;; restore was added in 3.5 (not widely distributed), and reliable as of |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
219 ;; 4.30. Otherwise, the code seems stable. Passes checkdoc as of 4.32. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
220 ;; Version 5.x uses new algorithms for block selection and traversal, |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
221 ;; unbundles state save and restore, and includes more isearch support. |
10276 | 222 |
223 ;;; Code: | |
224 | |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
225 (require 'easymenu) |
10276 | 226 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
227 ;;--------------------------------------------------------------------------- |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
228 ;; user-configurable variables |
10276 | 229 |
18070
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
230 (defgroup hideshow nil |
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
231 "Minor mode for hiding and showing program and comment blocks." |
18237
69bb3a2c95b3
(hideshow): Added a :prefix.
Richard M. Stallman <rms@gnu.org>
parents:
18093
diff
changeset
|
232 :prefix "hs-" |
18070
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
233 :group 'languages) |
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
234 |
19233
520a7d40d75c
Correct the autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
18867
diff
changeset
|
235 ;;;###autoload |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
236 (defcustom hs-hide-comments-when-hiding-all t |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
237 "*Hide the comments too when you do an `hs-hide-all'." |
18070
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
238 :type 'boolean |
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
239 :group 'hideshow) |
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
240 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
241 (defcustom hs-minor-mode-hook nil |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
242 "*Hook called when hideshow minor mode is activated or deactivated." |
19833
fdcd167cb293
(hs-minor-mode-hook): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19233
diff
changeset
|
243 :type 'hook |
36787
608c66a9bc34
(hs-minor-mode-hook): Include `:version' in defcustom form.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
36784
diff
changeset
|
244 :group 'hideshow |
608c66a9bc34
(hs-minor-mode-hook): Include `:version' in defcustom form.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
36784
diff
changeset
|
245 :version "21.1") |
18070
a99f3bd58831
(hs-hide-comments-when-hiding-all)
Richard M. Stallman <rms@gnu.org>
parents:
18016
diff
changeset
|
246 |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
247 (defcustom hs-isearch-open 'code |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
248 "*What kind of hidden blocks to open when doing `isearch'. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
249 One of the following symbols: |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
250 |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
251 code -- open only code blocks |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
252 comment -- open only comment blocks |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
253 t -- open both code and comment blocks |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
254 nil -- open neither code nor comment blocks |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
255 |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
256 This has effect iff `search-invisible' is set to `open'." |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
257 :type '(choice (const :tag "open only code blocks" code) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
258 (const :tag "open only comment blocks" comment) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
259 (const :tag "open both code and comment blocks" t) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
260 (const :tag "don't open any of them" nil)) |
18237
69bb3a2c95b3
(hideshow): Added a :prefix.
Richard M. Stallman <rms@gnu.org>
parents:
18093
diff
changeset
|
261 :group 'hideshow) |
69bb3a2c95b3
(hideshow): Added a :prefix.
Richard M. Stallman <rms@gnu.org>
parents:
18093
diff
changeset
|
262 |
19233
520a7d40d75c
Correct the autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
18867
diff
changeset
|
263 ;;;###autoload |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
264 (defvar hs-special-modes-alist |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
265 '((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) |
18093
1e53ce338e0d
(hs-show-hidden-short-form): Updated doc string.
Richard M. Stallman <rms@gnu.org>
parents:
18070
diff
changeset
|
266 (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
267 (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
268 (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
269 ) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
270 "*Alist for initializing the hideshow variables for different modes. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
271 Each element has the form |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
272 (MODE START END COMMENT-START FORWARD-SEXP-FUNC ADJUST-BEG-FUNC). |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
273 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
274 If non-nil, hideshow will use these values as regexps to define blocks |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
275 and comments, respectively for major mode MODE. |
18867
b6e4c4c2a3ef
(hs-special-modes-alist): Use a regexp generated by regexp-opt.
Richard M. Stallman <rms@gnu.org>
parents:
18428
diff
changeset
|
276 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
277 START, END and COMMENT-START are regular expressions. A block is |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
278 defined as text surrounded by START and END. |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
279 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
280 As a special case, START may be a list of the form (COMPLEX-START |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
281 MDATA-SELECTOR), where COMPLEX-START is a regexp w/ multiple parts and |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
282 MDATA-SELECTOR an integer that specifies which sub-match is the proper |
52021
3e312ab8ce0d
(hs-special-modes-alist): Clarify MDATA-SELECTOR doc; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45320
diff
changeset
|
283 place to adjust point, before calling `hs-forward-sexp-func'. Point |
3e312ab8ce0d
(hs-special-modes-alist): Clarify MDATA-SELECTOR doc; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45320
diff
changeset
|
284 is adjusted to the beginning of the specified match. For example, |
3e312ab8ce0d
(hs-special-modes-alist): Clarify MDATA-SELECTOR doc; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45320
diff
changeset
|
285 see the `hs-special-modes-alist' entry for `bibtex-mode'. |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
286 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
287 For some major modes, `forward-sexp' does not work properly. In those |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
288 cases, FORWARD-SEXP-FUNC specifies another function to use instead. |
10276 | 289 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
290 See the documentation for `hs-adjust-block-beginning' to see what is the |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
291 use of ADJUST-BEG-FUNC. |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
292 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
293 If any of the elements is left nil or omitted, hideshow tries to guess |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
294 appropriate values. The regexps should not contain leading or trailing |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
295 whitespace. Case does not matter.") |
10276 | 296 |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
297 (defvar hs-hide-all-non-comment-function nil |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
298 "*Function called if non-nil when doing `hs-hide-all' for non-comments.") |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
299 |
14151 | 300 (defvar hs-hide-hook nil |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
301 "*Hook called (with `run-hooks') at the end of commands to hide text. |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
302 These commands include the toggling commands (when the result is to hide |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
303 a block), `hs-hide-all', `hs-hide-block' and `hs-hide-level'.") |
10276 | 304 |
14151 | 305 (defvar hs-show-hook nil |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
306 "*Hook called (with `run-hooks') at the end of commands to show text. |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
307 These commands include the toggling commands (when the result is to show |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
308 a block), `hs-show-all' and `hs-show-block'..") |
10276 | 309 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
310 ;;--------------------------------------------------------------------------- |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
311 ;; internal variables |
10276 | 312 |
313 (defvar hs-minor-mode nil | |
10841 | 314 "Non-nil if using hideshow mode as a minor mode of some other mode. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
315 Use the command `hs-minor-mode' to toggle or set this variable.") |
10276 | 316 |
317 (defvar hs-minor-mode-map nil | |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
318 "Keymap for hideshow minor mode.") |
10276 | 319 |
27029
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
320 (defvar hs-minor-mode-menu nil |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
321 "Menu for hideshow minor mode.") |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
322 |
10276 | 323 (defvar hs-c-start-regexp nil |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
324 "Regexp for beginning of comments. |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
325 Differs from mode-specific comment regexps in that |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
326 surrounding whitespace is stripped.") |
10276 | 327 |
328 (defvar hs-block-start-regexp nil | |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
329 "Regexp for beginning of block.") |
10276 | 330 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
331 (defvar hs-block-start-mdata-select nil |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
332 "Element in `hs-block-start-regexp' match data to consider as block start. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
333 The internal function `hs-forward-sexp' moves point to the beginning of this |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
334 element (using `match-beginning') before calling `hs-forward-sexp-func'.") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
335 |
10276 | 336 (defvar hs-block-end-regexp nil |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
337 "Regexp for end of block.") |
10276 | 338 |
339 (defvar hs-forward-sexp-func 'forward-sexp | |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
340 "Function used to do a `forward-sexp'. |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
341 Should change for Algol-ish modes. For single-character block |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
342 delimiters -- ie, the syntax table regexp for the character is |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
343 either `(' or `)' -- `hs-forward-sexp-func' would just be |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
344 `forward-sexp'. For other modes such as simula, a more specialized |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
345 function is necessary.") |
10276 | 346 |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
347 (defvar hs-adjust-block-beginning nil |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
348 "Function used to tweak the block beginning. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
349 The block is hidden from the position returned by this function, |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
350 as opposed to hiding it from the position returned when searching |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
351 for `hs-block-start-regexp'. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
352 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
353 For example, in c-like modes, if we wish to also hide the curly braces |
44448 | 354 \(if you think they occupy too much space on the screen), this function |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
355 should return the starting point (at the end of line) of the hidden |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
356 region. |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
357 |
45320
886037f6f545
(hs-adjust-block-beginning): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
44448
diff
changeset
|
358 It is called with a single argument ARG which is the position in |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
359 buffer after the block beginning. |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
360 |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
361 It should return the position from where we should start hiding. |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
362 |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
363 It should not move the point. |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
364 |
18093
1e53ce338e0d
(hs-show-hidden-short-form): Updated doc string.
Richard M. Stallman <rms@gnu.org>
parents:
18070
diff
changeset
|
365 See `hs-c-like-adjust-block-beginning' for an example of using this.") |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
366 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
367 (defvar hs-headline nil |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
368 "Text of the line where a hidden block begins, set during isearch. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
369 You can display this in the mode line by adding the symbol `hs-headline' |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
370 to the variable `mode-line-format'. For example, |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
371 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
372 (unless (memq 'hs-headline mode-line-format) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
373 (setq mode-line-format |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
374 (append '(\"-\" hs-headline) mode-line-format))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
375 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
376 Note that `mode-line-format' is buffer-local.") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
377 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
378 ;;--------------------------------------------------------------------------- |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
379 ;; system dependency |
10841 | 380 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
381 ; ;; xemacs compatibility |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
382 ; (when (string-match "xemacs\\|lucid" emacs-version) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
383 ; ;; use pre-packaged compatiblity layer |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
384 ; (require 'overlay)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
385 ; |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
386 ; ;; xemacs and emacs-19 compatibility |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
387 ; (when (or (not (fboundp 'add-to-invisibility-spec)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
388 ; (not (fboundp 'remove-from-invisibility-spec))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
389 ; ;; `buffer-invisibility-spec' mutators snarfed from Emacs 20.3 lisp/subr.el |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
390 ; (defun add-to-invisibility-spec (arg) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
391 ; (cond |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
392 ; ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
393 ; (setq buffer-invisibility-spec (list arg))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
394 ; (t |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
395 ; (setq buffer-invisibility-spec |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
396 ; (cons arg buffer-invisibility-spec))))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
397 ; (defun remove-from-invisibility-spec (arg) |
52873
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
398 ; (when buffer-invisibility-spec |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
399 ; (setq buffer-invisibility-spec |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
400 ; (delete arg buffer-invisibility-spec))))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
401 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
402 ;; hs-match-data |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
403 (defalias 'hs-match-data 'match-data) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
404 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
405 ;;--------------------------------------------------------------------------- |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
406 ;; support functions |
10276 | 407 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
408 (defun hs-discard-overlays (from to) |
27029
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
409 "Delete hideshow overlays in region defined by FROM and TO." |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
410 (when (< to from) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
411 (setq from (prog1 to (setq to from)))) |
27178
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
412 (let ((ovs (overlays-in from to))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
413 (while ovs |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
414 (let ((ov (car ovs))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
415 (when (overlay-get ov 'hs) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
416 (delete-overlay ov))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
417 (setq ovs (cdr ovs))))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
418 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
419 (defun hs-isearch-show (ov) |
27029
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
420 "Delete overlay OV, and set `hs-headline' to nil. |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
421 |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
422 This function is meant to be used as the `isearch-open-invisible' |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
423 property of an overlay." |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
424 (setq hs-headline nil) |
27029
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
425 (delete-overlay ov)) |
10276 | 426 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
427 (defun hs-isearch-show-temporary (ov hide-p) |
27029
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
428 "Hide or show overlay OV, and set `hs-headline', all depending on HIDE-P. |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
429 If HIDE-P is non-nil, `hs-headline' is set to nil and overlay OV is hidden. |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
430 Otherwise, `hs-headline' is set to the line of text at the head of OV, and |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
431 OV is shown. |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
432 |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
433 This function is meant to be used as the `isearch-open-invisible-temporary' |
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
434 property of an overlay." |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
435 (setq hs-headline |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
436 (if hide-p |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
437 nil |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
438 (or hs-headline |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
439 (let ((start (overlay-start ov))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
440 (buffer-substring |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
441 (save-excursion (goto-char start) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
442 (beginning-of-line) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
443 (skip-chars-forward " \t") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
444 (point)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
445 start))))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
446 (force-mode-line-update) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
447 (overlay-put ov 'invisible (and hide-p 'hs))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
448 |
10276 | 449 (defun hs-flag-region (from to flag) |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
450 "Hide or show lines from FROM to TO, according to FLAG. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
451 If FLAG is nil then text is shown, while if FLAG is non-nil the text is |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
452 hidden. FLAG must be one of the symbols `code' or `comment', depending |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
453 on what kind of block is to be hidden." |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
454 (save-excursion |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
455 ;; first clear it all out |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
456 (hs-discard-overlays from to) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
457 ;; now create overlays if needed |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
458 (when flag |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
459 (let ((overlay (make-overlay from to))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
460 (overlay-put overlay 'invisible 'hs) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
461 (overlay-put overlay 'hs flag) |
38980
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
462 (when (or (eq hs-isearch-open t) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
463 (eq hs-isearch-open flag) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
464 ;; deprecated backward compatibility -- `block'<=>`code' |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
465 (and (eq 'block hs-isearch-open) |
6ef918297577
Update first-line description.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
38419
diff
changeset
|
466 (eq 'code flag))) |
27178
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
467 (overlay-put overlay 'isearch-open-invisible 'hs-isearch-show) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
468 (overlay-put overlay |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
469 'isearch-open-invisible-temporary |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
470 'hs-isearch-show-temporary)) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
471 overlay)))) |
10276 | 472 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
473 (defun hs-forward-sexp (match-data arg) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
474 "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' w/ ARG. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
475 Original match data is restored upon return." |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
476 (save-match-data |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
477 (set-match-data match-data) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
478 (goto-char (match-beginning hs-block-start-mdata-select)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
479 (funcall hs-forward-sexp-func arg))) |
18237
69bb3a2c95b3
(hideshow): Added a :prefix.
Richard M. Stallman <rms@gnu.org>
parents:
18093
diff
changeset
|
480 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
481 (defun hs-hide-comment-region (beg end &optional repos-end) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
482 "Hide a region from BEG to END, marking it as a comment. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
483 Optional arg REPOS-END means reposition at end." |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
484 (hs-flag-region (progn (goto-char beg) (end-of-line) (point)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
485 (progn (goto-char end) (end-of-line) (point)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
486 'comment) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
487 (goto-char (if repos-end end beg))) |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
488 |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
489 (defun hs-hide-block-at-point (&optional end comment-reg) |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
490 "Hide block iff on block beginning. |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
491 Optional arg END means reposition at end. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
492 Optional arg COMMENT-REG is a list of the form (BEGIN END) and |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
493 specifies the limits of the comment, or nil if the block is not |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
494 a comment. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
495 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
496 The block beginning is adjusted by `hs-adjust-block-beginning' |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
497 and then further adjusted to be at the end of the line." |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
498 (if comment-reg |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
499 (hs-hide-comment-region (car comment-reg) (cadr comment-reg) end) |
52873
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
500 (when (looking-at hs-block-start-regexp) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
501 (let* ((mdata (hs-match-data t)) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
502 (pure-p (match-end 0)) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
503 (p |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
504 ;; `p' is the point at the end of the block beginning, |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
505 ;; which may need to be adjusted |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
506 (save-excursion |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
507 (goto-char (funcall (or hs-adjust-block-beginning |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
508 'identity) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
509 pure-p)) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
510 ;; whatever the adjustment, we move to eol |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
511 (end-of-line) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
512 (point))) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
513 (q |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
514 ;; `q' is the point at the end of the block |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
515 (progn (hs-forward-sexp mdata 1) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
516 (end-of-line) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
517 (point)))) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
518 (when (and (< p (point)) (> (count-lines p q) 1)) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
519 (overlay-put (hs-flag-region p q 'code) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
520 'hs-ofs |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
521 (- pure-p p))) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
522 (goto-char (if end q (min p pure-p))))))) |
10276 | 523 |
524 (defun hs-safety-is-job-n () | |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
525 "Warn if `buffer-invisibility-spec' does not contain symbol `hs'." |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
526 (unless (and (listp buffer-invisibility-spec) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
527 (assq 'hs buffer-invisibility-spec)) |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
528 (message "Warning: `buffer-invisibility-spec' does not contain hs!!") |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
529 (sit-for 2))) |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
530 |
10276 | 531 (defun hs-inside-comment-p () |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
532 "Return non-nil if point is inside a comment, otherwise nil. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
533 Actually, return a list containing the buffer position of the start |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
534 and the end of the comment. A comment block can be hidden only if on |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
535 its starting line there is only whitespace preceding the actual comment |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
536 beginning. If we are inside of a comment but this condition is not met, |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
537 we return a list having a nil as its car and the end of comment position |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
538 as cdr." |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
539 (save-excursion |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
540 ;; the idea is to look backwards for a comment start regexp, do a |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
541 ;; forward comment, and see if we are inside, then extend extend |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
542 ;; forward and backward as long as we have comments |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
543 (let ((q (point))) |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
544 (when (or (looking-at hs-c-start-regexp) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
545 (re-search-backward hs-c-start-regexp (point-min) t)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
546 (forward-comment (- (buffer-size))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
547 (skip-chars-forward " \t\n\f") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
548 (let ((p (point)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
549 (not-hidable nil)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
550 (beginning-of-line) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
551 (unless (looking-at (concat "[ \t]*" hs-c-start-regexp)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
552 ;; we are in this situation: (example) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
553 ;; (defun bar () |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
554 ;; (foo) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
555 ;; ) ; comment |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
556 ;; ^ |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
557 ;; the point was here before doing (beginning-of-line) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
558 ;; here we should advance till the next comment which |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
559 ;; eventually has only white spaces preceding it on the same |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
560 ;; line |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
561 (goto-char p) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
562 (forward-comment 1) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
563 (skip-chars-forward " \t\n\f") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
564 (setq p (point)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
565 (while (and (< (point) q) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
566 (> (point) p) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
567 (not (looking-at hs-c-start-regexp))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
568 (setq p (point));; use this to avoid an infinite cycle |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
569 (forward-comment 1) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
570 (skip-chars-forward " \t\n\f")) |
52873
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
571 (when (or (not (looking-at hs-c-start-regexp)) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
572 (> (point) q)) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
573 ;; we cannot hide this comment block |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
574 (setq not-hidable t))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
575 ;; goto the end of the comment |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
576 (forward-comment (buffer-size)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
577 (skip-chars-backward " \t\n\f") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
578 (end-of-line) |
52873
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
579 (when (>= (point) q) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
580 (list (if not-hidable nil p) (point)))))))) |
10276 | 581 |
582 (defun hs-grok-mode-type () | |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
583 "Set up hideshow variables for new buffers. |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
584 If `hs-special-modes-alist' has information associated with the |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
585 current buffer's major mode, use that. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
586 Otherwise, guess start, end and `comment-start' regexps; `forward-sexp' |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
587 function; and adjust-block-beginning function." |
23253
0d6c3732f9d2
(hs-grok-mode-type) Handle nil `comment-start' and `comment-end'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22445
diff
changeset
|
588 (if (and (boundp 'comment-start) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
589 (boundp 'comment-end) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
590 comment-start comment-end) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
591 (let* ((lookup (assoc major-mode hs-special-modes-alist)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
592 (start-elem (or (nth 1 lookup) "\\s("))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
593 (if (listp start-elem) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
594 ;; handle (START-REGEXP MDATA-SELECT) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
595 (setq hs-block-start-regexp (car start-elem) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
596 hs-block-start-mdata-select (cadr start-elem)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
597 ;; backwards compatibility: handle simple START-REGEXP |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
598 (setq hs-block-start-regexp start-elem |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
599 hs-block-start-mdata-select 0)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
600 (setq hs-block-end-regexp (or (nth 2 lookup) "\\s)") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
601 hs-c-start-regexp (or (nth 3 lookup) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
602 (let ((c-start-regexp |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
603 (regexp-quote comment-start))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
604 (if (string-match " +$" c-start-regexp) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
605 (substring c-start-regexp |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
606 0 (1- (match-end 0))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
607 c-start-regexp))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
608 hs-forward-sexp-func (or (nth 4 lookup) 'forward-sexp) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
609 hs-adjust-block-beginning (nth 5 lookup))) |
52873
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
610 (setq hs-minor-mode nil) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
611 (error "%s Mode doesn't support Hideshow Minor Mode" mode-name))) |
10276 | 612 |
613 (defun hs-find-block-beginning () | |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
614 "Reposition point at block-start. |
27029
4ad11069f66d
(hs-minor-mode-menu): Fix omission bug; was used but not declared.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
26989
diff
changeset
|
615 Return point, or nil if original point was not in a block." |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
616 (let ((done nil) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
617 (here (point))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
618 ;; look if current line is block start |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
619 (if (looking-at hs-block-start-regexp) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
620 (point) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
621 ;; look backward for the start of a block that contains the cursor |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
622 (while (and (re-search-backward hs-block-start-regexp nil t) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
623 (not (setq done |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
624 (< here (save-excursion |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
625 (hs-forward-sexp (hs-match-data t) 1) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
626 (point))))))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
627 (if done |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
628 (point) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
629 (goto-char here) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
630 nil)))) |
10276 | 631 |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
632 (defun hs-hide-level-recursive (arg minp maxp) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
633 "Recursively hide blocks ARG levels below point in region (MINP MAXP)." |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
634 (when (hs-find-block-beginning) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
635 (setq minp (1+ (point))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
636 (funcall hs-forward-sexp-func 1) |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
637 (setq maxp (1- (point)))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
638 (hs-flag-region minp maxp nil) ; eliminate weirdness |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
639 (goto-char minp) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
640 (while (progn |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
641 (forward-comment (buffer-size)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
642 (and (< (point) maxp) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
643 (re-search-forward hs-block-start-regexp maxp t))) |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
644 (if (> arg 1) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
645 (hs-hide-level-recursive (1- arg) minp maxp) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
646 (goto-char (match-beginning hs-block-start-mdata-select)) |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
647 (hs-hide-block-at-point t))) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
648 (hs-safety-is-job-n) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
649 (goto-char maxp)) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
650 |
10276 | 651 (defmacro hs-life-goes-on (&rest body) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
652 "Evaluate BODY forms iff variable `hs-minor-mode' is non-nil. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
653 In the dynamic context of this macro, `inhibit-point-motion-hooks' |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
654 and `case-fold-search' are both t." |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
655 `(when hs-minor-mode |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
656 (let ((inhibit-point-motion-hooks t) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
657 (case-fold-search t)) |
22109
3e53877b4a08
(hs-life-goes-on): Use Emacs' native backquote support.
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20820
diff
changeset
|
658 ,@body))) |
3e53877b4a08
(hs-life-goes-on): Use Emacs' native backquote support.
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20820
diff
changeset
|
659 |
18867
b6e4c4c2a3ef
(hs-special-modes-alist): Use a regexp generated by regexp-opt.
Richard M. Stallman <rms@gnu.org>
parents:
18428
diff
changeset
|
660 (put 'hs-life-goes-on 'edebug-form-spec '(&rest form)) |
10276 | 661 |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
662 (defun hs-already-hidden-p () |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
663 "Return non-nil if point is in an already-hidden block, otherwise nil." |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
664 (save-excursion |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
665 (let ((c-reg (hs-inside-comment-p))) |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
666 (if (and c-reg (nth 0 c-reg)) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
667 ;; point is inside a comment, and that comment is hidable |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
668 (goto-char (nth 0 c-reg)) |
52873
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
669 (when (and (not c-reg) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
670 (hs-find-block-beginning) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
671 (looking-at hs-block-start-regexp)) |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
672 ;; point is inside a block |
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
673 (goto-char (match-end 0))))) |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
674 (end-of-line) |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
675 (let ((overlays (overlays-at (point))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
676 (found nil)) |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
677 (while (and (not found) (overlayp (car overlays))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
678 (setq found (overlay-get (car overlays) 'hs) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
679 overlays (cdr overlays))) |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
680 found))) |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
681 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
682 (defun hs-c-like-adjust-block-beginning (initial) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
683 "Adjust INITIAL, the buffer position after `hs-block-start-regexp'. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
684 Actually, point is never moved; a new position is returned that is |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
685 the end of the C-function header. This adjustment function is meant |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
686 to be assigned to `hs-adjust-block-beginning' for C-like modes." |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
687 (save-excursion |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
688 (goto-char (1- initial)) |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
689 (forward-comment (- (buffer-size))) |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
690 (point))) |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
691 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
692 ;;--------------------------------------------------------------------------- |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
693 ;; commands |
10276 | 694 |
695 (defun hs-hide-all () | |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
696 "Hide all top level blocks, displaying only first and last lines. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
697 Move point to the beginning of the line, and run the normal hook |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
698 `hs-hide-hook'. See documentation for `run-hooks'. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
699 If `hs-hide-comments-when-hiding-all' is non-nil, also hide the comments." |
10276 | 700 (interactive) |
701 (hs-life-goes-on | |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
702 (message "Hiding all blocks ...") |
10276 | 703 (save-excursion |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
704 (hs-flag-region (point-min) (point-max) nil) ; eliminate weirdness |
10276 | 705 (goto-char (point-min)) |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
706 (let ((count 0) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
707 (re (concat "\\(" |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
708 hs-block-start-regexp |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
709 "\\)" |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
710 (if hs-hide-comments-when-hiding-all |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
711 (concat "\\|\\(" |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
712 hs-c-start-regexp |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
713 "\\)") |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
714 "")))) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
715 (while (progn |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
716 (unless hs-hide-comments-when-hiding-all |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
717 (forward-comment (point-max))) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
718 (re-search-forward re (point-max) t)) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
719 (if (match-beginning 1) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
720 ;; we have found a block beginning |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
721 (progn |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
722 (goto-char (match-beginning 1)) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
723 (if hs-hide-all-non-comment-function |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
724 (funcall hs-hide-all-non-comment-function) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
725 (hs-hide-block-at-point t))) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
726 ;; found a comment, probably |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
727 (let ((c-reg (hs-inside-comment-p))) ; blech! |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
728 (when (and c-reg (car c-reg)) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
729 (if (> (count-lines (car c-reg) (nth 1 c-reg)) 1) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
730 (hs-hide-block-at-point t c-reg) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
731 (goto-char (nth 1 c-reg)))))) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
732 (message "Hiding ... %d" (setq count (1+ count))))) |
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
733 (hs-safety-is-job-n)) |
10276 | 734 (beginning-of-line) |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
735 (message "Hiding all blocks ... done") |
14151 | 736 (run-hooks 'hs-hide-hook))) |
10276 | 737 |
738 (defun hs-show-all () | |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
739 "Show everything then run `hs-show-hook'. See `run-hooks'." |
10276 | 740 (interactive) |
741 (hs-life-goes-on | |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
742 (message "Showing all blocks ...") |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
743 (hs-flag-region (point-min) (point-max) nil) |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
744 (message "Showing all blocks ... done") |
14151 | 745 (run-hooks 'hs-show-hook))) |
10276 | 746 |
747 (defun hs-hide-block (&optional end) | |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
748 "Select a block and hide it. With prefix arg, reposition at END. |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
749 Upon completion, point is repositioned and the normal hook |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
750 `hs-hide-hook' is run. See documentation for `run-hooks'." |
10276 | 751 (interactive "P") |
752 (hs-life-goes-on | |
753 (let ((c-reg (hs-inside-comment-p))) | |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
754 (cond |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
755 ((and c-reg (or (null (nth 0 c-reg)) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
756 (<= (count-lines (car c-reg) (nth 1 c-reg)) 1))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
757 (message "(not enough comment lines to hide)")) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
758 ((or c-reg |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
759 (looking-at hs-block-start-regexp) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
760 (hs-find-block-beginning)) |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
761 (hs-hide-block-at-point end c-reg) |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
762 (hs-safety-is-job-n) |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
763 (run-hooks 'hs-hide-hook)))))) |
10276 | 764 |
765 (defun hs-show-block (&optional end) | |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
766 "Select a block and show it. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
767 With prefix arg, reposition at END. Upon completion, point is |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
768 repositioned and the normal hook `hs-show-hook' is run. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
769 See documentation for functions `hs-hide-block' and `run-hooks'." |
10276 | 770 (interactive "P") |
771 (hs-life-goes-on | |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
772 (or |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
773 ;; first see if we have something at the end of the line |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
774 (catch 'eol-begins-hidden-region-p |
27178
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
775 (let ((here (point)) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
776 (ovs (save-excursion (end-of-line) (overlays-at (point))))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
777 (while ovs |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
778 (let ((ov (car ovs))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
779 (when (overlay-get ov 'hs) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
780 (goto-char |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
781 (cond (end (overlay-end ov)) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
782 ((eq 'comment (overlay-get ov 'hs)) here) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
783 (t (+ (overlay-start ov) (overlay-get ov 'hs-ofs))))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
784 (delete-overlay ov) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
785 (throw 'eol-begins-hidden-region-p t))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
786 (setq ovs (cdr ovs))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
787 nil)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
788 ;; not immediately obvious, look for a suitable block |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
789 (let ((c-reg (hs-inside-comment-p)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
790 p q) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
791 (cond (c-reg |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
792 (when (car c-reg) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
793 (setq p (car c-reg) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
794 q (cadr c-reg)))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
795 ((and (hs-find-block-beginning) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
796 (looking-at hs-block-start-regexp)) ; fresh match-data, ugh |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
797 (setq p (point) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
798 q (progn (hs-forward-sexp (hs-match-data t) 1) (point))))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
799 (when (and p q) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
800 (hs-flag-region p q nil) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
801 (goto-char (if end q (1+ p))))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
802 (hs-safety-is-job-n) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
803 (run-hooks 'hs-show-hook)))) |
10276 | 804 |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
805 (defun hs-hide-level (arg) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
806 "Hide all blocks ARG levels below this block. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
807 The hook `hs-hide-hook' is run; see `run-hooks'." |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
808 (interactive "p") |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
809 (hs-life-goes-on |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
810 (save-excursion |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
811 (message "Hiding blocks ...") |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
812 (hs-hide-level-recursive arg (point-min) (point-max)) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
813 (message "Hiding blocks ... done")) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
814 (hs-safety-is-job-n) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
815 (run-hooks 'hs-hide-hook))) |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
816 |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
817 (defun hs-toggle-hiding () |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
818 "Toggle hiding/showing of a block. |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
819 See `hs-hide-block' and `hs-show-block'." |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
820 (interactive) |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
821 (hs-life-goes-on |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
822 (if (hs-already-hidden-p) |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
823 (hs-show-block) |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
824 (hs-hide-block)))) |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
825 |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
826 (defun hs-mouse-toggle-hiding (e) |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
827 "Toggle hiding/showing of a block. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
828 This command should be bound to a mouse key. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
829 Argument E is a mouse event used by `mouse-set-point'. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
830 See `hs-hide-block' and `hs-show-block'." |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
831 (interactive "@e") |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
832 (hs-life-goes-on |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
833 (mouse-set-point e) |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
834 (hs-toggle-hiding))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
835 |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
836 (defun hs-hide-initial-comment-block () |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
837 "Hide the first block of comments in a file. |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
838 This can be useful if you have huge RCS logs in those comments." |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
839 (interactive) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
840 (hs-life-goes-on |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
841 (let ((c-reg (save-excursion |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
842 (goto-char (point-min)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
843 (skip-chars-forward " \t\n\f") |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
844 (hs-inside-comment-p)))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
845 (when c-reg |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
846 (let ((beg (car c-reg)) (end (cadr c-reg))) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
847 ;; see if we have enough comment lines to hide |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
848 (when (> (count-lines beg end) 1) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
849 (hs-hide-comment-region beg end))))))) |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
850 |
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
851 ;;;###autoload |
10276 | 852 (defun hs-minor-mode (&optional arg) |
10841 | 853 "Toggle hideshow minor mode. |
854 With ARG, turn hideshow minor mode on if ARG is positive, off otherwise. | |
855 When hideshow minor mode is on, the menu bar is augmented with hideshow | |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
856 commands and the hideshow commands are enabled. |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
857 The value '(hs . t) is added to `buffer-invisibility-spec'. |
14151 | 858 |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
859 The main commands are: `hs-hide-all', `hs-show-all', `hs-hide-block', |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
860 `hs-show-block', `hs-hide-level' and `hs-toggle-hiding'. There is also |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
861 `hs-hide-initial-comment-block' and `hs-mouse-toggle-hiding'. |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
862 |
10841 | 863 Turning hideshow minor mode off reverts the menu bar and the |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
864 variables to default values and disables the hideshow commands. |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
865 |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
866 Lastly, the normal hook `hs-minor-mode-hook' is run using `run-hooks'. |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
867 |
18016
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
868 Key bindings: |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
869 \\{hs-minor-mode-map}" |
22cbed2e6098
(hs-special-modes-alist): Include also the
Richard M. Stallman <rms@gnu.org>
parents:
17270
diff
changeset
|
870 |
10276 | 871 (interactive "P") |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
872 (setq hs-headline nil |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
873 hs-minor-mode (if (null arg) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
874 (not hs-minor-mode) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
875 (> (prefix-numeric-value arg) 0))) |
10276 | 876 (if hs-minor-mode |
877 (progn | |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
878 (hs-grok-mode-type) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
879 (easy-menu-add hs-minor-mode-menu) |
38419
6dd037b0146e
(hs-minor-mode): Use make-local-variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38193
diff
changeset
|
880 (set (make-local-variable 'line-move-ignore-invisible) t) |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
881 (add-to-invisibility-spec '(hs . t))) |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
882 (easy-menu-remove hs-minor-mode-menu) |
27771
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
883 (remove-from-invisibility-spec '(hs . t))) |
9d04cc14a320
(hs-flag-region): No longer use `intangible' overlay property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27183
diff
changeset
|
884 (run-hooks 'hs-minor-mode-hook)) |
10276 | 885 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
886 ;;--------------------------------------------------------------------------- |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
887 ;; load-time actions |
10841 | 888 |
10276 | 889 ;; keymaps and menus |
52873
2f6d31064afd
Rewrite one-armed `if'
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52666
diff
changeset
|
890 (unless hs-minor-mode-map |
17259
24a4fe3b0ae9
(hs-show-all, hs-safety-is-job-n): Fix messages.
Richard M. Stallman <rms@gnu.org>
parents:
16774
diff
changeset
|
891 (setq hs-minor-mode-map (make-sparse-keymap)) |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
892 (easy-menu-define hs-minor-mode-menu |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
893 hs-minor-mode-map |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
894 "Menu used when hideshow minor mode is active." |
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
895 (cons "Hide/Show" |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
896 (mapcar |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
897 ;; Interpret each table entry as follows: first, populate keymap |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
898 ;; with elements 2 and 1; then, for easymenu, use entry directly |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
899 ;; unless element 0 is nil, in which case the entry is "omitted". |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
900 (lambda (ent) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
901 (define-key hs-minor-mode-map (aref ent 2) (aref ent 1)) |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
902 (if (aref ent 0) ent "-----")) |
31856
0a0adbc72d2f
Update author email address.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
30429
diff
changeset
|
903 ;; These bindings roughly imitate those used by Outline mode. |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
904 ;; menu entry command key |
36784 | 905 '(["Hide Block" hs-hide-block "\C-c@\C-h"] |
906 ["Show Block" hs-show-block "\C-c@\C-s"] | |
907 ["Hide All" hs-hide-all "\C-c@\C-\M-h"] | |
908 ["Show All" hs-show-all "\C-c@\C-\M-s"] | |
909 ["Hide Level" hs-hide-level "\C-c@\C-l"] | |
910 ["Toggle Hiding" hs-toggle-hiding "\C-c@\C-c"] | |
38193
715aab816884
(hs-minor-mode-map): Use mouse-2, not button-2, when binding
Richard M. Stallman <rms@gnu.org>
parents:
37892
diff
changeset
|
911 [nil hs-mouse-toggle-hiding [(shift mouse-2)]] |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
912 ))))) |
10276 | 913 |
914 ;; some housekeeping | |
10841 | 915 (or (assq 'hs-minor-mode minor-mode-map-alist) |
916 (setq minor-mode-map-alist | |
917 (cons (cons 'hs-minor-mode hs-minor-mode-map) | |
918 minor-mode-map-alist))) | |
919 (or (assq 'hs-minor-mode minor-mode-alist) | |
920 (setq minor-mode-alist (append minor-mode-alist | |
921 (list '(hs-minor-mode " hs"))))) | |
10276 | 922 |
22444
977318751daa
Require `easymenu'. Rework to use easymenu. Remove eol ws.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
22109
diff
changeset
|
923 ;; make some variables permanently buffer-local |
27178
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
924 (let ((vars '(hs-minor-mode |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
925 hs-c-start-regexp |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
926 hs-block-start-regexp |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
927 hs-block-start-mdata-select |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
928 hs-block-end-regexp |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
929 hs-forward-sexp-func |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
930 hs-adjust-block-beginning))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
931 (while vars |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
932 (let ((var (car vars))) |
2d84945a90bf
(hs-discard-overlays, hs-flag-region, hs-show-block):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27029
diff
changeset
|
933 (make-variable-buffer-local var) |
27183
6ddedf5e30c8
Fix buglet in local variables initialization.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27178
diff
changeset
|
934 (put var 'permanent-local t)) |
6ddedf5e30c8
Fix buglet in local variables initialization.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
27178
diff
changeset
|
935 (setq vars (cdr vars)))) |
10276 | 936 |
26989
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
937 ;;--------------------------------------------------------------------------- |
340ed24f202a
Generally, synch w/ maintainer version 5.9.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
23368
diff
changeset
|
938 ;; that's it |
10276 | 939 |
940 (provide 'hideshow) | |
941 | |
52401 | 942 ;;; arch-tag: 378b6852-e82a-466a-aee8-d9c73859a65e |
10276 | 943 ;;; hideshow.el ends here |