annotate lisp/reposition.el @ 10219:d97313bb6f39

(bibtex-string, bibtex-preamble): Use forward-line. (sort-subr): Don't call autload for this--that's done in loaddefs.el. (bibtex-mode): Add autoload cookie. Changed keybinding for bibtex-print-help-message (from \C-ch to \C-c?). Therefore, describe-mode is not longer on \C-c?. Also, changed prefix \C-cn for bibtex-narrow functions to \C-c\C-r. (bibtex-string-files): Changed documentation. (bibtex-mode-map): Inscriptions of menu bar changed from "Entry Types" to "Entry-Types" and "Bibtex Edit" to "BibTeX-Edit". (bibtex-string-files): Changed documentation. (bibtex-mode): If environment variable BIBINPUTS isn't defined, string files are searched in the current directory. (bibtex-completion-candidates): Now buffer-local to allow evaluation of different bibtex-string-files in different buffers. (bibtex-autokey-edit-before-use, bibtex-clean-entry): New variable that determines, if the user is allowed to edit auto-generated reference keys before they are used. (bibtex-generate-autokey, bibtex-clean-entry): New function to generate an autokey if necessary. (bibtex-autokey-names, bibtex-autokey-name-change-strings, bibtex-autokey-name-length, bibtex-autokey-name-separator, bibtex-autokey-year-length, bibtex-autokey-titlewords, bibtex-autokey-title-terminators, bibtex-autokey-titlewords-stretch, bibtex-autokey-titleword-first-ignore, bibtex-autokey-titleword-abbrevs, bibtex-autokey-titleword-change-strings, bibtex-autokey-titleword-length, bibtex-autokey-titleword-separator, bibtex-autokey-name-year-separator, bibtex-autokey-year-title-separator): New variables related to bibtex-generate-autokey. (bibtex-find-entry-location): Optional second parameter maybedup to tell it that entering a duplicate entry isn't to report by an error but by the return value of the function (necessary for bibtex-clean-entry to find the correct position of an entry with an autogenerated key without disturbing the user with unwanted messages). (bibtex-help-message): New variable to avoid printing of help messages in the echo area. (assoc-of-regexp): New function to match an alist of regexps. (bibtex-string-files, bibtex-completion-candidates, bibtex-mode): New variables to allow bibtex-complete-string to work on strings initialized from a variable and from @String definitions in a list of files, too. (bibtex-predefined-strings, bibtex-entry-field-alist): Changed to user options. (bibtex-mode): Changed doc string. (many functions and variables): Changed documentation strings of variables and functions to hold a complete sentence in the first line. (bibtex-print-help-message): Now line dependent and reports if it is called outside a BibTeX field. (validate-bibtex-buffer): Completely rewritten to validate, if buffer is syntactically correct. (find-bibtex-duplicates): Moved into validate-bibtex-buffer. (ispell-abstract, bibtex-ispell-abstract, ispell-bibtex-entry, bibtex-ispell-entry, beginning-of-bibtex-entry, bibtex-beginning-of-entry, end-of-bibtex-entry, bibtex-end-of-entry, hide-bibtex-entry-bodies, bibtex-hide-entry-bodies, narrow-to-bibtex-entry, bibtex-narrow-to-entry, sort-bibtex-entries, bibtex-sort-entries, validate-bibtex-buffer, bibtex-validate-buffer, find-bibtex-entry-location, bibtex-find-entry-location): All interactive functions are renamed, so that any interface function begins with "bibtex-". Mapping: ispell-abstract --> bibtex-ispell-abstract ispell-bibtex-entry --> bibtex-ispell-entry beginning-of-bibtex-entry --> bibtex-beginning-of-entry end-of-bibtex-entry --> bibtex-end-of-entry hide-bibtex-entry-bodies --> bibtex-hide-entry-bodies narrow-to-bibtex-entry --> bibtex-narrow-to-entry sort-bibtex-entries --> bibtex-sort-entries validate-bibtex-buffer --> bibtex-validate-buffer find-bibtex-entry-location --> bibtex-find-entry-location (bibtex-maintain-sorted-entries, bibtex-sort-ignore-string-entries): Default is now t. (bibtex-complete-string): String list is built from additional string list bibtex-predefined-string and current strings in file. (string-equalp): Deleted and substituted by string-equal. (assoc-string-equalp): Renamed to assoc-ignore-case. (bibtex-entry): Reference key can be entered with completion. All reference keys that are defined in buffer and all labels that appear in crossreference entries are object to completion. (Entry types): Changed order of entries in menu "entry types". (bibtex-entry-field-alist): Changed order of entries slightly to be more conform with standard BibTeX style layouts. (bibtex-mode-map): Uniform keybindings for \C-c\C-e prefix (often used types on control keys, sometimes used types on normal keys, rarely used types on shift keys, almost never used types on meta keys). (bibtex-mode-map): Function narrow-to-bibtex-entry and counterpart widen and function hide-bibtex-entry-bodies and counterpart show-all bounded to appropriate local keys. (bibtex-abbrev-table): Deleted (bibtex-current-entry-label, put-string-on-kill-ring): Deleted (AUCTeX provides all the functionality needed for citation completion). (bibtex-enclosing-reference, bibtex-pop-previous, bibtex-pop-next, bibtex-clean-entry): Hacked for speed (bibtex-pop-previous and bibtex-pop-next were to slow for larger BibTeX files). (bibtex-pop-previous, bibtex-pop-next): Delimiters from previous or next entry are changed to actual delimters if necessary. (bibtex-entry): Fixed bug (False entry wasn't reported in error message if bibtex-entry was called with undefined reference name). (bibtex-entry-field-alist, bibtex-entry, bibtex-make-field, bibtex-next-field, bibtex-clean-entry): Every reference entry now contains a comment in addition to the name of the reference. This comment appears in the echo area if you start editing that field (after calling bibtex-next-field). (bibtex-include-OPTcrossref, bibtex-entry): Changed bibtex-include-OPTcrossref from single boolean variable to hold a list of reference names which should have a crossref field. (bibtex-complete-word): New function, which completes word fragment before point to the longest prefix of predefined strings in the buffer in the same way that ispell-complete-word operates for words found in the dictionary. (bibtex-reference-head): Start of bibtex-reference-head changed from "^[ \t]*\\(" to "^\\( \\|\t\\)*\\(" (bibtex-pop-previous and bibtex-pop-next didn't work, probably due to a bug in re-search-forward). (several functions): Added support for {} as field delimiters (better than '"' for accented characters. (bibtex-clean-entry): If optional field crossref is empty or missing, former optional fields (if bibtex-include-OPTcrossref was t) are necessary again. bibtex-clean-entry complains if they are empty but not if they are missing, so you can intenionally omit them, e. g. for a pseudo @Journal entry (needed for crossreferences) made out of an @article with missing non-optional fields. Menu bar entries aren't centered anymore.
author Richard M. Stallman <rms@gnu.org>
date Fri, 23 Dec 1994 04:18:29 +0000
parents cc7cd83ccf3f
children 83f275dcd93a
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
7300
cc7cd83ccf3f Update copyright.
Karl Heuer <kwzh@gnu.org>
parents: 5290
diff changeset
3 ;; Copyright (C) 1991, 1994 Free Software Foundation, Inc.
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
4
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
5 ;; 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
6 ;; Created: Jan 1991
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
7 ;; Maintainer: FSF
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; any later version.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
25 ;;; Commentary:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
26
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27 ;;; Reposition-window makes an entire function definition or comment visible,
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28 ;;; or, if it is already visible, places it at the top of the window;
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29 ;;; additional invocations toggle the visibility of comments preceding the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30 ;;; code. For the gory details, see the documentation for reposition-window;
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31 ;;; rather than reading that, you may just want to play with it.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33 ;;; This tries pretty hard to do the recentering correctly; the precise
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 ;;; action depends on what the buffer looks like. If you find a situation
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35 ;;; where it doesn't behave well, let me know. This function is modeled
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
36 ;;; after one of the same name in ZMACS, but the code is all-new and the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37 ;;; behavior in some situations differs.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
39 ;;; Code:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
40
262
990d2229354c *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 197
diff changeset
41 ;;;###autoload
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 (defun reposition-window (&optional arg)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43 "Make the current definition and/or comment visible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 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
45 visibility of comments that precede it.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 Point is left unchanged unless prefix ARG is supplied.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47 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
48 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
49 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
50 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
51 as much of the comment onscreen as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
52 Initially `reposition-window' attempts to make both the definition and
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53 preceding comments visible. Further invocations toggle the visibility of
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
54 the comment lines.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
55 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
56 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
57 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
58 comments, including the first comment line, are visible), or to make the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
59 first comment line visible (if point is in a comment)."
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
60 (interactive "P")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
61 (let* (;; (here (save-excursion (beginning-of-line) (point)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
62 (here (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
63 ;; change this name once I've gotten rid of references to ht.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
64 ;; this is actually the number of the last screen line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
65 (ht (- (window-height (selected-window)) 2))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
66 (line (repos-count-screen-lines (window-start) (point)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
67 (comment-height
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
68 ;; The call to max deals with the case of cursor between defuns.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 (max 0
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
70 (repos-count-screen-lines-signed
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
71 ;; the beginning of the preceding comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
72 (save-excursion
4182
b85c00ac4ae3 (reposition-window): Don't forward-char if eobp.
Richard M. Stallman <rms@gnu.org>
parents: 2315
diff changeset
73 (if (not (eobp)) (forward-char 1))
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
74 (end-of-defun -1)
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
75 ;; Skip whitespace, newlines, and form feeds.
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
76 (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
77 (backward-char 1))
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
78 (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
79 here)))
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
80 (defun-height
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
81 (repos-count-screen-lines-signed
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
82 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
83 (end-of-defun 1) ; so comments associate with following defuns
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
84 (beginning-of-defun 1)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
85 (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 here))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
87 ;; This must be positive, so don't use the signed version.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
88 (defun-depth (repos-count-screen-lines here
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
89 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90 (end-of-defun 1)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
91 (point))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
92 (defun-line-onscreen-p
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93 (and (<= defun-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94 (<= (- line defun-height) ht))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95 (cond ((or (= comment-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
96 (and (= line ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
97 (> comment-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
98 ;; if defun line offscreen, we should be in case 4
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99 defun-line-onscreen-p))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100 ;; Either first comment line is at top of screen or (point at
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101 ;; bottom of screen, defun line onscreen, and first comment line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
102 ;; off top of screen). That is, it looks like we just did
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
103 ;; recenter-definition, trying to fit as much of the comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104 ;; onscreen as possible. Put defun line at top of screen; that
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105 ;; is, show as much code, and as few comments, as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 (if (and arg (> defun-depth (1+ ht)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
108 ;; Can't fit whole defun onscreen without moving point.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
109 (progn (end-of-defun) (beginning-of-defun) (recenter 0))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
110 (recenter (max defun-height 0)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
111 ;;(repos-debug-macro "1")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
112 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
113
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
114 ((or (= defun-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
115 (= line 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
116 (and (< line comment-height)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
117 (< defun-height 0)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
118 ;; Defun line or cursor at top of screen, OR cursor in comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
119 ;; whose first line is offscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
120 ;; Avoid moving definition up even if defun runs offscreen;
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
121 ;; 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
122
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
123 (cond ((= line ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
124 ;; cursor on last screen line (and so in a comment)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
125 (if arg (progn (end-of-defun) (beginning-of-defun)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
126 (recenter 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
127 ;;(repos-debug-macro "2a")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
128 )
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
129
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
130 ;; 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
131
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
132 ((and arg (< ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
133 ;; Can't get first comment line onscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
134 ;; Go there and try again.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
135 (forward-line (- comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
136 (beginning-of-line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
137 ;; was (reposition-window)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
138 (recenter 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
139 ;;(repos-debug-macro "2b")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
140 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
141 (t
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
142 (recenter (min ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
143 ;;(repos-debug-macro "2c")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
144 ))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
145 ;; (recenter (min ht comment-height))
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
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
148 ((and (> (+ line defun-depth -1) ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
149 defun-line-onscreen-p)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
150 ;; Defun runs off the bottom of the screen and the defun line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
151 ;; is onscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
152 ;; Move the defun up.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
153 (recenter (max 0 (1+ (- ht defun-depth)) defun-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
154 ;;(repos-debug-macro "3")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
155 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
156
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
157 (t
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
158 ;; If on the bottom line and comment start is offscreen
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
159 ;; then just move all comments offscreen, or at least as
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
160 ;; far as they'll go.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
161
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
162 ;; Try to get as much of the comments onscreen as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
163 (if (and arg (< ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
164 ;; Can't get defun line onscreen; go there and try again.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
165 (progn (forward-line (- defun-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
166 (beginning-of-line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
167 (reposition-window))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
168 (recenter (min ht comment-height)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
169 ;;(repos-debug-macro "4")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
170 ))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
171
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
172 ;;;###autoload (define-key esc-map "\C-l" 'reposition-window)
264
7db4ff4204a5 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 262
diff changeset
173
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
174 ;;; Auxiliary functions
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
175
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
176 ;; Return number of screen lines between START and END.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
177 (defun repos-count-screen-lines (start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
178 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
179 (save-restriction
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
180 (narrow-to-region start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
181 (goto-char (point-min))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
182 (vertical-motion (- (point-max) (point-min))))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
183
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
184 ;; Return number of screen lines between START and END; returns a negative
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
185 ;; number if END precedes START.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
186 (defun repos-count-screen-lines-signed (start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
187 (let ((lines (repos-count-screen-lines start end)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
188 (if (< start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
189 lines
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
190 (- lines))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
191
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
192 ; (defmacro repos-debug-macro (case-no)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
193 ; (` (message
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
194 ; (concat "Case " (, case-no) ": %s %s %s %s %s")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
195 ; ht line comment-height defun-height defun-depth)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
196
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
197 ;;; reposition.el ends here