Mercurial > emacs
annotate lisp/fringe.el @ 51415:762217a72cae
Long overdue merge.
Don't require `compile' since it seems unnecessary.
For all internal variables and functions the docstring comments have
been converted into proper docstrings
(bibtex-maintainer-address, bibtex-maintainer-salutation)
(bibtex-version): Remove support for bug reporting.
(bibtex-field-delimiters, bibtex-entry-delimiters)
(bibtex-sort-ignore-string-entries, bibtex-maintain-sorted-entries)
Replace make-variable-buffer-local by make-local-variable for
(bibtex-entry-format): New tag `required-fields'.
(bibtex-maintain-sorted-entries): New var.
(bibtex-sort-entry-class, bibtex-sort-entry-class-alist): New vars.
(bibtex-predefined-month-strings, bibtex-predefined-strings):
Make into alists with pairs (abbreviation expansion).
(bibtex-autokey-titleword-change-strings)
(bibtex-autokey-transcriptions): Make into alists.
Add new replacement pairs.
(bibtex-autokey-use-crossref): New var.
Replace bibtex-autokey-year-use-crossref-entry because updated code
for autokey generation handles crossrefs independently of
particular fields.
(bibtex-reference-key, bibtex-mode-syntax-table):
Remove = because it can't be part of a string's key.
(bibtex-complete-key-cleanup): New var.
(bibtex-complete): Merge bibtex-complete-string and bibtex-complete-key
into it (and bind to M-tab).
(bibtex-valid-entry-re, bibtex-any-valid-entry-re)
(bibtex-valid-entry-whitespace-re, bibtex-empty-field-re)
(bibtex-quoted-string-re): New vars.
(bibtex-field-name-for-parsing): Don't make-variable-buffer-local.
(zmacs-regions): Declare to quieten the byte-compiler.
(bibtex-comment-start): Don't include the space.
(bibtex-font-lock-syntactic-keywords): New var.
(bibtex-font-lock-keywords): Remove the entry for @Comment.
(bibtex-parse-field-string): Merge the functionality of
bibtex-parse-field-string-braced, bibtex-parse-quoted-string and
bibtex-parse-field-string-quoted.
(bibtex-search-forward-field-string): Remove.
(bibtex-parse-association): Use when.
(bibtex-parse-field-name): Use when.
(bibtex-parse-field-text): Use when and cond.
(bibtex-parse-field): Use let.
(bibtex-search-forward-field, bibtex-search-backward-field):
Make bound optional, use let, setq, and cddr.
(bibtex-start-of-field, bibtex-start-of-name-in-field)
(bibtex-end-of-name-in-field): Use nth.
(bibtex-name-in-field, bibtex-text-in-field-bounds)
(bibtex-text-in-field, bibtex-type-in-head, bibtex-key-in-head)
(bibtex-text-in-string): New functions.
(bibtex-reference-key-in-string): New fun. Merge of
bibtex-start-of-reference-key-in-string and
bibtex-end-of-reference-key-in-string.
(bibtex-parse-string-prefix): Use let and when.
(bibtex-parse-string-postfix): Use when.
(bibtex-search-forward-string, bibtex-search-backward-string):
Use save-excursion and setq.
(bibtex-member-of-regexp): Use let.
(bibtex-assoc-of-regexp): Use caar und let.
(bibtex-skip-to-valid-entry): Return buffer position.
(bibtex-map-entries): Use save-excursion.
(bibtex-progress-message): Simplify.
(bibtex-search-entry): Use skip-chars-forward, when, save-match-data.
(bibtex-move-outside-of-entry): Handle the case that point is before
first entry.
(bibtex-enclosing-field): Use save-excursion, when.
(bibtex-format-field-delimiters): Merge into bibtex-format-entry.
(bibtex-enclosing-entry-maybe-empty-head): Simplify.
(bibtex-format-entry): Simplify. Handle new tag required-fields of
bibtex-entry-format.
(bibtex-autokey-abbrev): Accept negative values of len.
(bibtex-autokey-get-field, bibtex-autokey-demangle-title): New funs.
(bibtex-autokey-get-namefield, bibtex-autokey-get-namelist)
(bibtex-autokey-get-yearfield-digits, bibtex-autokey-get-yearfield)
(bibtex-autokey-get-titlestring): Remove.
(bibtex-autokey-get-names): Simplify.
(bibtex-autokey-get-titles): Rename to bibtex-autokey-get-title.
(bibtex-autokey-demangle-name): Simplify, avoid error messages.
(bibtex-generate-autokey): Simplify.
(bibtex-parse-keys): Simplify, use push.
(bibtex-parse-strings): New fun similar to bibtex-parse-keys.
(bibtex-string-files-init): New fun.
(bibtex-parse-buffers-stealthily): Use bibtex-parse-keys,
bibtex-string-files-init and bibtex-parse-strings.
(bibtex-complete): Rename to bibtex-complete-internal, use push,
bibtex-reference-key-in-string, no sorting.
(bibtex-complete-string-cleanup): New fun, displays expansion of
completed strings.
(bibtex-choose-completion-string): New fun. Required for
choose-completion-string-functions.
(bibtex-do-auto-fill): Remove. Set fill-prefix in bibtex-mode.
(bibtex-pop): Simplify.
(bibtex-mode): Move setting of bibtex-string to bibtex-parse-strings.
Set choose-completion-string-functions.
(bibtex-print-help-message,bibtex-make-field, bibtex-end-of-entry)
(bibtex-count-entries): Simplify.
(bibtex-entry-index, bibtex-lessp): New funs for generalized sorting
scheme of indices, see bibtex-maintain-sorted-entries.
(bibtex-sort-buffer): Use bibtex-lessp for sorting.
(bibtex-find-crossref, bibtex-find-entry): New funs.
(bibtex-find-entry-location): Rename to bibtex-prepare-new-entry, use
bibtex-lessp, Simplify.
(bibtex-validate): Simplify. Fixe bug of internal variable
questionable-month.
(bibtex-remove-OPT-or-ALT): Use when.
(bibtex-remove-delimiters, bibtex-kill-field, bibtex-kill-entry)
(bibtex-clean-entry, bibtex-fill-entry, bibtex-reformat): Simplify.
(bibtex-convert-alien): Use deactivate-mark rather than the
non-existent bibtex-mark-active variable.
(bibtex-complete-string, bibtex-complete-key): Merge into new
`smart' defun bibtex-complete.
(bibtex-String): Update for new sorting scheme, distinguish empty and
non-empty key strings.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 02 Jun 2003 22:30:09 +0000 |
parents | 7efc8970b32c |
children | 695cf19ef79e |
rev | line source |
---|---|
45493 | 1 ;;; fringe.el --- change fringes appearance in various ways |
2 | |
50127
7efc8970b32c
(fringe-mode): Autoload so that
Simon Josefsson <jas@extundo.com>
parents:
45524
diff
changeset
|
3 ;; Copyright (C) 2002, 2003 Free Software Foundation, Inc. |
45493 | 4 |
5 ;; Author: Simon Josefsson <simon@josefsson.org> | |
6 ;; Maintainer: FSF | |
7 ;; Keywords: frames | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
25 | |
26 ;;; Commentary: | |
27 | |
28 ;; This file contains helpful functions for customizing the appearance | |
29 ;; of the fringe. | |
30 | |
31 ;; The code is influenced by scroll-bar.el and avoid.el. The author | |
32 ;; gratefully acknowledge comments and suggestions made by Miles | |
33 ;; Bader, Eli Zaretski, Richard Stallman, Pavel JanÃk and others which | |
34 ;; improved this package. | |
35 | |
36 ;;; Code: | |
37 | |
38 (defvar fringe-mode) | |
39 | |
40 (defun set-fringe-mode-1 (ignore value) | |
41 "Call `set-fringe-mode' with VALUE. | |
42 See `fringe-mode' for valid values and their effect. | |
43 This is usually invoked when setting `fringe-mode' via customize." | |
44 (set-fringe-mode value)) | |
45 | |
46 (defun set-fringe-mode (value) | |
47 "Set `fringe-mode' to VALUE and put the new value into effect. | |
48 See `fringe-mode' for possible values and their effect." | |
49 (setq fringe-mode value) | |
50 | |
51 ;; Apply it to default-frame-alist. | |
52 (let ((parameter (assq 'left-fringe default-frame-alist))) | |
53 (if (consp parameter) | |
45524
f48a8ed9d03a
(set-fringe-mode): Work when updating
Simon Josefsson <jas@extundo.com>
parents:
45518
diff
changeset
|
54 (setcdr parameter (if (consp fringe-mode) |
f48a8ed9d03a
(set-fringe-mode): Work when updating
Simon Josefsson <jas@extundo.com>
parents:
45518
diff
changeset
|
55 (car fringe-mode) |
f48a8ed9d03a
(set-fringe-mode): Work when updating
Simon Josefsson <jas@extundo.com>
parents:
45518
diff
changeset
|
56 fringe-mode)) |
45493 | 57 (setq default-frame-alist |
58 (cons (cons 'left-fringe (if (consp fringe-mode) | |
59 (car fringe-mode) | |
60 fringe-mode)) | |
61 default-frame-alist)))) | |
62 (let ((parameter (assq 'right-fringe default-frame-alist))) | |
63 (if (consp parameter) | |
45524
f48a8ed9d03a
(set-fringe-mode): Work when updating
Simon Josefsson <jas@extundo.com>
parents:
45518
diff
changeset
|
64 (setcdr parameter (if (consp fringe-mode) |
f48a8ed9d03a
(set-fringe-mode): Work when updating
Simon Josefsson <jas@extundo.com>
parents:
45518
diff
changeset
|
65 (cdr fringe-mode) |
f48a8ed9d03a
(set-fringe-mode): Work when updating
Simon Josefsson <jas@extundo.com>
parents:
45518
diff
changeset
|
66 fringe-mode)) |
45493 | 67 (setq default-frame-alist |
68 (cons (cons 'right-fringe (if (consp fringe-mode) | |
69 (cdr fringe-mode) | |
70 fringe-mode)) | |
71 default-frame-alist)))) | |
72 | |
73 ;; Apply it to existing frames. | |
74 (let ((frames (frame-list))) | |
75 (while frames | |
76 (modify-frame-parameters | |
77 (car frames) | |
78 (list (cons 'left-fringe (if (consp fringe-mode) | |
79 (car fringe-mode) | |
80 fringe-mode)) | |
81 (cons 'right-fringe (if (consp fringe-mode) | |
82 (cdr fringe-mode) | |
83 fringe-mode)))) | |
84 (setq frames (cdr frames))))) | |
85 | |
50127
7efc8970b32c
(fringe-mode): Autoload so that
Simon Josefsson <jas@extundo.com>
parents:
45524
diff
changeset
|
86 ;;;###autoload |
45493 | 87 (defcustom fringe-mode nil |
88 "*Specify appearance of fringes on all frames. | |
89 This variable can be nil (the default) meaning the fringes should have | |
90 the default width (8 pixels), it can be an integer value specifying | |
91 the width of both left and right fringe (where 0 means no fringe), or | |
92 a cons cell where car indicates width of left fringe and cdr indicates | |
93 width of right fringe (where again 0 can be used to indicate no | |
94 fringe). | |
95 To set this variable in a Lisp program, use `set-fringe-mode' to make | |
96 it take real effect. | |
97 Setting the variable with a customization buffer also takes effect. | |
98 If you only want to modify the appearance of the fringe in one frame, | |
99 you can use the interactive function `toggle-fringe'" | |
100 :type '(choice (const :tag "Default width" nil) | |
101 (const :tag "No fringes" 0) | |
102 (const :tag "Only right" (0 . nil)) | |
103 (const :tag "Only left" (nil . 0)) | |
104 (const :tag "Half width" (5 . 5)) | |
45518
182c7dd36ef1
Fix :type of `fringe-mode' for last modification.
Simon Josefsson <jas@extundo.com>
parents:
45516
diff
changeset
|
105 (const :tag "Minimal" (1 . 1)) |
45493 | 106 (integer :tag "Specific width") |
107 (cons :tag "Different left/right sizes" | |
108 (integer :tag "Left width") | |
109 (integer :tag "Right width"))) | |
110 :group 'frames | |
111 :require 'fringe | |
112 :set 'set-fringe-mode-1) | |
113 | |
114 (defun fringe-query-style (&optional all-frames) | |
115 "Query user for fringe style. | |
116 Returns values suitable for left-fringe and right-fringe frame parameters. | |
117 If ALL-FRAMES, the negation of the fringe values in | |
118 `default-frame-alist' is used when user enters the empty string. | |
119 Otherwise the negation of the fringe value in the currently selected | |
120 frame parameter is used." | |
121 (let ((mode (intern (completing-read | |
122 "Select fringe mode for all frames (SPACE for list): " | |
123 '(("none") ("default") ("left-only") | |
45516
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
124 ("right-only") ("half") ("minimal")) |
45493 | 125 nil t)))) |
126 (cond ((eq mode 'none) 0) | |
127 ((eq mode 'default) nil) | |
128 ((eq mode 'left-only) '(nil . 0)) | |
129 ((eq mode 'right-only) '(0 . nil)) | |
130 ((eq mode 'half) '(5 . 5)) | |
45516
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
131 ((eq mode 'minimal) '(1 . 1)) |
45493 | 132 ((eq mode (intern "")) |
133 (if (eq 0 (cdr (assq 'left-fringe | |
134 (if all-frames | |
135 default-frame-alist | |
136 (frame-parameters (selected-frame)))))) | |
137 nil | |
138 0))))) | |
139 | |
140 ;;;###autoload | |
141 (defun fringe-mode (&optional mode) | |
142 "Toggle appearance of fringes on all frames. | |
143 Valid values for MODE include `none', `default', `left-only', | |
45516
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
144 `right-only', `minimal' and `half'. MODE can also be a cons cell |
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
145 where the integer in car will be used as left fringe width and the |
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
146 integer in cdr will be used as right fringe width. If MODE is not |
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
147 specified, the user is queried. |
45493 | 148 It applies to all frames that exist and frames to be created in the |
149 future. | |
150 If you want to set appearance of fringes on the selected frame only, | |
151 see `set-fringe-style'." | |
152 (interactive (list (fringe-query-style 'all-frames))) | |
153 (set-fringe-mode mode)) | |
154 | |
155 ;;;###autoload | |
156 (defun set-fringe-style (&optional mode) | |
157 "Set appearance of fringes on selected frame. | |
158 Valid values for MODE include `none', `default', `left-only', | |
45516
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
159 `right-only', `minimal' and `half'. MODE can also be a cons cell |
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
160 where the integer in car will be used as left fringe width and the |
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
161 integer in cdr will be used as right fringe width. If MODE is not |
6b848a738ec6
(fringe-query-style): New fringe style "minimal".
Simon Josefsson <jas@extundo.com>
parents:
45493
diff
changeset
|
162 specified, the user is queried. |
45493 | 163 If you want to set appearance of fringes on all frames, see `fringe-mode'." |
164 (interactive (list (fringe-query-style))) | |
165 (modify-frame-parameters | |
166 (selected-frame) | |
167 (list (cons 'left-fringe (if (consp mode) (car mode) mode)) | |
168 (cons 'right-fringe (if (consp mode) (cdr mode) mode))))) | |
169 | |
170 (provide 'fringe) | |
171 | |
172 ;;; fringe.el ends here |