Mercurial > emacs
view 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 |
line wrap: on
line source
;;; reposition.el --- center a Lisp function or comment on the screen ;; Copyright (C) 1991, 1994 Free Software Foundation, Inc. ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu> ;; Created: Jan 1991 ;; Maintainer: FSF ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;; Commentary: ;;; Reposition-window makes an entire function definition or comment visible, ;;; or, if it is already visible, places it at the top of the window; ;;; additional invocations toggle the visibility of comments preceding the ;;; code. For the gory details, see the documentation for reposition-window; ;;; rather than reading that, you may just want to play with it. ;;; This tries pretty hard to do the recentering correctly; the precise ;;; action depends on what the buffer looks like. If you find a situation ;;; where it doesn't behave well, let me know. This function is modeled ;;; after one of the same name in ZMACS, but the code is all-new and the ;;; behavior in some situations differs. ;;; Code: ;;;###autoload (defun reposition-window (&optional arg) "Make the current definition and/or comment visible. Further invocations move it to the top of the window or toggle the visibility of comments that precede it. Point is left unchanged unless prefix ARG is supplied. If the definition is fully onscreen, it is moved to the top of the window. If it is partly offscreen, the window is scrolled to get the definition (or as much as will fit) onscreen, unless point is in a comment which is also partly offscreen, in which case the scrolling attempts to get as much of the comment onscreen as possible. Initially `reposition-window' attempts to make both the definition and preceding comments visible. Further invocations toggle the visibility of the comment lines. If ARG is non-nil, point may move in order to make the whole defun visible (if only part could otherwise be made so), to make the defun line visible (if point is in code and it could not be made so, or if only comments, including the first comment line, are visible), or to make the first comment line visible (if point is in a comment)." (interactive "P") (let* (;; (here (save-excursion (beginning-of-line) (point))) (here (point)) ;; change this name once I've gotten rid of references to ht. ;; this is actually the number of the last screen line (ht (- (window-height (selected-window)) 2)) (line (repos-count-screen-lines (window-start) (point))) (comment-height ;; The call to max deals with the case of cursor between defuns. (max 0 (repos-count-screen-lines-signed ;; the beginning of the preceding comment (save-excursion (if (not (eobp)) (forward-char 1)) (end-of-defun -1) ;; Skip whitespace, newlines, and form feeds. (if (re-search-forward "[^ \t\n\f]" nil t) (backward-char 1)) (point)) here))) (defun-height (repos-count-screen-lines-signed (save-excursion (end-of-defun 1) ; so comments associate with following defuns (beginning-of-defun 1) (point)) here)) ;; This must be positive, so don't use the signed version. (defun-depth (repos-count-screen-lines here (save-excursion (end-of-defun 1) (point)))) (defun-line-onscreen-p (and (<= defun-height line) (<= (- line defun-height) ht)))) (cond ((or (= comment-height line) (and (= line ht) (> comment-height line) ;; if defun line offscreen, we should be in case 4 defun-line-onscreen-p)) ;; Either first comment line is at top of screen or (point at ;; bottom of screen, defun line onscreen, and first comment line ;; off top of screen). That is, it looks like we just did ;; recenter-definition, trying to fit as much of the comment ;; onscreen as possible. Put defun line at top of screen; that ;; is, show as much code, and as few comments, as possible. (if (and arg (> defun-depth (1+ ht))) ;; Can't fit whole defun onscreen without moving point. (progn (end-of-defun) (beginning-of-defun) (recenter 0)) (recenter (max defun-height 0))) ;;(repos-debug-macro "1") ) ((or (= defun-height line) (= line 0) (and (< line comment-height) (< defun-height 0))) ;; Defun line or cursor at top of screen, OR cursor in comment ;; whose first line is offscreen. ;; Avoid moving definition up even if defun runs offscreen; ;; we care more about getting the comment onscreen. (cond ((= line ht) ;; cursor on last screen line (and so in a comment) (if arg (progn (end-of-defun) (beginning-of-defun))) (recenter 0) ;;(repos-debug-macro "2a") ) ;; This condition, copied from case 4, may not be quite right ((and arg (< ht comment-height)) ;; Can't get first comment line onscreen. ;; Go there and try again. (forward-line (- comment-height)) (beginning-of-line) ;; was (reposition-window) (recenter 0) ;;(repos-debug-macro "2b") ) (t (recenter (min ht comment-height)) ;;(repos-debug-macro "2c") )) ;; (recenter (min ht comment-height)) ) ((and (> (+ line defun-depth -1) ht) defun-line-onscreen-p) ;; Defun runs off the bottom of the screen and the defun line ;; is onscreen. ;; Move the defun up. (recenter (max 0 (1+ (- ht defun-depth)) defun-height)) ;;(repos-debug-macro "3") ) (t ;; If on the bottom line and comment start is offscreen ;; then just move all comments offscreen, or at least as ;; far as they'll go. ;; Try to get as much of the comments onscreen as possible. (if (and arg (< ht comment-height)) ;; Can't get defun line onscreen; go there and try again. (progn (forward-line (- defun-height)) (beginning-of-line) (reposition-window)) (recenter (min ht comment-height))) ;;(repos-debug-macro "4") )))) ;;;###autoload (define-key esc-map "\C-l" 'reposition-window) ;;; Auxiliary functions ;; Return number of screen lines between START and END. (defun repos-count-screen-lines (start end) (save-excursion (save-restriction (narrow-to-region start end) (goto-char (point-min)) (vertical-motion (- (point-max) (point-min)))))) ;; Return number of screen lines between START and END; returns a negative ;; number if END precedes START. (defun repos-count-screen-lines-signed (start end) (let ((lines (repos-count-screen-lines start end))) (if (< start end) lines (- lines)))) ; (defmacro repos-debug-macro (case-no) ; (` (message ; (concat "Case " (, case-no) ": %s %s %s %s %s") ; ht line comment-height defun-height defun-depth))) ;;; reposition.el ends here