Mercurial > emacs
annotate lisp/format.el @ 97680:b7440911e609
Remove yet another debug leftover in dos_ttraw.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 23 Aug 2008 21:25:28 +0000 |
parents | ee5932bf781d |
children | a04373604128 |
rev | line source |
---|---|
13352 | 1 ;;; format.el --- read and save files in multiple formats |
14169 | 2 |
74442 | 3 ;; Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, |
79721 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
11054 | 5 |
24156 | 6 ;; Author: Boris Goldowsky <boris@gnu.org> |
11054 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
11054 | 11 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; (at your option) any later version. |
14169 | 14 |
11054 | 15 ;; GNU Emacs is distributed in the hope that it will be useful, |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
14169 | 19 |
11054 | 20 ;; You should have received a copy of the GNU General Public License |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
11054 | 22 |
23 ;;; Commentary: | |
14169 | 24 |
25 ;; This file defines a unified mechanism for saving & loading files stored | |
26 ;; in different formats. `format-alist' contains information that directs | |
11054 | 27 ;; Emacs to call an encoding or decoding function when reading or writing |
24156 | 28 ;; files that match certain conditions. |
11054 | 29 ;; |
14169 | 30 ;; When a file is visited, its format is determined by matching the |
31 ;; beginning of the file against regular expressions stored in | |
32 ;; `format-alist'. If this fails, you can manually translate the buffer | |
33 ;; using `format-decode-buffer'. In either case, the formats used are | |
34 ;; listed in the variable `buffer-file-format', and become the default | |
35 ;; format for saving the buffer. To save a buffer in a different format, | |
36 ;; change this variable, or use `format-write-file'. | |
11054 | 37 ;; |
38 ;; Auto-save files are normally created in the same format as the visited | |
56980
1c1ca003ded1
(buffer-auto-save-file-format): Make it permanent local.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55974
diff
changeset
|
39 ;; file, but the variable `buffer-auto-save-file-format' can be set to a |
14169 | 40 ;; particularly fast or otherwise preferred format to be used for |
41 ;; auto-saving (or nil to do no encoding on auto-save files, but then you | |
42 ;; risk losing any text-properties in the buffer). | |
11054 | 43 ;; |
14169 | 44 ;; You can manually translate a buffer into or out of a particular format |
45 ;; with the functions `format-encode-buffer' and `format-decode-buffer'. | |
46 ;; To translate just the region use the functions `format-encode-region' | |
24156 | 47 ;; and `format-decode-region'. |
11054 | 48 ;; |
14169 | 49 ;; You can define a new format by writing the encoding and decoding |
50 ;; functions, and adding an entry to `format-alist'. See enriched.el for | |
51 ;; an example of how to implement a file format. There are various | |
52 ;; functions defined in this file that may be useful for writing the | |
53 ;; encoding and decoding functions: | |
54 ;; * `format-annotate-region' and `format-deannotate-region' allow a | |
55 ;; single alist of information to be used for encoding and decoding. | |
56 ;; The alist defines a correspondence between strings in the file | |
57 ;; ("annotations") and text-properties in the buffer. | |
11054 | 58 ;; * `format-replace-strings' is similarly useful for doing simple |
59 ;; string->string translations in a reversible manner. | |
60 | |
14169 | 61 ;;; Code: |
62 | |
11054 | 63 (put 'buffer-file-format 'permanent-local t) |
56980
1c1ca003ded1
(buffer-auto-save-file-format): Make it permanent local.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55974
diff
changeset
|
64 (put 'buffer-auto-save-file-format 'permanent-local t) |
11054 | 65 |
24156 | 66 (defvar format-alist |
18690
df8ab82c73f3
(format-alist): Don't handle compression here.
Richard M. Stallman <rms@gnu.org>
parents:
18140
diff
changeset
|
67 '((text/enriched "Extended MIME text/enriched format." |
11054 | 68 "Content-[Tt]ype:[ \t]*text/enriched" |
69 enriched-decode enriched-encode t enriched-mode) | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
70 (plain "ISO 8859-1 standard format, no text properties." |
11054 | 71 ;; Plain only exists so that there is an obvious neutral choice in |
72 ;; the completion list. | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
73 nil nil nil nil nil) |
24156 | 74 (TeX "TeX (encoding)" |
75 nil | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
76 iso-tex2iso iso-iso2tex t nil) |
24156 | 77 (gtex "German TeX (encoding)" |
78 nil | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
79 iso-gtex2iso iso-iso2gtex t nil) |
28394
7640cbe85ab7
(format-alist): Use iso-cvt functions for SGML/HTML.
Dave Love <fx@gnu.org>
parents:
27793
diff
changeset
|
80 (html "HTML/SGML \"ISO 8879:1986//ENTITIES Added Latin 1//EN\" (encoding)" |
24156 | 81 nil |
28394
7640cbe85ab7
(format-alist): Use iso-cvt functions for SGML/HTML.
Dave Love <fx@gnu.org>
parents:
27793
diff
changeset
|
82 iso-sgml2iso iso-iso2sgml t nil) |
24156 | 83 (rot13 "rot13" |
84 nil | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
85 "tr a-mn-z n-za-m" "tr a-mn-z n-za-m" t nil) |
24156 | 86 (duden "Duden Ersatzdarstellung" |
87 nil | |
88 "diac" iso-iso2duden t nil) | |
89 (de646 "German ASCII (ISO 646)" | |
90 nil | |
22051
3e5822a3448d
(format-alist): Use -f when running recode.
Richard M. Stallman <rms@gnu.org>
parents:
20087
diff
changeset
|
91 "recode -f iso646-ge:latin1" "recode -f latin1:iso646-ge" t nil) |
24156 | 92 (denet "net German" |
93 nil | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
94 iso-german iso-cvt-read-only t nil) |
24156 | 95 (esnet "net Spanish" |
96 nil | |
18690
df8ab82c73f3
(format-alist): Don't handle compression here.
Richard M. Stallman <rms@gnu.org>
parents:
18140
diff
changeset
|
97 iso-spanish iso-cvt-read-only t nil)) |
11054 | 98 "List of information about understood file formats. |
99 Elements are of the form \(NAME DOC-STR REGEXP FROM-FN TO-FN MODIFY MODE-FN). | |
19244
dc92be3441cd
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19235
diff
changeset
|
100 |
11054 | 101 NAME is a symbol, which is stored in `buffer-file-format'. |
19244
dc92be3441cd
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19235
diff
changeset
|
102 |
11054 | 103 DOC-STR should be a single line providing more information about the |
104 format. It is currently unused, but in the future will be shown to | |
105 the user if they ask for more information. | |
19244
dc92be3441cd
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19235
diff
changeset
|
106 |
11054 | 107 REGEXP is a regular expression to match against the beginning of the file; |
24156 | 108 it should match only files in that format. Use nil to avoid |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
109 matching at all for formats for which it isn't appropriate to |
24156 | 110 require explicit encoding/decoding. |
19244
dc92be3441cd
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19235
diff
changeset
|
111 |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
112 FROM-FN is called to decode files in that format; it takes two args, BEGIN |
11054 | 113 and END, and can make any modifications it likes, returning the new |
114 end. It must make sure that the beginning of the file no longer | |
115 matches REGEXP, or else it will get called again. | |
19245
33adb5cee0b0
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19244
diff
changeset
|
116 Alternatively, FROM-FN can be a string, which specifies a shell command |
33adb5cee0b0
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19244
diff
changeset
|
117 (including options) to be used as a filter to perform the conversion. |
19244
dc92be3441cd
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19235
diff
changeset
|
118 |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
119 TO-FN is called to encode a region into that format; it takes three |
16020
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
120 arguments: BEGIN, END, and BUFFER. BUFFER is the original buffer that |
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
121 the data being written came from, which the function could use, for |
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
122 example, to find the values of local variables. TO-FN should either |
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
123 return a list of annotations like `write-region-annotate-functions', |
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
124 or modify the region and return the new end. |
19245
33adb5cee0b0
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19244
diff
changeset
|
125 Alternatively, TO-FN can be a string, which specifies a shell command |
33adb5cee0b0
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19244
diff
changeset
|
126 (including options) to be used as a filter to perform the conversion. |
19244
dc92be3441cd
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19235
diff
changeset
|
127 |
16020
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
128 MODIFY, if non-nil, means the TO-FN wants to modify the region. If nil, |
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
129 TO-FN will not make any changes but will instead return a list of |
24156 | 130 annotations. |
19244
dc92be3441cd
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19235
diff
changeset
|
131 |
38046
3a1a2ebbbcdc
(format-alist): Doc fix. Suggested by Alex Schroeder <alex@gnu.org>.
Eli Zaretskii <eliz@gnu.org>
parents:
34170
diff
changeset
|
132 MODE-FN, if specified, is called when visiting a file with that format. |
3a1a2ebbbcdc
(format-alist): Doc fix. Suggested by Alex Schroeder <alex@gnu.org>.
Eli Zaretskii <eliz@gnu.org>
parents:
34170
diff
changeset
|
133 It is called with a single positive argument, on the assumption |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
134 that this would turn on some minor mode. |
45749
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
135 |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
136 PRESERVE, if non-nil, means that `format-write-file' should not remove |
82811
b79364abcd62
(format-alist): Fix typo in doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
82312
diff
changeset
|
137 this format from `buffer-file-format'.") |
11054 | 138 |
139 ;;; Basic Functions (called from Lisp) | |
140 | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
141 (defun format-encode-run-method (method from to &optional buffer) |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
142 "Translate using METHOD the text from FROM to TO. |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
143 If METHOD is a string, it is a shell command (including options); |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
144 otherwise, it should be a Lisp function. |
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
145 BUFFER should be the buffer that the output originally came from." |
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
146 (if (stringp method) |
24156 | 147 (let ((error-buff (get-buffer-create "*Format Errors*")) |
24347
eb03024d18fc
(format-encode-run-method, format-decode-run-method): Fix previous change.
Dave Love <fx@gnu.org>
parents:
24315
diff
changeset
|
148 (coding-system-for-read 'no-conversion) |
24156 | 149 format-alist) |
150 (with-current-buffer error-buff | |
151 (widen) | |
152 (erase-buffer)) | |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
153 (if (and (zerop (save-window-excursion |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
154 (shell-command-on-region from to method t t |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
155 error-buff))) |
24156 | 156 ;; gzip gives zero exit status with bad args, for instance. |
157 (zerop (with-current-buffer error-buff | |
158 (buffer-size)))) | |
159 (bury-buffer error-buff) | |
160 (switch-to-buffer-other-window error-buff) | |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
161 (error "Format encoding failed"))) |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
162 (funcall method from to buffer))) |
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
163 |
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
164 (defun format-decode-run-method (method from to &optional buffer) |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
165 "Decode using METHOD the text from FROM to TO. |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
166 If METHOD is a string, it is a shell command (including options); otherwise, |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
167 it should be a Lisp function. Decoding is done for the given BUFFER." |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
168 (if (stringp method) |
24156 | 169 (let ((error-buff (get-buffer-create "*Format Errors*")) |
24347
eb03024d18fc
(format-encode-run-method, format-decode-run-method): Fix previous change.
Dave Love <fx@gnu.org>
parents:
24315
diff
changeset
|
170 (coding-system-for-write 'no-conversion) |
24156 | 171 format-alist) |
172 (with-current-buffer error-buff | |
173 (widen) | |
174 (erase-buffer)) | |
175 ;; We should perhaps go via a temporary buffer and copy it | |
176 ;; back, in case of errors. | |
177 (if (and (zerop (save-window-excursion | |
178 (shell-command-on-region (point-min) (point-max) | |
179 method t t | |
180 error-buff))) | |
181 ;; gzip gives zero exit status with bad args, for instance. | |
182 (zerop (with-current-buffer error-buff | |
183 (buffer-size)))) | |
184 (bury-buffer error-buff) | |
185 (switch-to-buffer-other-window error-buff) | |
186 (error "Format decoding failed")) | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
187 (point)) |
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
188 (funcall method from to))) |
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
189 |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
190 (defun format-annotate-function (format from to orig-buf format-count) |
24156 | 191 "Return annotations for writing region as FORMAT. |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
192 FORMAT is a symbol naming one of the formats defined in `format-alist'. |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
193 It must be a single symbol, not a list like `buffer-file-format'. |
16020
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
194 FROM and TO delimit the region to be operated on in the current buffer. |
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
195 ORIG-BUF is the original buffer that the data came from. |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
196 |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
197 FORMAT-COUNT is an integer specifying how many times this function has |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
198 been called in the process of decoding ORIG-BUF. |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
199 |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
200 This function works like a function in `write-region-annotate-functions': |
11054 | 201 it either returns a list of annotations, or returns with a different buffer |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
202 current, which contains the modified text to write. In the latter case, |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
203 this function's value is nil. |
11054 | 204 |
205 For most purposes, consider using `format-encode-region' instead." | |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
206 ;; This function is called by write-region (actually |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
207 ;; build_annotations) for each element of buffer-file-format. |
11054 | 208 (let* ((info (assq format format-alist)) |
209 (to-fn (nth 4 info)) | |
210 (modify (nth 5 info))) | |
211 (if to-fn | |
212 (if modify | |
213 ;; To-function wants to modify region. Copy to safe place. | |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
214 (let ((copy-buf (get-buffer-create (format " *Format Temp %d*" |
45940
738d95b72204
(format-annotate-function): Copy multibyte flag
Richard M. Stallman <rms@gnu.org>
parents:
45749
diff
changeset
|
215 format-count))) |
738d95b72204
(format-annotate-function): Copy multibyte flag
Richard M. Stallman <rms@gnu.org>
parents:
45749
diff
changeset
|
216 (sel-disp selective-display) |
51001
9d852ed73287
(format-annotate-function): Copy coding system into the new temp buffer.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
217 (multibyte enable-multibyte-characters) |
9d852ed73287
(format-annotate-function): Copy coding system into the new temp buffer.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
218 (coding-system buffer-file-coding-system)) |
45940
738d95b72204
(format-annotate-function): Copy multibyte flag
Richard M. Stallman <rms@gnu.org>
parents:
45749
diff
changeset
|
219 (with-current-buffer copy-buf |
738d95b72204
(format-annotate-function): Copy multibyte flag
Richard M. Stallman <rms@gnu.org>
parents:
45749
diff
changeset
|
220 (setq selective-display sel-disp) |
51001
9d852ed73287
(format-annotate-function): Copy coding system into the new temp buffer.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
221 (set-buffer-multibyte multibyte) |
9d852ed73287
(format-annotate-function): Copy coding system into the new temp buffer.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
222 (setq buffer-file-coding-system coding-system)) |
11054 | 223 (copy-to-buffer copy-buf from to) |
224 (set-buffer copy-buf) | |
225 (format-insert-annotations write-region-annotations-so-far from) | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
226 (format-encode-run-method to-fn (point-min) (point-max) orig-buf) |
11054 | 227 nil) |
228 ;; Otherwise just call function, it will return annotations. | |
16020
0f704de0600f
(format-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14452
diff
changeset
|
229 (funcall to-fn from to orig-buf))))) |
11054 | 230 |
231 (defun format-decode (format length &optional visit-flag) | |
232 ;; This function is called by insert-file-contents whenever a file is read. | |
233 "Decode text from any known FORMAT. | |
24156 | 234 FORMAT is a symbol appearing in `format-alist' or a list of such symbols, |
11054 | 235 or nil, in which case this function tries to guess the format of the data by |
236 matching against the regular expressions in `format-alist'. After a match is | |
237 found and the region decoded, the alist is searched again from the beginning | |
238 for another match. | |
239 | |
240 Second arg LENGTH is the number of characters following point to operate on. | |
241 If optional third arg VISIT-FLAG is true, set `buffer-file-format' | |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
242 to the reverted list of formats used, and call any mode functions defined |
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
243 for those formats. |
11054 | 244 |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
245 Return the new length of the decoded region. |
11054 | 246 |
247 For most purposes, consider using `format-decode-region' instead." | |
248 (let ((mod (buffer-modified-p)) | |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
249 (begin (point)) |
11054 | 250 (end (+ (point) length))) |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
251 (unwind-protect |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
252 (progn |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
253 ;; Don't record undo information for the decoding. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48214
diff
changeset
|
254 |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
255 (if (null format) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
256 ;; Figure out which format it is in, remember list in `format'. |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
257 (let ((try format-alist)) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
258 (while try |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
259 (let* ((f (car try)) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
260 (regexp (nth 2 f)) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
261 (p (point))) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
262 (if (and regexp (looking-at regexp) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
263 (< (match-end 0) (+ begin length))) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
264 (progn |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
265 (push (car f) format) |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
266 ;; Decode it |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
267 (if (nth 3 f) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
268 (setq end (format-decode-run-method (nth 3 f) begin end))) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
269 ;; Call visit function if required |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
270 (if (and visit-flag (nth 6 f)) (funcall (nth 6 f) 1)) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
271 ;; Safeguard against either of the functions changing pt. |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
272 (goto-char p) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
273 ;; Rewind list to look for another format |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
274 (setq try format-alist)) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
275 (setq try (cdr try)))))) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
276 ;; Deal with given format(s) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
277 (or (listp format) (setq format (list format))) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
278 (let ((do format) f) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
279 (while do |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
280 (or (setq f (assq (car do) format-alist)) |
53862
a1177e068d43
(format-decode): Fix format string.
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
281 (error "Unknown format %s" (car do))) |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
282 ;; Decode: |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
283 (if (nth 3 f) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
284 (setq end (format-decode-run-method (nth 3 f) begin end))) |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
285 ;; Call visit function if required |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
286 (if (and visit-flag (nth 6 f)) (funcall (nth 6 f) 1)) |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
287 (setq do (cdr do)))) |
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
288 ;; Encode in the opposite order. |
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
289 (setq format (reverse format))) |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
290 (if visit-flag |
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
291 (setq buffer-file-format format))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48214
diff
changeset
|
292 |
34170
019ee6a5a637
(format-decode): Don't change buffer's undo list.
Gerd Moellmann <gerd@gnu.org>
parents:
30926
diff
changeset
|
293 (set-buffer-modified-p mod)) |
019ee6a5a637
(format-decode): Don't change buffer's undo list.
Gerd Moellmann <gerd@gnu.org>
parents:
30926
diff
changeset
|
294 |
30926
ca900f999e04
(format-encode-run-method): Fix error message to say
Gerd Moellmann <gerd@gnu.org>
parents:
28394
diff
changeset
|
295 ;; Return new length of region |
11054 | 296 (- end begin))) |
297 | |
298 ;;; | |
299 ;;; Interactive functions & entry points | |
300 ;;; | |
301 | |
302 (defun format-decode-buffer (&optional format) | |
303 "Translate the buffer from some FORMAT. | |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
304 If the format is not specified, attempt a regexp-based guess. |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
305 Set `buffer-file-format' to the format used, and call any |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
306 format-specific mode functions." |
11054 | 307 (interactive |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
64762
diff
changeset
|
308 (list (format-read "Translate buffer from format (default guess): "))) |
11054 | 309 (save-excursion |
310 (goto-char (point-min)) | |
311 (format-decode format (buffer-size) t))) | |
312 | |
313 (defun format-decode-region (from to &optional format) | |
314 "Decode the region from some format. | |
315 Arg FORMAT is optional; if omitted the format will be determined by looking | |
316 for identifying regular expressions at the beginning of the region." | |
317 (interactive | |
24156 | 318 (list (region-beginning) (region-end) |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
64762
diff
changeset
|
319 (format-read "Translate region from format (default guess): "))) |
11054 | 320 (save-excursion |
321 (goto-char from) | |
322 (format-decode format (- to from) nil))) | |
323 | |
324 (defun format-encode-buffer (&optional format) | |
325 "Translate the buffer into FORMAT. | |
326 FORMAT defaults to `buffer-file-format'. It is a symbol naming one of the | |
327 formats defined in `format-alist', or a list of such symbols." | |
328 (interactive | |
329 (list (format-read (format "Translate buffer to format (default %s): " | |
330 buffer-file-format)))) | |
331 (format-encode-region (point-min) (point-max) format)) | |
332 | |
333 (defun format-encode-region (beg end &optional format) | |
24156 | 334 "Translate the region into some FORMAT. |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
335 FORMAT defaults to `buffer-file-format'. It is a symbol naming |
11054 | 336 one of the formats defined in `format-alist', or a list of such symbols." |
24156 | 337 (interactive |
338 (list (region-beginning) (region-end) | |
339 (format-read (format "Translate region to format (default %s): " | |
340 buffer-file-format)))) | |
341 (if (null format) (setq format buffer-file-format)) | |
342 (if (symbolp format) (setq format (list format))) | |
343 (save-excursion | |
344 (goto-char end) | |
345 (let ((cur-buf (current-buffer)) | |
346 (end (point-marker))) | |
347 (while format | |
348 (let* ((info (assq (car format) format-alist)) | |
349 (to-fn (nth 4 info)) | |
350 (modify (nth 5 info)) | |
351 result) | |
352 (if to-fn | |
353 (if modify | |
354 (setq end (format-encode-run-method to-fn beg end | |
355 (current-buffer))) | |
356 (format-insert-annotations | |
357 (funcall to-fn beg end (current-buffer))))) | |
358 (setq format (cdr format))))))) | |
11054 | 359 |
54708
dc6cd68555d1
(format-write-file): Add optional argument CONFIRM and make it behave
Luc Teirlinck <teirllm@auburn.edu>
parents:
54469
diff
changeset
|
360 (defun format-write-file (filename format &optional confirm) |
24156 | 361 "Write current buffer into file FILENAME using some FORMAT. |
54708
dc6cd68555d1
(format-write-file): Add optional argument CONFIRM and make it behave
Luc Teirlinck <teirllm@auburn.edu>
parents:
54469
diff
changeset
|
362 Make buffer visit that file and set the format as the default for future |
11054 | 363 saves. If the buffer is already visiting a file, you can specify a directory |
54708
dc6cd68555d1
(format-write-file): Add optional argument CONFIRM and make it behave
Luc Teirlinck <teirllm@auburn.edu>
parents:
54469
diff
changeset
|
364 name as FILENAME, to write a file of the same old name in that directory. |
dc6cd68555d1
(format-write-file): Add optional argument CONFIRM and make it behave
Luc Teirlinck <teirllm@auburn.edu>
parents:
54469
diff
changeset
|
365 |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
366 If optional third arg CONFIRM is non-nil, ask for confirmation before |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
367 overwriting an existing file. Interactively, confirmation is required |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
368 unless you supply a prefix argument." |
11054 | 369 (interactive |
370 ;; Same interactive spec as write-file, plus format question. | |
371 (let* ((file (if buffer-file-name | |
372 (read-file-name "Write file: " | |
373 nil nil nil nil) | |
374 (read-file-name "Write file: " | |
375 (cdr (assq 'default-directory | |
376 (buffer-local-variables))) | |
377 nil nil (buffer-name)))) | |
24156 | 378 (fmt (format-read (format "Write file `%s' in format: " |
11054 | 379 (file-name-nondirectory file))))) |
54708
dc6cd68555d1
(format-write-file): Add optional argument CONFIRM and make it behave
Luc Teirlinck <teirllm@auburn.edu>
parents:
54469
diff
changeset
|
380 (list file fmt (not current-prefix-arg)))) |
45749
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
381 (let ((old-formats buffer-file-format) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
382 preserve-formats) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
383 (dolist (fmt old-formats) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
384 (let ((aelt (assq fmt format-alist))) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
385 (if (nth 7 aelt) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
386 (push fmt preserve-formats)))) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
387 (setq buffer-file-format format) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
388 (dolist (fmt preserve-formats) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
389 (unless (memq fmt buffer-file-format) |
8dd957dbfbcc
(format-alist): Document new element PRESERVE.
Richard M. Stallman <rms@gnu.org>
parents:
44377
diff
changeset
|
390 (setq buffer-file-format (append buffer-file-format (list fmt)))))) |
54708
dc6cd68555d1
(format-write-file): Add optional argument CONFIRM and make it behave
Luc Teirlinck <teirllm@auburn.edu>
parents:
54469
diff
changeset
|
391 (write-file filename confirm)) |
11054 | 392 |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
393 (defun format-find-file (filename format) |
24156 | 394 "Find the file FILENAME using data format FORMAT. |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
395 If FORMAT is nil then do not do any format conversion." |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
396 (interactive |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
397 ;; Same interactive spec as write-file, plus format question. |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
398 (let* ((file (read-file-name "Find file: ")) |
24156 | 399 (fmt (format-read (format "Read file `%s' in format: " |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
400 (file-name-nondirectory file))))) |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
401 (list file fmt))) |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
402 (let ((format-alist nil)) |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
403 (find-file filename)) |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
404 (if format |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
405 (format-decode-buffer format))) |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
406 |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
407 (defun format-insert-file (filename format &optional beg end) |
24156 | 408 "Insert the contents of file FILENAME using data format FORMAT. |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
409 If FORMAT is nil then do not do any format conversion. |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
410 The optional third and fourth arguments BEG and END specify |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
411 the part (in bytes) of the file to read. |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
412 |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
413 The return value is like the value of `insert-file-contents': |
54469
0610337ed9b5
(format-insert-file): Always return a list of two elements,
Luc Teirlinck <teirllm@auburn.edu>
parents:
53862
diff
changeset
|
414 a list (ABSOLUTE-FILE-NAME SIZE)." |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
415 (interactive |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
416 ;; Same interactive spec as write-file, plus format question. |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
417 (let* ((file (read-file-name "Find file: ")) |
24156 | 418 (fmt (format-read (format "Read file `%s' in format: " |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
419 (file-name-nondirectory file))))) |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
420 (list file fmt))) |
82312
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
421 (let (value size old-undo) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
422 ;; Record only one undo entry for the insertion. Inhibit point-motion and |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
423 ;; modification hooks as with `insert-file-contents'. |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
424 (let ((inhibit-point-motion-hooks t) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
425 (inhibit-modification-hooks t)) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
426 ;; Don't bind `buffer-undo-list' to t here to assert that |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
427 ;; `insert-file-contents' may record whether the buffer was unmodified |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
428 ;; before. |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
429 (let ((format-alist nil)) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
430 (setq value (insert-file-contents filename nil beg end)) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
431 (setq size (nth 1 value))) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
432 (when (consp buffer-undo-list) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
433 (let ((head (car buffer-undo-list))) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
434 (when (and (consp head) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
435 (equal (car head) (point)) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
436 (equal (cdr head) (+ (point) size))) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
437 ;; Remove first entry from `buffer-undo-list', we shall insert |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
438 ;; another one below. |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
439 (setq old-undo (cdr buffer-undo-list))))) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
440 (when format |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
441 (let ((buffer-undo-list t)) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
442 (setq size (format-decode format size) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
443 value (list (car value) size))) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
444 (unless (eq buffer-undo-list t) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
445 (setq buffer-undo-list |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
446 (cons (cons (point) (+ (point) size)) old-undo))))) |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
447 (unless inhibit-modification-hooks |
f285691bc158
(format-insert-file): Make sure that at most one undo
Martin Rudalics <rudalics@gmx.at>
parents:
78236
diff
changeset
|
448 (run-hook-with-args 'after-change-functions (point) (+ (point) size) 0)) |
12154
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
449 value)) |
38a933f88c87
(format-find-file, format-insert-file): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
12082
diff
changeset
|
450 |
11054 | 451 (defun format-read (&optional prompt) |
452 "Read and return the name of a format. | |
453 Return value is a list, like `buffer-file-format'; it may be nil. | |
454 Formats are defined in `format-alist'. Optional arg is the PROMPT to use." | |
455 (let* ((table (mapcar (lambda (x) (list (symbol-name (car x)))) | |
456 format-alist)) | |
457 (ans (completing-read (or prompt "Format: ") table nil t))) | |
458 (if (not (equal "" ans)) (list (intern ans))))) | |
459 | |
460 | |
461 ;;; | |
462 ;;; Below are some functions that may be useful in writing encoding and | |
463 ;;; decoding functions for use in format-alist. | |
464 ;;; | |
465 | |
466 (defun format-replace-strings (alist &optional reverse beg end) | |
467 "Do multiple replacements on the buffer. | |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
468 ALIST is a list of (FROM . TO) pairs, which should be proper arguments to |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
469 `search-forward' and `replace-match', respectively. |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
470 Optional second arg REVERSE, if non-nil, means the pairs are (TO . FROM), |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
471 so that you can use the same list in both directions if it contains only |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
472 literal strings. |
24156 | 473 Optional args BEG and END specify a region of the buffer on which to operate." |
11054 | 474 (save-excursion |
475 (save-restriction | |
476 (or beg (setq beg (point-min))) | |
477 (if end (narrow-to-region (point-min) end)) | |
478 (while alist | |
479 (let ((from (if reverse (cdr (car alist)) (car (car alist)))) | |
24315
382a7de604b6
(format-replace-strings): Fix value of TO in REVERSE case.
Richard M. Stallman <rms@gnu.org>
parents:
24156
diff
changeset
|
480 (to (if reverse (car (car alist)) (cdr (car alist))))) |
11054 | 481 (goto-char beg) |
482 (while (search-forward from nil t) | |
483 (goto-char (match-beginning 0)) | |
484 (insert to) | |
485 (set-text-properties (- (point) (length to)) (point) | |
486 (text-properties-at (point))) | |
487 (delete-region (point) (+ (point) (- (match-end 0) | |
488 (match-beginning 0))))) | |
489 (setq alist (cdr alist))))))) | |
490 | |
491 ;;; Some list-manipulation functions that we need. | |
492 | |
493 (defun format-delq-cons (cons list) | |
24156 | 494 "Remove the given CONS from LIST by side effect and return the new LIST. |
495 Since CONS could be the first element of LIST, write | |
496 `\(setq foo \(format-delq-cons element foo))' to be sure of changing | |
497 the value of `foo'." | |
11054 | 498 (if (eq cons list) |
499 (cdr list) | |
500 (let ((p list)) | |
501 (while (not (eq (cdr p) cons)) | |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38046
diff
changeset
|
502 (if (null p) (error "format-delq-cons: not an element")) |
11054 | 503 (setq p (cdr p))) |
504 ;; Now (cdr p) is the cons to delete | |
505 (setcdr p (cdr cons)) | |
506 list))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48214
diff
changeset
|
507 |
11054 | 508 (defun format-make-relatively-unique (a b) |
509 "Delete common elements of lists A and B, return as pair. | |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
510 Compare using `equal'." |
11054 | 511 (let* ((acopy (copy-sequence a)) |
512 (bcopy (copy-sequence b)) | |
513 (tail acopy)) | |
514 (while tail | |
515 (let ((dup (member (car tail) bcopy)) | |
516 (next (cdr tail))) | |
517 (if dup (setq acopy (format-delq-cons tail acopy) | |
518 bcopy (format-delq-cons dup bcopy))) | |
519 (setq tail next))) | |
520 (cons acopy bcopy))) | |
521 | |
522 (defun format-common-tail (a b) | |
523 "Given two lists that have a common tail, return it. | |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
524 Compare with `equal', and return the part of A that is equal to the |
11054 | 525 equivalent part of B. If even the last items of the two are not equal, |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
526 return nil." |
11054 | 527 (let ((la (length a)) |
528 (lb (length b))) | |
529 ;; Make sure they are the same length | |
24156 | 530 (if (> la lb) |
11054 | 531 (setq a (nthcdr (- la lb) a)) |
532 (setq b (nthcdr (- lb la) b)))) | |
533 (while (not (equal a b)) | |
534 (setq a (cdr a) | |
535 b (cdr b))) | |
536 a) | |
537 | |
27793
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
538 (defun format-proper-list-p (list) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
539 "Return t if LIST is a proper list. |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
540 A proper list is a list ending with a nil cdr, not with an atom " |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
541 (when (listp list) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
542 (while (consp list) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
543 (setq list (cdr list))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
544 (null list))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
545 |
11054 | 546 (defun format-reorder (items order) |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
547 "Arrange ITEMS to follow partial ORDER. |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
548 Elements of ITEMS equal to elements of ORDER will be rearranged |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
549 to follow the ORDER. Unmatched items will go last." |
11054 | 550 (if order |
551 (let ((item (member (car order) items))) | |
552 (if item | |
24156 | 553 (cons (car item) |
11054 | 554 (format-reorder (format-delq-cons item items) |
555 (cdr order))) | |
556 (format-reorder items (cdr order)))) | |
557 items)) | |
558 | |
559 (put 'face 'format-list-valued t) ; These text-properties take values | |
560 (put 'unknown 'format-list-valued t) ; that are lists, the elements of which | |
561 ; should be considered separately. | |
562 ; See format-deannotate-region and | |
563 ; format-annotate-region. | |
564 | |
24983
583275537b14
(top-level): Give `display' property `format-list-atomic-p.
Gerd Moellmann <gerd@gnu.org>
parents:
24347
diff
changeset
|
565 ;; This text property has list values, but they are treated atomically. |
583275537b14
(top-level): Give `display' property `format-list-atomic-p.
Gerd Moellmann <gerd@gnu.org>
parents:
24347
diff
changeset
|
566 |
583275537b14
(top-level): Give `display' property `format-list-atomic-p.
Gerd Moellmann <gerd@gnu.org>
parents:
24347
diff
changeset
|
567 (put 'display 'format-list-atomic-p t) |
583275537b14
(top-level): Give `display' property `format-list-atomic-p.
Gerd Moellmann <gerd@gnu.org>
parents:
24347
diff
changeset
|
568 |
11054 | 569 ;;; |
570 ;;; Decoding | |
571 ;;; | |
572 | |
573 (defun format-deannotate-region (from to translations next-fn) | |
574 "Translate annotations in the region into text properties. | |
24156 | 575 This sets text properties between FROM to TO as directed by the |
11054 | 576 TRANSLATIONS and NEXT-FN arguments. |
577 | |
578 NEXT-FN is a function that searches forward from point for an annotation. | |
579 It should return a list of 4 elements: \(BEGIN END NAME POSITIVE). BEGIN and | |
580 END are buffer positions bounding the annotation, NAME is the name searched | |
581 for in TRANSLATIONS, and POSITIVE should be non-nil if this annotation marks | |
582 the beginning of a region with some property, or nil if it ends the region. | |
583 NEXT-FN should return nil if there are no annotations after point. | |
584 | |
585 The basic format of the TRANSLATIONS argument is described in the | |
586 documentation for the `format-annotate-region' function. There are some | |
587 additional things to keep in mind for decoding, though: | |
588 | |
589 When an annotation is found, the TRANSLATIONS list is searched for a | |
590 text-property name and value that corresponds to that annotation. If the | |
591 text-property has several annotations associated with it, it will be used only | |
592 if the other annotations are also in effect at that point. The first match | |
593 found whose annotations are all present is used. | |
594 | |
595 The text property thus determined is set to the value over the region between | |
596 the opening and closing annotations. However, if the text-property name has a | |
597 non-nil `format-list-valued' property, then the value will be consed onto the | |
598 surrounding value of the property, rather than replacing that value. | |
599 | |
600 There are some special symbols that can be used in the \"property\" slot of | |
601 the TRANSLATIONS list: PARAMETER and FUNCTION \(spelled in uppercase). | |
602 Annotations listed under the pseudo-property PARAMETER are considered to be | |
603 arguments of the immediately surrounding annotation; the text between the | |
604 opening and closing parameter annotations is deleted from the buffer but saved | |
44377
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
605 as a string. |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
606 |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
607 The surrounding annotation should be listed under the pseudo-property |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
608 FUNCTION. Instead of inserting a text-property for this annotation, |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
609 the function listed in the VALUE slot is called to make whatever |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
610 changes are appropriate. It can also return a list of the form |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
611 \(START LOC PROP VALUE) which specifies a property to put on. The |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
612 function's first two arguments are the START and END locations, and |
7c3b2b1a90ac
(format-deannotate-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
42546
diff
changeset
|
613 the rest of the arguments are any PARAMETERs found in that region. |
11054 | 614 |
615 Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS | |
616 are saved as values of the `unknown' text-property \(which is list-valued). | |
617 The TRANSLATIONS list should usually contain an entry of the form | |
618 \(unknown \(nil format-annotate-value)) | |
619 to write these unknown annotations back into the file." | |
620 (save-excursion | |
621 (save-restriction | |
622 (narrow-to-region (point-min) to) | |
623 (goto-char from) | |
624 (let (next open-ans todo loc unknown-ans) | |
625 (while (setq next (funcall next-fn)) | |
626 (let* ((loc (nth 0 next)) | |
627 (end (nth 1 next)) | |
628 (name (nth 2 next)) | |
629 (positive (nth 3 next)) | |
630 (found nil)) | |
631 | |
632 ;; Delete the annotation | |
633 (delete-region loc end) | |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
634 (cond |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
635 ;; Positive annotations are stacked, remembering location |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
636 (positive (push `(,name ((,loc . nil))) open-ans)) |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
637 ;; It is a negative annotation: |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
638 ;; Close the top annotation & add its text property. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
639 ;; If the file's nesting is messed up, the close might not match |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
640 ;; the top thing on the open-annotations stack. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
641 ;; If no matching annotation is open, just ignore the close. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
642 ((not (assoc name open-ans)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
643 (message "Extra closing annotation (%s) in file" name)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
644 ;; If one is open, but not on the top of the stack, close |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
645 ;; the things in between as well. Set `found' when the real |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
646 ;; one is closed. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
647 (t |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
648 (while (not found) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
649 (let* ((top (car open-ans)) ; first on stack: should match. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
650 (top-name (car top)) ; text property name |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
651 (top-extents (nth 1 top)) ; property regions |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
652 (params (cdr (cdr top))) ; parameters |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
653 (aalist translations) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
654 (matched nil)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
655 (if (equal name top-name) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
656 (setq found t) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
657 (message "Improper nesting in file.")) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
658 ;; Look through property names in TRANSLATIONS |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
659 (while aalist |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
660 (let ((prop (car (car aalist))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
661 (alist (cdr (car aalist)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
662 ;; And look through values for each property |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
663 (while alist |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
664 (let ((value (car (car alist))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
665 (ans (cdr (car alist)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
666 (if (member top-name ans) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
667 ;; This annotation is listed, but still have to |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
668 ;; check if multiple annotations are satisfied |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
669 (if (member nil (mapcar (lambda (r) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
670 (assoc r open-ans)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
671 ans)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
672 nil ; multiple ans not satisfied |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
673 ;; If there are multiple annotations going |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
674 ;; into one text property, split up the other |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
675 ;; annotations so they apply individually to |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
676 ;; the other regions. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
677 (setcdr (car top-extents) loc) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
678 (let ((to-split ans) this-one extents) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
679 (while to-split |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
680 (setq this-one |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
681 (assoc (car to-split) open-ans) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
682 extents (nth 1 this-one)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
683 (if (not (eq this-one top)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
684 (setcar (cdr this-one) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
685 (format-subtract-regions |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
686 extents top-extents))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
687 (setq to-split (cdr to-split)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
688 ;; Set loop variables to nil so loop |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
689 ;; will exit. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
690 (setq alist nil aalist nil matched t |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
691 ;; pop annotation off stack. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
692 open-ans (cdr open-ans)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
693 (let ((extents top-extents) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
694 (start (car (car top-extents))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
695 (loc (cdr (car top-extents)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
696 (while extents |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
697 (cond |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
698 ;; Check for pseudo-properties |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
699 ((eq prop 'PARAMETER) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
700 ;; A parameter of the top open ann: |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
701 ;; delete text and use as arg. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
702 (if open-ans |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
703 ;; (If nothing open, discard). |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
704 (setq open-ans |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
705 (cons |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
706 (append (car open-ans) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
707 (list |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
708 (buffer-substring |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
709 start loc))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
710 (cdr open-ans)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
711 (delete-region start loc)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
712 ((eq prop 'FUNCTION) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
713 ;; Not a property, but a function. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
714 (let ((rtn |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
715 (apply value start loc params))) |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
716 (if rtn (push rtn todo)))) |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
717 (t |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
718 ;; Normal property/value pair |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
719 (setq todo |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
720 (cons (list start loc prop value) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
721 todo)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
722 (setq extents (cdr extents) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
723 start (car (car extents)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
724 loc (cdr (car extents)))))))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
725 (setq alist (cdr alist)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
726 (setq aalist (cdr aalist))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
727 (if (not matched) |
11054 | 728 ;; Didn't find any match for the annotation: |
729 ;; Store as value of text-property `unknown'. | |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
730 (let ((extents top-extents) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
731 (start (car (car top-extents))) |
20087
3a72c0f0ad69
(format-deannotate-region): In case of unmatched tags,
Karl Heuer <kwzh@gnu.org>
parents:
19631
diff
changeset
|
732 (loc (or (cdr (car top-extents)) loc))) |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
733 (while extents |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
734 (setq open-ans (cdr open-ans) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
735 todo (cons (list start loc 'unknown top-name) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
736 todo) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
737 unknown-ans (cons name unknown-ans) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
738 extents (cdr extents) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
739 start (car (car extents)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
740 loc (cdr (car extents)))))))))))) |
11054 | 741 |
742 ;; Once entire file has been scanned, add the properties. | |
743 (while todo | |
744 (let* ((item (car todo)) | |
745 (from (nth 0 item)) | |
746 (to (nth 1 item)) | |
747 (prop (nth 2 item)) | |
748 (val (nth 3 item))) | |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
749 |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
750 (if (numberp val) ; add to ambient value if numeric |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
751 (format-property-increment-region from to prop val 0) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
752 (put-text-property |
11054 | 753 from to prop |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
754 (cond ((get prop 'format-list-valued) ; value gets consed onto |
11054 | 755 ; list-valued properties |
756 (let ((prev (get-text-property from prop))) | |
757 (cons val (if (listp prev) prev (list prev))))) | |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
758 (t val))))) ; normally, just set to val. |
11054 | 759 (setq todo (cdr todo))) |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
760 |
11054 | 761 (if unknown-ans |
762 (message "Unknown annotations: %s" unknown-ans)))))) | |
763 | |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
764 (defun format-subtract-regions (minu subtra) |
55974
b8d3cea56c44
(format-insert-annotations, format-annotate-location): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
54708
diff
changeset
|
765 "Remove from the regions in MINUEND the regions in SUBTRAHEND. |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
766 A region is a dotted pair (FROM . TO). Both parameters are lists of |
24156 | 767 regions. Each list must contain nonoverlapping, noncontiguous |
768 regions, in descending order. The result is also nonoverlapping, | |
769 noncontiguous, and in descending order. The first element of MINUEND | |
770 can have a cdr of nil, indicating that the end of that region is not | |
55974
b8d3cea56c44
(format-insert-annotations, format-annotate-location): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
54708
diff
changeset
|
771 yet known. |
b8d3cea56c44
(format-insert-annotations, format-annotate-location): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
54708
diff
changeset
|
772 |
b8d3cea56c44
(format-insert-annotations, format-annotate-location): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
54708
diff
changeset
|
773 \(fn MINUEND SUBTRAHEND)" |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
774 (let* ((minuend (copy-alist minu)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
775 (subtrahend (copy-alist subtra)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
776 (m (car minuend)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
777 (s (car subtrahend)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
778 results) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
779 (while (and minuend subtrahend) |
24156 | 780 (cond |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
781 ;; The minuend starts after the subtrahend ends; keep it. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
782 ((> (car m) (cdr s)) |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
783 (push m results) |
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
784 (setq minuend (cdr minuend) |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
785 m (car minuend))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
786 ;; The minuend extends beyond the end of the subtrahend. Chop it off. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
787 ((or (null (cdr m)) (> (cdr m) (cdr s))) |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
788 (push (cons (1+ (cdr s)) (cdr m)) results) |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
789 (setcdr m (cdr s))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
790 ;; The subtrahend starts after the minuend ends; throw it away. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
791 ((< (cdr m) (car s)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
792 (setq subtrahend (cdr subtrahend) s (car subtrahend))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
793 ;; The subtrahend extends beyond the end of the minuend. Chop it off. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
794 (t ;(<= (cdr m) (cdr s))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
795 (if (>= (car m) (car s)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
796 (setq minuend (cdr minuend) m (car minuend)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
797 (setcdr m (1- (car s))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
798 (setq subtrahend (cdr subtrahend) s (car subtrahend)))))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
799 (nconc (nreverse results) minuend))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
800 |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
801 ;; This should probably go somewhere other than format.el. Then again, |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
802 ;; indent.el has alter-text-property. NOTE: We can also use |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
803 ;; next-single-property-change instead of text-property-not-all, but then |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
804 ;; we have to see if we passed TO. |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
805 (defun format-property-increment-region (from to prop delta default) |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
806 "In the region from FROM to TO increment property PROP by amount DELTA. |
24156 | 807 DELTA may be negative. If property PROP is nil anywhere |
19631
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
808 in the region, it is treated as though it were DEFAULT." |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
809 (let ((cur from) val newval next) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
810 (while cur |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
811 (setq val (get-text-property cur prop) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
812 newval (+ (or val default) delta) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
813 next (text-property-not-all cur to prop val)) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
814 (put-text-property cur (or next to) prop newval) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
815 (setq cur next)))) |
51b56762f98b
(format-subtract-regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
19363
diff
changeset
|
816 |
11054 | 817 ;;; |
818 ;;; Encoding | |
819 ;;; | |
820 | |
821 (defun format-insert-annotations (list &optional offset) | |
822 "Apply list of annotations to buffer as `write-region' would. | |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
823 Insert each element of the given LIST of buffer annotations at its |
11054 | 824 appropriate place. Use second arg OFFSET if the annotations' locations are |
825 not relative to the beginning of the buffer: annotations will be inserted | |
55974
b8d3cea56c44
(format-insert-annotations, format-annotate-location): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
54708
diff
changeset
|
826 at their location-OFFSET+1 \(ie, the offset is treated as the position of |
b8d3cea56c44
(format-insert-annotations, format-annotate-location): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
54708
diff
changeset
|
827 the first character in the buffer)." |
24156 | 828 (if (not offset) |
11054 | 829 (setq offset 0) |
830 (setq offset (1- offset))) | |
831 (let ((l (reverse list))) | |
832 (while l | |
833 (goto-char (- (car (car l)) offset)) | |
834 (insert (cdr (car l))) | |
835 (setq l (cdr l))))) | |
836 | |
837 (defun format-annotate-value (old new) | |
42470 | 838 "Return OLD and NEW as a \(CLOSE . OPEN) annotation pair. |
11054 | 839 Useful as a default function for TRANSLATIONS alist when the value of the text |
840 property is the name of the annotation that you want to use, as it is for the | |
841 `unknown' text property." | |
842 (cons (if old (list old)) | |
843 (if new (list new)))) | |
844 | |
24156 | 845 (defun format-annotate-region (from to translations format-fn ignore) |
11054 | 846 "Generate annotations for text properties in the region. |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
847 Search for changes between FROM and TO, and describe them with a list of |
11054 | 848 annotations as defined by alist TRANSLATIONS and FORMAT-FN. IGNORE lists text |
849 properties not to consider; any text properties that are neither ignored nor | |
850 listed in TRANSLATIONS are warned about. | |
851 If you actually want to modify the region, give the return value of this | |
852 function to `format-insert-annotations'. | |
853 | |
854 Format of the TRANSLATIONS argument: | |
855 | |
856 Each element is a list whose car is a PROPERTY, and the following | |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
857 elements have the form (VALUE ANNOTATIONS...). |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
858 Whenever the property takes on the value VALUE, the annotations |
11054 | 859 \(as formatted by FORMAT-FN) are inserted into the file. |
860 When the property stops having that value, the matching negated annotation | |
861 will be inserted \(it may actually be closed earlier and reopened, if | |
24156 | 862 necessary, to keep proper nesting). |
11054 | 863 |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
864 If VALUE is a list, then each element of the list is dealt with |
11054 | 865 separately. |
866 | |
867 If a VALUE is numeric, then it is assumed that there is a single annotation | |
868 and each occurrence of it increments the value of the property by that number. | |
869 Thus, given the entry \(left-margin \(4 \"indent\")), if the left margin | |
870 changes from 4 to 12, two <indent> annotations will be generated. | |
871 | |
872 If the VALUE is nil, then instead of annotations, a function should be | |
873 specified. This function is used as a default: it is called for all | |
874 transitions not explicitly listed in the table. The function is called with | |
875 two arguments, the OLD and NEW values of the property. It should return | |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
876 a cons cell (CLOSE . OPEN) as `format-annotate-single-property-change' does. |
11054 | 877 |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
878 The same TRANSLATIONS structure can be used in reverse for reading files." |
11054 | 879 (let ((all-ans nil) ; All annotations - becomes return value |
880 (open-ans nil) ; Annotations not yet closed | |
881 (loc nil) ; Current location | |
882 (not-found nil)) ; Properties that couldn't be saved | |
883 (while (or (null loc) | |
884 (and (setq loc (next-property-change loc nil to)) | |
885 (< loc to))) | |
886 (or loc (setq loc from)) | |
24156 | 887 (let* ((ans (format-annotate-location loc (= loc from) ignore translations)) |
11054 | 888 (neg-ans (format-reorder (aref ans 0) open-ans)) |
889 (pos-ans (aref ans 1)) | |
890 (ignored (aref ans 2))) | |
891 (setq not-found (append ignored not-found) | |
892 ignore (append ignored ignore)) | |
893 ;; First do the negative (closing) annotations | |
894 (while neg-ans | |
895 ;; Check if it's missing. This can happen (eg, a numeric property | |
896 ;; going negative can generate closing annotations before there are | |
897 ;; any open). Warn user & ignore. | |
898 (if (not (member (car neg-ans) open-ans)) | |
899 (message "Can't close %s: not open." (car neg-ans)) | |
900 (while (not (equal (car neg-ans) (car open-ans))) | |
901 ;; To close anno. N, need to first close ans 1 to N-1, | |
902 ;; remembering to re-open them later. | |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
903 (push (car open-ans) pos-ans) |
24156 | 904 (setq all-ans |
11054 | 905 (cons (cons loc (funcall format-fn (car open-ans) nil)) |
906 all-ans)) | |
907 (setq open-ans (cdr open-ans))) | |
908 ;; Now remove the one we're really interested in from open list. | |
909 (setq open-ans (cdr open-ans)) | |
910 ;; And put the closing annotation here. | |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
911 (push (cons loc (funcall format-fn (car neg-ans) nil)) |
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
912 all-ans)) |
11054 | 913 (setq neg-ans (cdr neg-ans))) |
914 ;; Now deal with positive (opening) annotations | |
915 (let ((p pos-ans)) | |
916 (while pos-ans | |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
917 (push (car pos-ans) open-ans) |
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
918 (push (cons loc (funcall format-fn (car pos-ans) t)) |
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
919 all-ans) |
11054 | 920 (setq pos-ans (cdr pos-ans)))))) |
921 | |
922 ;; Close any annotations still open | |
923 (while open-ans | |
24156 | 924 (setq all-ans |
11054 | 925 (cons (cons to (funcall format-fn (car open-ans) nil)) |
926 all-ans)) | |
927 (setq open-ans (cdr open-ans))) | |
928 (if not-found | |
929 (message "These text properties could not be saved:\n %s" | |
930 not-found)) | |
931 (nreverse all-ans))) | |
932 | |
933 ;;; Internal functions for format-annotate-region. | |
934 | |
24156 | 935 (defun format-annotate-location (loc all ignore translations) |
936 "Return annotation(s) needed at location LOC. | |
55974
b8d3cea56c44
(format-insert-annotations, format-annotate-location): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
54708
diff
changeset
|
937 This includes any properties that change between LOC - 1 and LOC. |
11054 | 938 If ALL is true, don't look at previous location, but generate annotations for |
939 all non-nil properties. | |
940 Third argument IGNORE is a list of text-properties not to consider. | |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
941 Use the TRANSLATIONS alist (see `format-annotate-region' for doc). |
11054 | 942 |
943 Return value is a vector of 3 elements: | |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
944 1. List of annotations to close |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
945 2. List of annotations to open. |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
946 3. List of properties that were ignored or couldn't be annotated. |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
947 |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
948 The annotations in lists 1 and 2 need not be strings. |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
949 They can be whatever the FORMAT-FN in `format-annotate-region' |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
950 can handle. If that is `enriched-make-annotation', they can be |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
951 either strings, or lists of the form (PARAMETER VALUE)." |
11054 | 952 (let* ((prev-loc (1- loc)) |
953 (before-plist (if all nil (text-properties-at prev-loc))) | |
954 (after-plist (text-properties-at loc)) | |
955 p negatives positives prop props not-found) | |
956 ;; make list of all property names involved | |
957 (setq p before-plist) | |
958 (while p | |
959 (if (not (memq (car p) props)) | |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
960 (push (car p) props)) |
11054 | 961 (setq p (cdr (cdr p)))) |
962 (setq p after-plist) | |
963 (while p | |
964 (if (not (memq (car p) props)) | |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
965 (push (car p) props)) |
11054 | 966 (setq p (cdr (cdr p)))) |
967 | |
968 (while props | |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
969 (setq prop (pop props)) |
11054 | 970 (if (memq prop ignore) |
971 nil ; If it's been ignored before, ignore it now. | |
972 (let ((before (if all nil (car (cdr (memq prop before-plist))))) | |
973 (after (car (cdr (memq prop after-plist))))) | |
974 (if (equal before after) | |
975 nil ; no change; ignore | |
976 (let ((result (format-annotate-single-property-change | |
24156 | 977 prop before after translations))) |
11054 | 978 (if (not result) |
48214
22a18a9dae2a
(format-decode): Be careful with the order in `format'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45940
diff
changeset
|
979 (push prop not-found) |
11054 | 980 (setq negatives (nconc negatives (car result)) |
981 positives (nconc positives (cdr result))))))))) | |
982 (vector negatives positives not-found))) | |
983 | |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
984 (defun format-annotate-single-property-change (prop old new translations) |
24156 | 985 "Return annotations for property PROP changing from OLD to NEW. |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
986 These are searched for in the translations alist TRANSLATIONS |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
987 (see `format-annotate-region' for the format). |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
988 If NEW does not appear in the list, but there is a default function, |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
989 then call that function. |
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
990 Return a cons of the form (CLOSE . OPEN) |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
991 where CLOSE is a list of annotations to close |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
992 and OPEN is a list of annotations to open. |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
993 |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
994 The annotations in CLOSE and OPEN need not be strings. |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
995 They can be whatever the FORMAT-FN in `format-annotate-region' |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
996 can handle. If that is `enriched-make-annotation', they can be |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
997 either strings, or lists of the form (PARAMETER VALUE)." |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
998 |
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
999 (let ((prop-alist (cdr (assoc prop translations))) |
11054 | 1000 default) |
1001 (if (not prop-alist) | |
1002 nil | |
1003 ;; If either old or new is a list, have to treat both that way. | |
27793
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1004 (if (and (or (listp old) (listp new)) |
24983
583275537b14
(top-level): Give `display' property `format-list-atomic-p.
Gerd Moellmann <gerd@gnu.org>
parents:
24347
diff
changeset
|
1005 (not (get prop 'format-list-atomic-p))) |
27793
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1006 (if (or (not (format-proper-list-p old)) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1007 (not (format-proper-list-p new))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1008 (format-annotate-atomic-property-change prop-alist old new) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1009 (let* ((old (if (listp old) old (list old))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1010 (new (if (listp new) new (list new))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1011 (tail (format-common-tail old new)) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1012 close open) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1013 (while old |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1014 (setq close |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1015 (append (car (format-annotate-atomic-property-change |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1016 prop-alist (car old) nil)) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1017 close) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1018 old (cdr old))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1019 (while new |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1020 (setq open |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1021 (append (cdr (format-annotate-atomic-property-change |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1022 prop-alist nil (car new))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1023 open) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1024 new (cdr new))) |
d1722c46d998
(format-annotate-single-property-change): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
24983
diff
changeset
|
1025 (format-make-relatively-unique close open))) |
11054 | 1026 (format-annotate-atomic-property-change prop-alist old new))))) |
1027 | |
1028 (defun format-annotate-atomic-property-change (prop-alist old new) | |
72247
2d16125405b4
Docstring style and grammar tweaks; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
1029 "Internal function to annotate a single property change. |
42546
a5795efa232a
(format-replace-strings, format-subtract-regions)
Richard M. Stallman <rms@gnu.org>
parents:
42470
diff
changeset
|
1030 PROP-ALIST is the relevant element of a TRANSLATIONS list. |
11054 | 1031 OLD and NEW are the values." |
19155
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1032 (let (num-ann) |
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1033 ;; If old and new values are numbers, |
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1034 ;; look for a number in PROP-ALIST. |
19235
759e45894579
(format-annotate-single-property-change,
Richard M. Stallman <rms@gnu.org>
parents:
19155
diff
changeset
|
1035 (if (and (or (null old) (numberp old)) |
759e45894579
(format-annotate-single-property-change,
Richard M. Stallman <rms@gnu.org>
parents:
19155
diff
changeset
|
1036 (or (null new) (numberp new))) |
19155
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1037 (progn |
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1038 (setq num-ann prop-alist) |
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1039 (while (and num-ann (not (numberp (car (car num-ann))))) |
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1040 (setq num-ann (cdr num-ann))))) |
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1041 (if num-ann |
19235
759e45894579
(format-annotate-single-property-change,
Richard M. Stallman <rms@gnu.org>
parents:
19155
diff
changeset
|
1042 ;; Numerical annotation - use difference |
19359
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1043 (progn |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1044 ;; If property is numeric, nil means 0 |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1045 (cond ((and (numberp old) (null new)) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1046 (setq new 0)) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1047 ((and (numberp new) (null old)) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1048 (setq old 0))) |
19235
759e45894579
(format-annotate-single-property-change,
Richard M. Stallman <rms@gnu.org>
parents:
19155
diff
changeset
|
1049 |
19359
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1050 (let* ((entry (car num-ann)) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1051 (increment (car entry)) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1052 (n (ceiling (/ (float (- new old)) (float increment)))) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1053 (anno (car (cdr entry)))) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1054 (if (> n 0) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1055 (cons nil (make-list n anno)) |
8f531dfe20bc
(format-annotate-atomic-property-change): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
19245
diff
changeset
|
1056 (cons (make-list (- n) anno) nil)))) |
11054 | 1057 |
19155
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1058 ;; Standard annotation |
20fda18753c2
(format-annotate-atomic-property-change):
Richard M. Stallman <rms@gnu.org>
parents:
18690
diff
changeset
|
1059 (let ((close (and old (cdr (assoc old prop-alist)))) |
11054 | 1060 (open (and new (cdr (assoc new prop-alist))))) |
1061 (if (or close open) | |
1062 (format-make-relatively-unique close open) | |
1063 ;; Call "Default" function, if any | |
1064 (let ((default (assq nil prop-alist))) | |
1065 (if default | |
1066 (funcall (car (cdr default)) old new)))))))) | |
1067 | |
18140
f16cf00a2f42
(format-insert-file): Fix arg order to format-decode.
Richard M. Stallman <rms@gnu.org>
parents:
16954
diff
changeset
|
1068 (provide 'format) |
24156 | 1069 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
1070 ;; arch-tag: c387e9c7-a93d-47bf-89bc-8ca67e96755a |
24156 | 1071 ;;; format.el ends here |