annotate lisp/reposition.el @ 83513:966a40e7fb54

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-234 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-235 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-236 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-237 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-238 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-239 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-240 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-241 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-242 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-243 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-244 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-245 (Ffield_beginning, find_field): Undo change of 2006-04-23. * emacs@sv.gnu.org/emacs--devo--0--patch-246 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-247 Rcirc patch from Ryan Yeske * emacs@sv.gnu.org/emacs--devo--0--patch-248 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-249 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-250 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-251 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-87 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-88 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-89 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-90 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-91 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-92 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-93 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-94 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-95 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-553
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 28 Apr 2006 14:48:18 +0000
parents 3bd95f4f2941
children b2e5081b9320 c5406394f567
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
1 ;;; reposition.el --- center a Lisp function or comment on the screen
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
2
64762
41bb365f41c4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64091
diff changeset
3 ;; Copyright (C) 1991, 1994, 2002, 2003, 2004,
68651
3bd95f4f2941 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64762
diff changeset
4 ;; 2005, 2006 Free Software Foundation, Inc.
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
5
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
6 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 906
diff changeset
7 ;; Created: Jan 1991
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
8 ;; Maintainer: FSF
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
14 ;; the Free Software Foundation; either version 2, or (at your option)
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 ;; any later version.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; GNU General Public License for more details.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64091
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
25 ;; Boston, MA 02110-1301, USA.
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
27 ;;; Commentary:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
28
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
29 ;; Reposition-window makes an entire function definition or comment visible,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
30 ;; or, if it is already visible, places it at the top of the window;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
31 ;; additional invocations toggle the visibility of comments preceding the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
32 ;; code. For the gory details, see the documentation for reposition-window;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
33 ;; rather than reading that, you may just want to play with it.
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
35 ;; This tries pretty hard to do the recentering correctly; the precise
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
36 ;; action depends on what the buffer looks like. If you find a situation
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
37 ;; where it doesn't behave well, let me know. This function is modeled
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
38 ;; after one of the same name in ZMACS, but the code is all-new and the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
39 ;; behavior in some situations differs.
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
40
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
41 ;;; Code:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
42
262
990d2229354c *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 197
diff changeset
43 ;;;###autoload
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 (defun reposition-window (&optional arg)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45 "Make the current definition and/or comment visible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 Further invocations move it to the top of the window or toggle the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47 visibility of comments that precede it.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
48 Point is left unchanged unless prefix ARG is supplied.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
49 If the definition is fully onscreen, it is moved to the top of the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50 window. If it is partly offscreen, the window is scrolled to get the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
51 definition (or as much as will fit) onscreen, unless point is in a comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
52 which is also partly offscreen, in which case the scrolling attempts to get
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53 as much of the comment onscreen as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
54 Initially `reposition-window' attempts to make both the definition and
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
55 preceding comments visible. Further invocations toggle the visibility of
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
56 the comment lines.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
57 If ARG is non-nil, point may move in order to make the whole defun
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
58 visible (if only part could otherwise be made so), to make the defun line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
59 visible (if point is in code and it could not be made so, or if only
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
60 comments, including the first comment line, are visible), or to make the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
61 first comment line visible (if point is in a comment)."
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
62 (interactive "P")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
63 (let* (;; (here (save-excursion (beginning-of-line) (point)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
64 (here (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
65 ;; change this name once I've gotten rid of references to ht.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
66 ;; this is actually the number of the last screen line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
67 (ht (- (window-height (selected-window)) 2))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
68 (line (repos-count-screen-lines (window-start) (point)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 (comment-height
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
70 ;; The call to max deals with the case of cursor between defuns.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
71 (max 0
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
72 (repos-count-screen-lines-signed
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
73 ;; the beginning of the preceding comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
74 (save-excursion
4182
b85c00ac4ae3 (reposition-window): Don't forward-char if eobp.
Richard M. Stallman <rms@gnu.org>
parents: 2315
diff changeset
75 (if (not (eobp)) (forward-char 1))
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
76 (end-of-defun -1)
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
77 ;; Skip whitespace, newlines, and form feeds.
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
78 (if (re-search-forward "[^ \t\n\f]" nil t)
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
79 (backward-char 1))
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
80 (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
81 here)))
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
82 (defun-height
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
83 (repos-count-screen-lines-signed
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
84 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
85 (end-of-defun 1) ; so comments associate with following defuns
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 (beginning-of-defun 1)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
87 (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
88 here))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
89 ;; This must be positive, so don't use the signed version.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90 (defun-depth (repos-count-screen-lines here
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
91 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
92 (end-of-defun 1)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93 (point))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94 (defun-line-onscreen-p
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95 (and (<= defun-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
96 (<= (- line defun-height) ht))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
97 (cond ((or (= comment-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
98 (and (= line ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99 (> comment-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100 ;; if defun line offscreen, we should be in case 4
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101 defun-line-onscreen-p))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
102 ;; Either first comment line is at top of screen or (point at
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
103 ;; bottom of screen, defun line onscreen, and first comment line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104 ;; off top of screen). That is, it looks like we just did
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105 ;; recenter-definition, trying to fit as much of the comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106 ;; onscreen as possible. Put defun line at top of screen; that
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 ;; is, show as much code, and as few comments, as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
108
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
109 (if (and arg (> defun-depth (1+ ht)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
110 ;; Can't fit whole defun onscreen without moving point.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
111 (progn (end-of-defun) (beginning-of-defun) (recenter 0))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
112 (recenter (max defun-height 0)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
113 ;;(repos-debug-macro "1")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
114 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
115
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
116 ((or (= defun-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
117 (= line 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
118 (and (< line comment-height)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
119 (< defun-height 0)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
120 ;; Defun line or cursor at top of screen, OR cursor in comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
121 ;; whose first line is offscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
122 ;; Avoid moving definition up even if defun runs offscreen;
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
123 ;; we care more about getting the comment onscreen.
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
124
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
125 (cond ((= line ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
126 ;; cursor on last screen line (and so in a comment)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
127 (if arg (progn (end-of-defun) (beginning-of-defun)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
128 (recenter 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
129 ;;(repos-debug-macro "2a")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
130 )
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
131
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
132 ;; This condition, copied from case 4, may not be quite right
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
133
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
134 ((and arg (< ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
135 ;; Can't get first comment line onscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
136 ;; Go there and try again.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
137 (forward-line (- comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
138 (beginning-of-line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
139 ;; was (reposition-window)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
140 (recenter 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
141 ;;(repos-debug-macro "2b")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
142 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
143 (t
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
144 (recenter (min ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
145 ;;(repos-debug-macro "2c")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
146 ))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
147 ;; (recenter (min ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
148 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
149
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
150 ((and (> (+ line defun-depth -1) ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
151 defun-line-onscreen-p)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
152 ;; Defun runs off the bottom of the screen and the defun line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
153 ;; is onscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
154 ;; Move the defun up.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
155 (recenter (max 0 (1+ (- ht defun-depth)) defun-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
156 ;;(repos-debug-macro "3")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
157 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
158
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
159 (t
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
160 ;; If on the bottom line and comment start is offscreen
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
161 ;; then just move all comments offscreen, or at least as
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
162 ;; far as they'll go.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
163
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
164 ;; Try to get as much of the comments onscreen as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
165 (if (and arg (< ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
166 ;; Can't get defun line onscreen; go there and try again.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
167 (progn (forward-line (- defun-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
168 (beginning-of-line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
169 (reposition-window))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
170 (recenter (min ht comment-height)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
171 ;;(repos-debug-macro "4")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
172 ))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
173
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
174 ;;;###autoload (define-key esc-map "\C-l" 'reposition-window)
264
7db4ff4204a5 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 262
diff changeset
175
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
176 ;;; Auxiliary functions
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
177
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
178 ;; Return number of screen lines between START and END.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
179 (defun repos-count-screen-lines (start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
180 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
181 (save-restriction
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
182 (narrow-to-region start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
183 (goto-char (point-min))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
184 (vertical-motion (- (point-max) (point-min))))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
185
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
186 ;; Return number of screen lines between START and END; returns a negative
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
187 ;; number if END precedes START.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
188 (defun repos-count-screen-lines-signed (start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
189 (let ((lines (repos-count-screen-lines start end)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
190 (if (< start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
191 lines
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
192 (- lines))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
193
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
194 ;; (defmacro repos-debug-macro (case-no)
41611
64ee9a4a698e Converted backquote to the new style (in comments).
Sam Steingold <sds@gnu.org>
parents: 18383
diff changeset
195 ;; `(message (concat "Case " ,case-no ": %s %s %s %s %s")
64ee9a4a698e Converted backquote to the new style (in comments).
Sam Steingold <sds@gnu.org>
parents: 18383
diff changeset
196 ;; ht line comment-height defun-height defun-depth))
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
197
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
198 (provide 'reposition)
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
199
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 41611
diff changeset
200 ;;; arch-tag: 79487039-3bd7-4ab5-a3e8-ecf3b4919010
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
201 ;;; reposition.el ends here