Mercurial > emacs
annotate src/editfns.c @ 7698:3d3717bb5405
(completion-setup-function): Fix up the regexp.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 27 May 1994 00:53:21 +0000 |
parents | 987ab382275c |
children | 36420d9e4b41 |
rev | line source |
---|---|
305 | 1 /* Lisp functions pertaining to editing. |
7307 | 2 Copyright (C) 1985,86,87,89,93,94 Free Software Foundation, Inc. |
305 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation; either version 1, or (at your option) | |
9 any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
2962
79314d830f7d
* editfns.c: #include <sys/types.h>, to get time_t for Eggert's
Jim Blandy <jimb@redhat.com>
parents:
2921
diff
changeset
|
21 #include <sys/types.h> |
79314d830f7d
* editfns.c: #include <sys/types.h>, to get time_t for Eggert's
Jim Blandy <jimb@redhat.com>
parents:
2921
diff
changeset
|
22 |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4420
diff
changeset
|
23 #include <config.h> |
372 | 24 |
25 #ifdef VMS | |
577 | 26 #include "vms-pwd.h" |
372 | 27 #else |
305 | 28 #include <pwd.h> |
372 | 29 #endif |
30 | |
305 | 31 #include "lisp.h" |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
32 #include "intervals.h" |
305 | 33 #include "buffer.h" |
34 #include "window.h" | |
35 | |
577 | 36 #include "systime.h" |
305 | 37 |
38 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
39 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
40 | |
41 /* Some static data, and a function to initialize it for each run */ | |
42 | |
43 Lisp_Object Vsystem_name; | |
44 Lisp_Object Vuser_real_name; /* login name of current user ID */ | |
45 Lisp_Object Vuser_full_name; /* full name of current user */ | |
5907
5fdb226fe9a4
(init_editfns): Look at LOGNAME before USER.
Karl Heuer <kwzh@gnu.org>
parents:
5884
diff
changeset
|
46 Lisp_Object Vuser_name; /* user name from LOGNAME or USER */ |
305 | 47 |
48 void | |
49 init_editfns () | |
50 { | |
330 | 51 char *user_name; |
305 | 52 register unsigned char *p, *q, *r; |
53 struct passwd *pw; /* password entry for the current user */ | |
54 extern char *index (); | |
55 Lisp_Object tem; | |
56 | |
57 /* Set up system_name even when dumping. */ | |
58 | |
59 Vsystem_name = build_string (get_system_name ()); | |
60 p = XSTRING (Vsystem_name)->data; | |
61 while (*p) | |
62 { | |
63 if (*p == ' ' || *p == '\t') | |
64 *p = '-'; | |
65 p++; | |
66 } | |
67 | |
68 #ifndef CANNOT_DUMP | |
69 /* Don't bother with this on initial start when just dumping out */ | |
70 if (!initialized) | |
71 return; | |
72 #endif /* not CANNOT_DUMP */ | |
73 | |
74 pw = (struct passwd *) getpwuid (getuid ()); | |
75 Vuser_real_name = build_string (pw ? pw->pw_name : "unknown"); | |
76 | |
330 | 77 /* Get the effective user name, by consulting environment variables, |
78 or the effective uid if those are unset. */ | |
5907
5fdb226fe9a4
(init_editfns): Look at LOGNAME before USER.
Karl Heuer <kwzh@gnu.org>
parents:
5884
diff
changeset
|
79 user_name = (char *) getenv ("LOGNAME"); |
330 | 80 if (!user_name) |
5907
5fdb226fe9a4
(init_editfns): Look at LOGNAME before USER.
Karl Heuer <kwzh@gnu.org>
parents:
5884
diff
changeset
|
81 user_name = (char *) getenv ("USER"); |
305 | 82 if (!user_name) |
330 | 83 { |
84 pw = (struct passwd *) getpwuid (geteuid ()); | |
85 user_name = (char *) (pw ? pw->pw_name : "unknown"); | |
86 } | |
87 Vuser_name = build_string (user_name); | |
305 | 88 |
330 | 89 /* If the user name claimed in the environment vars differs from |
90 the real uid, use the claimed name to find the full name. */ | |
305 | 91 tem = Fstring_equal (Vuser_name, Vuser_real_name); |
488 | 92 if (NILP (tem)) |
330 | 93 pw = (struct passwd *) getpwnam (XSTRING (Vuser_name)->data); |
305 | 94 |
95 p = (unsigned char *) (pw ? USER_FULL_NAME : "unknown"); | |
96 q = (unsigned char *) index (p, ','); | |
97 Vuser_full_name = make_string (p, q ? q - p : strlen (p)); | |
98 | |
99 #ifdef AMPERSAND_FULL_NAME | |
100 p = XSTRING (Vuser_full_name)->data; | |
101 q = (char *) index (p, '&'); | |
102 /* Substitute the login name for the &, upcasing the first character. */ | |
103 if (q) | |
104 { | |
105 r = (char *) alloca (strlen (p) + XSTRING (Vuser_name)->size + 1); | |
106 bcopy (p, r, q - p); | |
107 r[q - p] = 0; | |
330 | 108 strcat (r, XSTRING (Vuser_name)->data); |
305 | 109 r[q - p] = UPCASE (r[q - p]); |
110 strcat (r, q + 1); | |
111 Vuser_full_name = build_string (r); | |
112 } | |
113 #endif /* AMPERSAND_FULL_NAME */ | |
114 } | |
115 | |
116 DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0, | |
117 "Convert arg CHAR to a one-character string containing that character.") | |
118 (n) | |
119 Lisp_Object n; | |
120 { | |
121 char c; | |
122 CHECK_NUMBER (n, 0); | |
123 | |
124 c = XINT (n); | |
125 return make_string (&c, 1); | |
126 } | |
127 | |
128 DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0, | |
129 "Convert arg STRING to a character, the first character of that string.") | |
130 (str) | |
131 register Lisp_Object str; | |
132 { | |
133 register Lisp_Object val; | |
134 register struct Lisp_String *p; | |
135 CHECK_STRING (str, 0); | |
136 | |
137 p = XSTRING (str); | |
138 if (p->size) | |
139 XFASTINT (val) = ((unsigned char *) p->data)[0]; | |
140 else | |
141 XFASTINT (val) = 0; | |
142 return val; | |
143 } | |
144 | |
145 static Lisp_Object | |
146 buildmark (val) | |
147 int val; | |
148 { | |
149 register Lisp_Object mark; | |
150 mark = Fmake_marker (); | |
151 Fset_marker (mark, make_number (val), Qnil); | |
152 return mark; | |
153 } | |
154 | |
155 DEFUN ("point", Fpoint, Spoint, 0, 0, 0, | |
156 "Return value of point, as an integer.\n\ | |
157 Beginning of buffer is position (point-min)") | |
158 () | |
159 { | |
160 Lisp_Object temp; | |
161 XFASTINT (temp) = point; | |
162 return temp; | |
163 } | |
164 | |
165 DEFUN ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0, | |
166 "Return value of point, as a marker object.") | |
167 () | |
168 { | |
169 return buildmark (point); | |
170 } | |
171 | |
172 int | |
173 clip_to_bounds (lower, num, upper) | |
174 int lower, num, upper; | |
175 { | |
176 if (num < lower) | |
177 return lower; | |
178 else if (num > upper) | |
179 return upper; | |
180 else | |
181 return num; | |
182 } | |
183 | |
184 DEFUN ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ", | |
185 "Set point to POSITION, a number or marker.\n\ | |
186 Beginning of buffer is position (point-min), end is (point-max).") | |
187 (n) | |
188 register Lisp_Object n; | |
189 { | |
190 CHECK_NUMBER_COERCE_MARKER (n, 0); | |
191 | |
192 SET_PT (clip_to_bounds (BEGV, XINT (n), ZV)); | |
193 return n; | |
194 } | |
195 | |
196 static Lisp_Object | |
197 region_limit (beginningp) | |
198 int beginningp; | |
199 { | |
4047
e950abdc9ed2
(region_limit): Declare Vmark_even_if_inactive.
Roland McGrath <roland@gnu.org>
parents:
4038
diff
changeset
|
200 extern Lisp_Object Vmark_even_if_inactive; /* Defined in callint.c. */ |
305 | 201 register Lisp_Object m; |
4038
03a4c3912c13
(region_limit): Don't error if Vmark_even_if_inactive is set. When the
Roland McGrath <roland@gnu.org>
parents:
4019
diff
changeset
|
202 if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive) |
03a4c3912c13
(region_limit): Don't error if Vmark_even_if_inactive is set. When the
Roland McGrath <roland@gnu.org>
parents:
4019
diff
changeset
|
203 && NILP (current_buffer->mark_active)) |
03a4c3912c13
(region_limit): Don't error if Vmark_even_if_inactive is set. When the
Roland McGrath <roland@gnu.org>
parents:
4019
diff
changeset
|
204 Fsignal (Qmark_inactive, Qnil); |
305 | 205 m = Fmarker_position (current_buffer->mark); |
488 | 206 if (NILP (m)) error ("There is no region now"); |
305 | 207 if ((point < XFASTINT (m)) == beginningp) |
208 return (make_number (point)); | |
209 else | |
210 return (m); | |
211 } | |
212 | |
213 DEFUN ("region-beginning", Fregion_beginning, Sregion_beginning, 0, 0, 0, | |
214 "Return position of beginning of region, as an integer.") | |
215 () | |
216 { | |
217 return (region_limit (1)); | |
218 } | |
219 | |
220 DEFUN ("region-end", Fregion_end, Sregion_end, 0, 0, 0, | |
221 "Return position of end of region, as an integer.") | |
222 () | |
223 { | |
224 return (region_limit (0)); | |
225 } | |
226 | |
227 #if 0 /* now in lisp code */ | |
228 DEFUN ("mark", Fmark, Smark, 0, 0, 0, | |
229 "Return this buffer's mark value as integer, or nil if no mark.\n\ | |
230 If you are using this in an editing command, you are most likely making\n\ | |
231 a mistake; see the documentation of `set-mark'.") | |
232 () | |
233 { | |
234 return Fmarker_position (current_buffer->mark); | |
235 } | |
236 #endif /* commented out code */ | |
237 | |
238 DEFUN ("mark-marker", Fmark_marker, Smark_marker, 0, 0, 0, | |
239 "Return this buffer's mark, as a marker object.\n\ | |
240 Watch out! Moving this marker changes the mark position.\n\ | |
241 If you set the marker not to point anywhere, the buffer will have no mark.") | |
242 () | |
243 { | |
244 return current_buffer->mark; | |
245 } | |
246 | |
247 #if 0 /* this is now in lisp code */ | |
248 DEFUN ("set-mark", Fset_mark, Sset_mark, 1, 1, 0, | |
249 "Set this buffer's mark to POS. Don't use this function!\n\ | |
250 That is to say, don't use this function unless you want\n\ | |
251 the user to see that the mark has moved, and you want the previous\n\ | |
252 mark position to be lost.\n\ | |
253 \n\ | |
254 Normally, when a new mark is set, the old one should go on the stack.\n\ | |
255 This is why most applications should use push-mark, not set-mark.\n\ | |
256 \n\ | |
257 Novice programmers often try to use the mark for the wrong purposes.\n\ | |
258 The mark saves a location for the user's convenience.\n\ | |
259 Most editing commands should not alter the mark.\n\ | |
260 To remember a location for internal use in the Lisp program,\n\ | |
261 store it in a Lisp variable. Example:\n\ | |
262 \n\ | |
263 (let ((beg (point))) (forward-line 1) (delete-region beg (point))).") | |
264 (pos) | |
265 Lisp_Object pos; | |
266 { | |
488 | 267 if (NILP (pos)) |
305 | 268 { |
269 current_buffer->mark = Qnil; | |
270 return Qnil; | |
271 } | |
272 CHECK_NUMBER_COERCE_MARKER (pos, 0); | |
273 | |
488 | 274 if (NILP (current_buffer->mark)) |
305 | 275 current_buffer->mark = Fmake_marker (); |
276 | |
277 Fset_marker (current_buffer->mark, pos, Qnil); | |
278 return pos; | |
279 } | |
280 #endif /* commented-out code */ | |
281 | |
282 Lisp_Object | |
283 save_excursion_save () | |
284 { | |
1254
c7e7e3438711
* editfns.c (save_excursion_save, save_excursion_restore):
Jim Blandy <jimb@redhat.com>
parents:
1117
diff
changeset
|
285 register int visible = (XBUFFER (XWINDOW (selected_window)->buffer) |
c7e7e3438711
* editfns.c (save_excursion_save, save_excursion_restore):
Jim Blandy <jimb@redhat.com>
parents:
1117
diff
changeset
|
286 == current_buffer); |
305 | 287 |
288 return Fcons (Fpoint_marker (), | |
1254
c7e7e3438711
* editfns.c (save_excursion_save, save_excursion_restore):
Jim Blandy <jimb@redhat.com>
parents:
1117
diff
changeset
|
289 Fcons (Fcopy_marker (current_buffer->mark), |
2049
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
290 Fcons (visible ? Qt : Qnil, |
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
291 current_buffer->mark_active))); |
305 | 292 } |
293 | |
294 Lisp_Object | |
295 save_excursion_restore (info) | |
296 register Lisp_Object info; | |
297 { | |
7485
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
298 register Lisp_Object tem, tem1, omark, nmark; |
305 | 299 |
300 tem = Fmarker_buffer (Fcar (info)); | |
301 /* If buffer being returned to is now deleted, avoid error */ | |
302 /* Otherwise could get error here while unwinding to top level | |
303 and crash */ | |
304 /* In that case, Fmarker_buffer returns nil now. */ | |
488 | 305 if (NILP (tem)) |
305 | 306 return Qnil; |
307 Fset_buffer (tem); | |
308 tem = Fcar (info); | |
309 Fgoto_char (tem); | |
310 unchain_marker (tem); | |
311 tem = Fcar (Fcdr (info)); | |
7485
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
312 omark = Fmarker_position (current_buffer->mark); |
305 | 313 Fset_marker (current_buffer->mark, tem, Fcurrent_buffer ()); |
7485
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
314 nmark = Fmarker_position (tem); |
305 | 315 unchain_marker (tem); |
316 tem = Fcdr (Fcdr (info)); | |
4420
8113d9ba472e
(save_excursion_restore): Never make the buffer visible.
Richard M. Stallman <rms@gnu.org>
parents:
4358
diff
changeset
|
317 #if 0 /* We used to make the current buffer visible in the selected window |
8113d9ba472e
(save_excursion_restore): Never make the buffer visible.
Richard M. Stallman <rms@gnu.org>
parents:
4358
diff
changeset
|
318 if that was true previously. That avoids some anomalies. |
8113d9ba472e
(save_excursion_restore): Never make the buffer visible.
Richard M. Stallman <rms@gnu.org>
parents:
4358
diff
changeset
|
319 But it creates others, and it wasn't documented, and it is simpler |
8113d9ba472e
(save_excursion_restore): Never make the buffer visible.
Richard M. Stallman <rms@gnu.org>
parents:
4358
diff
changeset
|
320 and cleaner never to alter the window/buffer connections. */ |
2049
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
321 tem1 = Fcar (tem); |
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
322 if (!NILP (tem1) |
1254
c7e7e3438711
* editfns.c (save_excursion_save, save_excursion_restore):
Jim Blandy <jimb@redhat.com>
parents:
1117
diff
changeset
|
323 && current_buffer != XBUFFER (XWINDOW (selected_window)->buffer)) |
305 | 324 Fswitch_to_buffer (Fcurrent_buffer (), Qnil); |
4420
8113d9ba472e
(save_excursion_restore): Never make the buffer visible.
Richard M. Stallman <rms@gnu.org>
parents:
4358
diff
changeset
|
325 #endif /* 0 */ |
2049
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
326 |
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
327 tem1 = current_buffer->mark_active; |
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
328 current_buffer->mark_active = Fcdr (tem); |
6206
67c608b0e2f7
(save_excursion_restore): Don't call Vrun_hooks if nil.
Richard M. Stallman <rms@gnu.org>
parents:
5915
diff
changeset
|
329 if (!NILP (Vrun_hooks)) |
67c608b0e2f7
(save_excursion_restore): Don't call Vrun_hooks if nil.
Richard M. Stallman <rms@gnu.org>
parents:
5915
diff
changeset
|
330 { |
7485
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
331 /* If mark is active now, and either was not active |
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
332 or was at a different place, run the activate hook. */ |
6206
67c608b0e2f7
(save_excursion_restore): Don't call Vrun_hooks if nil.
Richard M. Stallman <rms@gnu.org>
parents:
5915
diff
changeset
|
333 if (! NILP (current_buffer->mark_active)) |
7485
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
334 { |
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
335 if (! EQ (omark, nmark)) |
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
336 call1 (Vrun_hooks, intern ("activate-mark-hook")); |
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
337 } |
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
338 /* If mark has ceased to be active, run deactivate hook. */ |
6206
67c608b0e2f7
(save_excursion_restore): Don't call Vrun_hooks if nil.
Richard M. Stallman <rms@gnu.org>
parents:
5915
diff
changeset
|
339 else if (! NILP (tem1)) |
67c608b0e2f7
(save_excursion_restore): Don't call Vrun_hooks if nil.
Richard M. Stallman <rms@gnu.org>
parents:
5915
diff
changeset
|
340 call1 (Vrun_hooks, intern ("deactivate-mark-hook")); |
67c608b0e2f7
(save_excursion_restore): Don't call Vrun_hooks if nil.
Richard M. Stallman <rms@gnu.org>
parents:
5915
diff
changeset
|
341 } |
305 | 342 return Qnil; |
343 } | |
344 | |
345 DEFUN ("save-excursion", Fsave_excursion, Ssave_excursion, 0, UNEVALLED, 0, | |
346 "Save point, mark, and current buffer; execute BODY; restore those things.\n\ | |
347 Executes BODY just like `progn'.\n\ | |
348 The values of point, mark and the current buffer are restored\n\ | |
2049
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
349 even in case of abnormal exit (throw or error).\n\ |
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
350 The state of activation of the mark is also restored.") |
305 | 351 (args) |
352 Lisp_Object args; | |
353 { | |
354 register Lisp_Object val; | |
355 int count = specpdl_ptr - specpdl; | |
356 | |
357 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
358 | |
359 val = Fprogn (args); | |
360 return unbind_to (count, val); | |
361 } | |
362 | |
363 DEFUN ("buffer-size", Fbufsize, Sbufsize, 0, 0, 0, | |
364 "Return the number of characters in the current buffer.") | |
365 () | |
366 { | |
367 Lisp_Object temp; | |
368 XFASTINT (temp) = Z - BEG; | |
369 return temp; | |
370 } | |
371 | |
372 DEFUN ("point-min", Fpoint_min, Spoint_min, 0, 0, 0, | |
373 "Return the minimum permissible value of point in the current buffer.\n\ | |
4943 | 374 This is 1, unless narrowing (a buffer restriction) is in effect.") |
305 | 375 () |
376 { | |
377 Lisp_Object temp; | |
378 XFASTINT (temp) = BEGV; | |
379 return temp; | |
380 } | |
381 | |
382 DEFUN ("point-min-marker", Fpoint_min_marker, Spoint_min_marker, 0, 0, 0, | |
383 "Return a marker to the minimum permissible value of point in this buffer.\n\ | |
4943 | 384 This is the beginning, unless narrowing (a buffer restriction) is in effect.") |
305 | 385 () |
386 { | |
387 return buildmark (BEGV); | |
388 } | |
389 | |
390 DEFUN ("point-max", Fpoint_max, Spoint_max, 0, 0, 0, | |
391 "Return the maximum permissible value of point in the current buffer.\n\ | |
4943 | 392 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)\n\ |
393 is in effect, in which case it is less.") | |
305 | 394 () |
395 { | |
396 Lisp_Object temp; | |
397 XFASTINT (temp) = ZV; | |
398 return temp; | |
399 } | |
400 | |
401 DEFUN ("point-max-marker", Fpoint_max_marker, Spoint_max_marker, 0, 0, 0, | |
402 "Return a marker to the maximum permissible value of point in this buffer.\n\ | |
4943 | 403 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)\n\ |
404 is in effect, in which case it is less.") | |
305 | 405 () |
406 { | |
407 return buildmark (ZV); | |
408 } | |
409 | |
512 | 410 DEFUN ("following-char", Ffollowing_char, Sfollowing_char, 0, 0, 0, |
411 "Return the character following point, as a number.\n\ | |
412 At the end of the buffer or accessible region, return 0.") | |
305 | 413 () |
414 { | |
415 Lisp_Object temp; | |
512 | 416 if (point >= ZV) |
417 XFASTINT (temp) = 0; | |
418 else | |
419 XFASTINT (temp) = FETCH_CHAR (point); | |
305 | 420 return temp; |
421 } | |
422 | |
512 | 423 DEFUN ("preceding-char", Fprevious_char, Sprevious_char, 0, 0, 0, |
424 "Return the character preceding point, as a number.\n\ | |
425 At the beginning of the buffer or accessible region, return 0.") | |
305 | 426 () |
427 { | |
428 Lisp_Object temp; | |
429 if (point <= BEGV) | |
430 XFASTINT (temp) = 0; | |
431 else | |
432 XFASTINT (temp) = FETCH_CHAR (point - 1); | |
433 return temp; | |
434 } | |
435 | |
436 DEFUN ("bobp", Fbobp, Sbobp, 0, 0, 0, | |
437 "Return T if point is at the beginning of the buffer.\n\ | |
438 If the buffer is narrowed, this means the beginning of the narrowed part.") | |
439 () | |
440 { | |
441 if (point == BEGV) | |
442 return Qt; | |
443 return Qnil; | |
444 } | |
445 | |
446 DEFUN ("eobp", Feobp, Seobp, 0, 0, 0, | |
447 "Return T if point is at the end of the buffer.\n\ | |
448 If the buffer is narrowed, this means the end of the narrowed part.") | |
449 () | |
450 { | |
451 if (point == ZV) | |
452 return Qt; | |
453 return Qnil; | |
454 } | |
455 | |
456 DEFUN ("bolp", Fbolp, Sbolp, 0, 0, 0, | |
457 "Return T if point is at the beginning of a line.") | |
458 () | |
459 { | |
460 if (point == BEGV || FETCH_CHAR (point - 1) == '\n') | |
461 return Qt; | |
462 return Qnil; | |
463 } | |
464 | |
465 DEFUN ("eolp", Feolp, Seolp, 0, 0, 0, | |
466 "Return T if point is at the end of a line.\n\ | |
467 `End of a line' includes point being at the end of the buffer.") | |
468 () | |
469 { | |
470 if (point == ZV || FETCH_CHAR (point) == '\n') | |
471 return Qt; | |
472 return Qnil; | |
473 } | |
474 | |
475 DEFUN ("char-after", Fchar_after, Schar_after, 1, 1, 0, | |
476 "Return character in current buffer at position POS.\n\ | |
477 POS is an integer or a buffer pointer.\n\ | |
478 If POS is out of range, the value is nil.") | |
479 (pos) | |
480 Lisp_Object pos; | |
481 { | |
482 register Lisp_Object val; | |
483 register int n; | |
484 | |
485 CHECK_NUMBER_COERCE_MARKER (pos, 0); | |
486 | |
487 n = XINT (pos); | |
488 if (n < BEGV || n >= ZV) return Qnil; | |
489 | |
490 XFASTINT (val) = FETCH_CHAR (n); | |
491 return val; | |
492 } | |
493 | |
494 DEFUN ("user-login-name", Fuser_login_name, Suser_login_name, 0, 0, 0, | |
495 "Return the name under which the user logged in, as a string.\n\ | |
496 This is based on the effective uid, not the real uid.\n\ | |
5907
5fdb226fe9a4
(init_editfns): Look at LOGNAME before USER.
Karl Heuer <kwzh@gnu.org>
parents:
5884
diff
changeset
|
497 Also, if the environment variable LOGNAME or USER is set,\n\ |
305 | 498 that determines the value of this function.") |
499 () | |
500 { | |
501 return Vuser_name; | |
502 } | |
503 | |
504 DEFUN ("user-real-login-name", Fuser_real_login_name, Suser_real_login_name, | |
505 0, 0, 0, | |
506 "Return the name of the user's real uid, as a string.\n\ | |
6878
175e4da3d3f4
(Fuser_real_login_name): Doc syntax fix.
Richard M. Stallman <rms@gnu.org>
parents:
6772
diff
changeset
|
507 This ignores the environment variables LOGNAME and USER, so it differs from\n\ |
5915
11c1e1696fe3
(Fuser_real_login_name): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
5907
diff
changeset
|
508 `user-login-name' when running under `su'.") |
305 | 509 () |
510 { | |
511 return Vuser_real_name; | |
512 } | |
513 | |
514 DEFUN ("user-uid", Fuser_uid, Suser_uid, 0, 0, 0, | |
515 "Return the effective uid of Emacs, as an integer.") | |
516 () | |
517 { | |
518 return make_number (geteuid ()); | |
519 } | |
520 | |
521 DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0, | |
522 "Return the real uid of Emacs, as an integer.") | |
523 () | |
524 { | |
525 return make_number (getuid ()); | |
526 } | |
527 | |
528 DEFUN ("user-full-name", Fuser_full_name, Suser_full_name, 0, 0, 0, | |
529 "Return the full name of the user logged in, as a string.") | |
530 () | |
531 { | |
532 return Vuser_full_name; | |
533 } | |
534 | |
535 DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0, | |
536 "Return the name of the machine you are running on, as a string.") | |
537 () | |
538 { | |
539 return Vsystem_name; | |
540 } | |
541 | |
5373
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
542 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0, |
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
543 "Return the process ID of Emacs, as an integer.") |
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
544 () |
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
545 { |
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
546 return make_number (getpid ()); |
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
547 } |
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
548 |
448 | 549 DEFUN ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0, |
577 | 550 "Return the current time, as the number of seconds since 12:00 AM January 1970.\n\ |
551 The time is returned as a list of three integers. The first has the\n\ | |
552 most significant 16 bits of the seconds, while the second has the\n\ | |
553 least significant 16 bits. The third integer gives the microsecond\n\ | |
554 count.\n\ | |
555 \n\ | |
556 The microsecond count is zero on systems that do not provide\n\ | |
557 resolution finer than a second.") | |
448 | 558 () |
559 { | |
577 | 560 EMACS_TIME t; |
561 Lisp_Object result[3]; | |
562 | |
563 EMACS_GET_TIME (t); | |
564 XSET (result[0], Lisp_Int, (EMACS_SECS (t) >> 16) & 0xffff); | |
565 XSET (result[1], Lisp_Int, (EMACS_SECS (t) >> 0) & 0xffff); | |
566 XSET (result[2], Lisp_Int, EMACS_USECS (t)); | |
567 | |
568 return Flist (3, result); | |
448 | 569 } |
570 | |
571 | |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
572 static int |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
573 lisp_time_argument (specified_time, result) |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
574 Lisp_Object specified_time; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
575 time_t *result; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
576 { |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
577 if (NILP (specified_time)) |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
578 return time (result) != -1; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
579 else |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
580 { |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
581 Lisp_Object high, low; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
582 high = Fcar (specified_time); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
583 CHECK_NUMBER (high, 0); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
584 low = Fcdr (specified_time); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
585 if (XTYPE (low) == Lisp_Cons) |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
586 low = Fcar (low); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
587 CHECK_NUMBER (low, 0); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
588 *result = (XINT (high) << 16) + (XINT (low) & 0xffff); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
589 return *result >> 16 == XINT (high); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
590 } |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
591 } |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
592 |
2154
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
593 DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0, |
305 | 594 "Return the current time, as a human-readable string.\n\ |
2154
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
595 Programs can use this function to decode a time,\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
596 since the number of columns in each field is fixed.\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
597 The format is `Sun Sep 16 01:03:52 1973'.\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
598 If an argument is given, it specifies a time to format\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
599 instead of the current time. The argument should have the form:\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
600 (HIGH . LOW)\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
601 or the form:\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
602 (HIGH LOW . IGNORED).\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
603 Thus, you can use times obtained from `current-time'\n\ |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
604 and from `file-attributes'.") |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
605 (specified_time) |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
606 Lisp_Object specified_time; |
305 | 607 { |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
608 time_t value; |
305 | 609 char buf[30]; |
2154
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
610 register char *tem; |
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
611 |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
612 if (! lisp_time_argument (specified_time, &value)) |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
613 value = -1; |
2154
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
614 tem = (char *) ctime (&value); |
305 | 615 |
616 strncpy (buf, tem, 24); | |
617 buf[24] = 0; | |
618 | |
619 return build_string (buf); | |
620 } | |
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
621 |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
622 #define TM_YEAR_ORIGIN 1900 |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
623 |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
624 /* Yield A - B, measured in seconds. */ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
625 static long |
5882 | 626 difftm (a, b) |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
627 struct tm *a, *b; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
628 { |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
629 int ay = a->tm_year + (TM_YEAR_ORIGIN - 1); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
630 int by = b->tm_year + (TM_YEAR_ORIGIN - 1); |
5882 | 631 /* Some compilers can't handle this as a single return statement. */ |
632 int days = ( | |
633 /* difference in day of year */ | |
634 a->tm_yday - b->tm_yday | |
635 /* + intervening leap days */ | |
636 + ((ay >> 2) - (by >> 2)) | |
637 - (ay/100 - by/100) | |
638 + ((ay/100 >> 2) - (by/100 >> 2)) | |
639 /* + difference in years * 365 */ | |
640 + (long)(ay-by) * 365 | |
641 ); | |
642 return (60*(60*(24*days + (a->tm_hour - b->tm_hour)) | |
643 + (a->tm_min - b->tm_min)) | |
644 + (a->tm_sec - b->tm_sec)); | |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
645 } |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
646 |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
647 DEFUN ("current-time-zone", Fcurrent_time_zone, Scurrent_time_zone, 0, 1, 0, |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
648 "Return the offset and name for the local time zone.\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
649 This returns a list of the form (OFFSET NAME).\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
650 OFFSET is an integer number of seconds ahead of UTC (east of Greenwich).\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
651 A negative value means west of Greenwich.\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
652 NAME is a string giving the name of the time zone.\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
653 If an argument is given, it specifies when the time zone offset is determined\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
654 instead of using the current time. The argument should have the form:\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
655 (HIGH . LOW)\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
656 or the form:\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
657 (HIGH LOW . IGNORED).\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
658 Thus, you can use times obtained from `current-time'\n\ |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
659 and from `file-attributes'.\n\ |
2462
4a7e1c2a2a9e
* editfns.c (Fcurrent_time_zone): Return a list whose elements are
Jim Blandy <jimb@redhat.com>
parents:
2384
diff
changeset
|
660 \n\ |
4a7e1c2a2a9e
* editfns.c (Fcurrent_time_zone): Return a list whose elements are
Jim Blandy <jimb@redhat.com>
parents:
2384
diff
changeset
|
661 Some operating systems cannot provide all this information to Emacs;\n\ |
2976
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
662 in this case, `current-time-zone' returns a list containing nil for\n\ |
2462
4a7e1c2a2a9e
* editfns.c (Fcurrent_time_zone): Return a list whose elements are
Jim Blandy <jimb@redhat.com>
parents:
2384
diff
changeset
|
663 the data it can't find.") |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
664 (specified_time) |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
665 Lisp_Object specified_time; |
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
666 { |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
667 time_t value; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
668 struct tm *t; |
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
669 |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
670 if (lisp_time_argument (specified_time, &value) |
2976
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
671 && (t = gmtime (&value)) != 0) |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
672 { |
2976
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
673 struct tm gmt; |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
674 long offset; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
675 char *s, buf[6]; |
2976
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
676 |
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
677 gmt = *t; /* Make a copy, in case localtime modifies *t. */ |
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
678 t = localtime (&value); |
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
679 offset = difftm (t, &gmt); |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
680 s = 0; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
681 #ifdef HAVE_TM_ZONE |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
682 if (t->tm_zone) |
7506
9fa47d36798a
(Fcurrent_time_zone): Add cast.
Richard M. Stallman <rms@gnu.org>
parents:
7485
diff
changeset
|
683 s = (char *)t->tm_zone; |
3522
dc9f7a107e28
(Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents:
2994
diff
changeset
|
684 #else /* not HAVE_TM_ZONE */ |
dc9f7a107e28
(Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents:
2994
diff
changeset
|
685 #ifdef HAVE_TZNAME |
dc9f7a107e28
(Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents:
2994
diff
changeset
|
686 if (t->tm_isdst == 0 || t->tm_isdst == 1) |
dc9f7a107e28
(Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents:
2994
diff
changeset
|
687 s = tzname[t->tm_isdst]; |
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
688 #endif |
3522
dc9f7a107e28
(Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents:
2994
diff
changeset
|
689 #endif /* not HAVE_TM_ZONE */ |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
690 if (!s) |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
691 { |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
692 /* No local time zone name is available; use "+-NNNN" instead. */ |
2994
b087b4fd6066
(Fcurrent_time_zone): Make `am' an int, not long.
Richard M. Stallman <rms@gnu.org>
parents:
2976
diff
changeset
|
693 int am = (offset < 0 ? -offset : offset) / 60; |
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
694 sprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60, am%60); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
695 s = buf; |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
696 } |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
697 return Fcons (make_number (offset), Fcons (build_string (s), Qnil)); |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
698 } |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
699 else |
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
700 return Fmake_list (2, Qnil); |
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
701 } |
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
702 |
305 | 703 |
704 void | |
705 insert1 (arg) | |
706 Lisp_Object arg; | |
707 { | |
708 Finsert (1, &arg); | |
709 } | |
710 | |
330 | 711 |
712 /* Callers passing one argument to Finsert need not gcpro the | |
713 argument "array", since the only element of the array will | |
714 not be used after calling insert or insert_from_string, so | |
715 we don't care if it gets trashed. */ | |
716 | |
305 | 717 DEFUN ("insert", Finsert, Sinsert, 0, MANY, 0, |
718 "Insert the arguments, either strings or characters, at point.\n\ | |
719 Point moves forward so that it ends up after the inserted text.\n\ | |
720 Any other markers at the point of insertion remain before the text.") | |
721 (nargs, args) | |
722 int nargs; | |
723 register Lisp_Object *args; | |
724 { | |
725 register int argnum; | |
726 register Lisp_Object tem; | |
727 char str[1]; | |
728 | |
729 for (argnum = 0; argnum < nargs; argnum++) | |
730 { | |
731 tem = args[argnum]; | |
732 retry: | |
733 if (XTYPE (tem) == Lisp_Int) | |
734 { | |
735 str[0] = XINT (tem); | |
736 insert (str, 1); | |
737 } | |
738 else if (XTYPE (tem) == Lisp_String) | |
739 { | |
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
740 insert_from_string (tem, 0, XSTRING (tem)->size, 0); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
741 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
742 else |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
743 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
744 tem = wrong_type_argument (Qchar_or_string_p, tem); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
745 goto retry; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
746 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
747 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
748 |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
749 return Qnil; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
750 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
751 |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
752 DEFUN ("insert-and-inherit", Finsert_and_inherit, Sinsert_and_inherit, |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
753 0, MANY, 0, |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
754 "Insert the arguments at point, inheriting properties from adjoining text.\n\ |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
755 Point moves forward so that it ends up after the inserted text.\n\ |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
756 Any other markers at the point of insertion remain before the text.") |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
757 (nargs, args) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
758 int nargs; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
759 register Lisp_Object *args; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
760 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
761 register int argnum; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
762 register Lisp_Object tem; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
763 char str[1]; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
764 |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
765 for (argnum = 0; argnum < nargs; argnum++) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
766 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
767 tem = args[argnum]; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
768 retry: |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
769 if (XTYPE (tem) == Lisp_Int) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
770 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
771 str[0] = XINT (tem); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
772 insert (str, 1); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
773 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
774 else if (XTYPE (tem) == Lisp_String) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
775 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
776 insert_from_string (tem, 0, XSTRING (tem)->size, 1); |
305 | 777 } |
778 else | |
779 { | |
780 tem = wrong_type_argument (Qchar_or_string_p, tem); | |
781 goto retry; | |
782 } | |
783 } | |
784 | |
785 return Qnil; | |
786 } | |
787 | |
788 DEFUN ("insert-before-markers", Finsert_before_markers, Sinsert_before_markers, 0, MANY, 0, | |
789 "Insert strings or characters at point, relocating markers after the text.\n\ | |
790 Point moves forward so that it ends up after the inserted text.\n\ | |
791 Any other markers at the point of insertion also end up after the text.") | |
792 (nargs, args) | |
793 int nargs; | |
794 register Lisp_Object *args; | |
795 { | |
796 register int argnum; | |
797 register Lisp_Object tem; | |
798 char str[1]; | |
799 | |
800 for (argnum = 0; argnum < nargs; argnum++) | |
801 { | |
802 tem = args[argnum]; | |
803 retry: | |
804 if (XTYPE (tem) == Lisp_Int) | |
805 { | |
806 str[0] = XINT (tem); | |
807 insert_before_markers (str, 1); | |
808 } | |
809 else if (XTYPE (tem) == Lisp_String) | |
810 { | |
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
811 insert_from_string_before_markers (tem, 0, XSTRING (tem)->size, 0); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
812 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
813 else |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
814 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
815 tem = wrong_type_argument (Qchar_or_string_p, tem); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
816 goto retry; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
817 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
818 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
819 |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
820 return Qnil; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
821 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
822 |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
823 DEFUN ("insert-before-markers-and-inherit", |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
824 Finsert_and_inherit_before_markers, Sinsert_and_inherit_before_markers, |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
825 0, MANY, 0, |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
826 "Insert text at point, relocating markers and inheriting properties.\n\ |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
827 Point moves forward so that it ends up after the inserted text.\n\ |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
828 Any other markers at the point of insertion also end up after the text.") |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
829 (nargs, args) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
830 int nargs; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
831 register Lisp_Object *args; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
832 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
833 register int argnum; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
834 register Lisp_Object tem; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
835 char str[1]; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
836 |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
837 for (argnum = 0; argnum < nargs; argnum++) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
838 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
839 tem = args[argnum]; |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
840 retry: |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
841 if (XTYPE (tem) == Lisp_Int) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
842 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
843 str[0] = XINT (tem); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
844 insert_before_markers (str, 1); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
845 } |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
846 else if (XTYPE (tem) == Lisp_String) |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
847 { |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
848 insert_from_string_before_markers (tem, 0, XSTRING (tem)->size, 1); |
305 | 849 } |
850 else | |
851 { | |
852 tem = wrong_type_argument (Qchar_or_string_p, tem); | |
853 goto retry; | |
854 } | |
855 } | |
856 | |
857 return Qnil; | |
858 } | |
859 | |
860 DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 2, 0, | |
861 "Insert COUNT (second arg) copies of CHAR (first arg).\n\ | |
862 Point and all markers are affected as in the function `insert'.\n\ | |
863 Both arguments are required.") | |
864 (chr, count) | |
865 Lisp_Object chr, count; | |
866 { | |
867 register unsigned char *string; | |
868 register int strlen; | |
869 register int i, n; | |
870 | |
871 CHECK_NUMBER (chr, 0); | |
872 CHECK_NUMBER (count, 1); | |
873 | |
874 n = XINT (count); | |
875 if (n <= 0) | |
876 return Qnil; | |
877 strlen = min (n, 256); | |
878 string = (unsigned char *) alloca (strlen); | |
879 for (i = 0; i < strlen; i++) | |
880 string[i] = XFASTINT (chr); | |
881 while (n >= strlen) | |
882 { | |
883 insert (string, strlen); | |
884 n -= strlen; | |
885 } | |
886 if (n > 0) | |
887 insert (string, n); | |
888 return Qnil; | |
889 } | |
890 | |
891 | |
648 | 892 /* Making strings from buffer contents. */ |
893 | |
894 /* Return a Lisp_String containing the text of the current buffer from | |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
895 START to END. If text properties are in use and the current buffer |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3522
diff
changeset
|
896 has properties in the range specified, the resulting string will also |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
897 have them. |
648 | 898 |
899 We don't want to use plain old make_string here, because it calls | |
900 make_uninit_string, which can cause the buffer arena to be | |
901 compacted. make_string has no way of knowing that the data has | |
902 been moved, and thus copies the wrong data into the string. This | |
903 doesn't effect most of the other users of make_string, so it should | |
904 be left as is. But we should use this function when conjuring | |
905 buffer substrings. */ | |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
906 |
648 | 907 Lisp_Object |
908 make_buffer_string (start, end) | |
909 int start, end; | |
910 { | |
6772
6e53158ad17d
(make_buffer_string): Copy properties whenever we have some
Richard M. Stallman <rms@gnu.org>
parents:
6714
diff
changeset
|
911 Lisp_Object result, tem, tem1; |
648 | 912 |
913 if (start < GPT && GPT < end) | |
914 move_gap (start); | |
915 | |
916 result = make_uninit_string (end - start); | |
917 bcopy (&FETCH_CHAR (start), XSTRING (result)->data, end - start); | |
918 | |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
919 tem = Fnext_property_change (make_number (start), Qnil, make_number (end)); |
6772
6e53158ad17d
(make_buffer_string): Copy properties whenever we have some
Richard M. Stallman <rms@gnu.org>
parents:
6714
diff
changeset
|
920 tem1 = Ftext_properties_at (make_number (start), Qnil); |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
921 |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
922 #ifdef USE_TEXT_PROPERTIES |
6772
6e53158ad17d
(make_buffer_string): Copy properties whenever we have some
Richard M. Stallman <rms@gnu.org>
parents:
6714
diff
changeset
|
923 if (XINT (tem) != end || !NILP (tem1)) |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
924 copy_intervals_to_string (result, current_buffer, start, end - start); |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
925 #endif |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
926 |
648 | 927 return result; |
928 } | |
305 | 929 |
930 DEFUN ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0, | |
931 "Return the contents of part of the current buffer as a string.\n\ | |
932 The two arguments START and END are character positions;\n\ | |
933 they can be in either order.") | |
934 (b, e) | |
935 Lisp_Object b, e; | |
936 { | |
937 register int beg, end; | |
938 | |
939 validate_region (&b, &e); | |
940 beg = XINT (b); | |
941 end = XINT (e); | |
942 | |
648 | 943 return make_buffer_string (beg, end); |
305 | 944 } |
945 | |
946 DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0, | |
947 "Return the contents of the current buffer as a string.") | |
948 () | |
949 { | |
648 | 950 return make_buffer_string (BEGV, ZV); |
305 | 951 } |
952 | |
953 DEFUN ("insert-buffer-substring", Finsert_buffer_substring, Sinsert_buffer_substring, | |
954 1, 3, 0, | |
3776
301e2dca5fd7
(Finsert_buffer_substring): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
3591
diff
changeset
|
955 "Insert before point a substring of the contents of buffer BUFFER.\n\ |
305 | 956 BUFFER may be a buffer or a buffer name.\n\ |
957 Arguments START and END are character numbers specifying the substring.\n\ | |
958 They default to the beginning and the end of BUFFER.") | |
959 (buf, b, e) | |
960 Lisp_Object buf, b, e; | |
961 { | |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
962 register int beg, end, temp, len, opoint, start; |
305 | 963 register struct buffer *bp; |
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
964 Lisp_Object buffer; |
305 | 965 |
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
966 buffer = Fget_buffer (buf); |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
967 if (NILP (buffer)) |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
968 nsberror (buf); |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
969 bp = XBUFFER (buffer); |
305 | 970 |
488 | 971 if (NILP (b)) |
305 | 972 beg = BUF_BEGV (bp); |
973 else | |
974 { | |
975 CHECK_NUMBER_COERCE_MARKER (b, 0); | |
976 beg = XINT (b); | |
977 } | |
488 | 978 if (NILP (e)) |
305 | 979 end = BUF_ZV (bp); |
980 else | |
981 { | |
982 CHECK_NUMBER_COERCE_MARKER (e, 1); | |
983 end = XINT (e); | |
984 } | |
985 | |
986 if (beg > end) | |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
987 temp = beg, beg = end, end = temp; |
305 | 988 |
989 /* Move the gap or create enough gap in the current buffer. */ | |
990 | |
991 if (point != GPT) | |
992 move_gap (point); | |
993 if (GAP_SIZE < end - beg) | |
994 make_gap (end - beg - GAP_SIZE); | |
995 | |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
996 len = end - beg; |
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
997 start = beg; |
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
998 opoint = point; |
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
999 |
305 | 1000 if (!(BUF_BEGV (bp) <= beg |
1001 && beg <= end | |
1002 && end <= BUF_ZV (bp))) | |
1003 args_out_of_range (b, e); | |
1004 | |
1005 /* Now the actual insertion will not do any gap motion, | |
1006 so it matters not if BUF is the current buffer. */ | |
1007 if (beg < BUF_GPT (bp)) | |
1008 { | |
1009 insert (BUF_CHAR_ADDRESS (bp, beg), min (end, BUF_GPT (bp)) - beg); | |
1010 beg = min (end, BUF_GPT (bp)); | |
1011 } | |
1012 if (beg < end) | |
1013 insert (BUF_CHAR_ADDRESS (bp, beg), end - beg); | |
1014 | |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
1015 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ |
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
1016 graft_intervals_into_buffer (copy_intervals (bp->intervals, start, len), |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1017 opoint, len, current_buffer, 0); |
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
1018 |
305 | 1019 return Qnil; |
1020 } | |
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1021 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1022 DEFUN ("compare-buffer-substrings", Fcompare_buffer_substrings, Scompare_buffer_substrings, |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1023 6, 6, 0, |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1024 "Compare two substrings of two buffers; return result as number.\n\ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1025 the value is -N if first string is less after N-1 chars,\n\ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1026 +N if first string is greater after N-1 chars, or 0 if strings match.\n\ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1027 Each substring is represented as three arguments: BUFFER, START and END.\n\ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1028 That makes six args in all, three for each substring.\n\n\ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1029 The value of `case-fold-search' in the current buffer\n\ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1030 determines whether case is significant or ignored.") |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1031 (buffer1, start1, end1, buffer2, start2, end2) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1032 Lisp_Object buffer1, start1, end1, buffer2, start2, end2; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1033 { |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1034 register int begp1, endp1, begp2, endp2, temp, len1, len2, length, i; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1035 register struct buffer *bp1, *bp2; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1036 register unsigned char *trt |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1037 = (!NILP (current_buffer->case_fold_search) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1038 ? XSTRING (current_buffer->case_canon_table)->data : 0); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1039 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1040 /* Find the first buffer and its substring. */ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1041 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1042 if (NILP (buffer1)) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1043 bp1 = current_buffer; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1044 else |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1045 { |
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1046 Lisp_Object buf1; |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1047 buf1 = Fget_buffer (buffer1); |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1048 if (NILP (buf1)) |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1049 nsberror (buffer1); |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1050 bp1 = XBUFFER (buf1); |
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1051 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1052 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1053 if (NILP (start1)) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1054 begp1 = BUF_BEGV (bp1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1055 else |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1056 { |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1057 CHECK_NUMBER_COERCE_MARKER (start1, 1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1058 begp1 = XINT (start1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1059 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1060 if (NILP (end1)) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1061 endp1 = BUF_ZV (bp1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1062 else |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1063 { |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1064 CHECK_NUMBER_COERCE_MARKER (end1, 2); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1065 endp1 = XINT (end1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1066 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1067 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1068 if (begp1 > endp1) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1069 temp = begp1, begp1 = endp1, endp1 = temp; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1070 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1071 if (!(BUF_BEGV (bp1) <= begp1 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1072 && begp1 <= endp1 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1073 && endp1 <= BUF_ZV (bp1))) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1074 args_out_of_range (start1, end1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1075 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1076 /* Likewise for second substring. */ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1077 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1078 if (NILP (buffer2)) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1079 bp2 = current_buffer; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1080 else |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1081 { |
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1082 Lisp_Object buf2; |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1083 buf2 = Fget_buffer (buffer2); |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1084 if (NILP (buf2)) |
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1085 nsberror (buffer2); |
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1086 bp2 = XBUFFER (buffer2); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1087 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1088 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1089 if (NILP (start2)) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1090 begp2 = BUF_BEGV (bp2); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1091 else |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1092 { |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1093 CHECK_NUMBER_COERCE_MARKER (start2, 4); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1094 begp2 = XINT (start2); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1095 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1096 if (NILP (end2)) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1097 endp2 = BUF_ZV (bp2); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1098 else |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1099 { |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1100 CHECK_NUMBER_COERCE_MARKER (end2, 5); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1101 endp2 = XINT (end2); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1102 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1103 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1104 if (begp2 > endp2) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1105 temp = begp2, begp2 = endp2, endp2 = temp; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1106 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1107 if (!(BUF_BEGV (bp2) <= begp2 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1108 && begp2 <= endp2 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1109 && endp2 <= BUF_ZV (bp2))) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1110 args_out_of_range (start2, end2); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1111 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1112 len1 = endp1 - begp1; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1113 len2 = endp2 - begp2; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1114 length = len1; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1115 if (len2 < length) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1116 length = len2; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1117 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1118 for (i = 0; i < length; i++) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1119 { |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1120 int c1 = *BUF_CHAR_ADDRESS (bp1, begp1 + i); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1121 int c2 = *BUF_CHAR_ADDRESS (bp2, begp2 + i); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1122 if (trt) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1123 { |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1124 c1 = trt[c1]; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1125 c2 = trt[c2]; |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1126 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1127 if (c1 < c2) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1128 return make_number (- 1 - i); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1129 if (c1 > c2) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1130 return make_number (i + 1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1131 } |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1132 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1133 /* The strings match as far as they go. |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1134 If one is shorter, that one is less. */ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1135 if (length < len1) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1136 return make_number (length + 1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1137 else if (length < len2) |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1138 return make_number (- length - 1); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1139 |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1140 /* Same length too => they are equal. */ |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1141 return make_number (0); |
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1142 } |
305 | 1143 |
1144 DEFUN ("subst-char-in-region", Fsubst_char_in_region, | |
1145 Ssubst_char_in_region, 4, 5, 0, | |
1146 "From START to END, replace FROMCHAR with TOCHAR each time it occurs.\n\ | |
1147 If optional arg NOUNDO is non-nil, don't record this change for undo\n\ | |
1148 and don't mark the buffer as really changed.") | |
1149 (start, end, fromchar, tochar, noundo) | |
1150 Lisp_Object start, end, fromchar, tochar, noundo; | |
1151 { | |
1152 register int pos, stop, look; | |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1153 int changed = 0; |
305 | 1154 |
1155 validate_region (&start, &end); | |
1156 CHECK_NUMBER (fromchar, 2); | |
1157 CHECK_NUMBER (tochar, 3); | |
1158 | |
1159 pos = XINT (start); | |
1160 stop = XINT (end); | |
1161 look = XINT (fromchar); | |
1162 | |
1163 while (pos < stop) | |
1164 { | |
1165 if (FETCH_CHAR (pos) == look) | |
1166 { | |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1167 if (! changed) |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1168 { |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1169 modify_region (current_buffer, XINT (start), stop); |
5242
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1170 |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1171 if (! NILP (noundo)) |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1172 { |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1173 if (MODIFF - 1 == current_buffer->save_modified) |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1174 current_buffer->save_modified++; |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1175 if (MODIFF - 1 == current_buffer->auto_save_modified) |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1176 current_buffer->auto_save_modified++; |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1177 } |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1178 |
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1179 changed = 1; |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1180 } |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1181 |
488 | 1182 if (NILP (noundo)) |
305 | 1183 record_change (pos, 1); |
1184 FETCH_CHAR (pos) = XINT (tochar); | |
1185 } | |
1186 pos++; | |
1187 } | |
1188 | |
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1189 if (changed) |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1190 signal_after_change (XINT (start), |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1191 stop - XINT (start), stop - XINT (start)); |
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1192 |
305 | 1193 return Qnil; |
1194 } | |
1195 | |
1196 DEFUN ("translate-region", Ftranslate_region, Stranslate_region, 3, 3, 0, | |
1197 "From START to END, translate characters according to TABLE.\n\ | |
1198 TABLE is a string; the Nth character in it is the mapping\n\ | |
1199 for the character with code N. Returns the number of characters changed.") | |
1200 (start, end, table) | |
1201 Lisp_Object start; | |
1202 Lisp_Object end; | |
1203 register Lisp_Object table; | |
1204 { | |
1205 register int pos, stop; /* Limits of the region. */ | |
1206 register unsigned char *tt; /* Trans table. */ | |
1207 register int oc; /* Old character. */ | |
1208 register int nc; /* New character. */ | |
1209 int cnt; /* Number of changes made. */ | |
1210 Lisp_Object z; /* Return. */ | |
1211 int size; /* Size of translate table. */ | |
1212 | |
1213 validate_region (&start, &end); | |
1214 CHECK_STRING (table, 2); | |
1215 | |
1216 size = XSTRING (table)->size; | |
1217 tt = XSTRING (table)->data; | |
1218 | |
1219 pos = XINT (start); | |
1220 stop = XINT (end); | |
2783
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2462
diff
changeset
|
1221 modify_region (current_buffer, pos, stop); |
305 | 1222 |
1223 cnt = 0; | |
1224 for (; pos < stop; ++pos) | |
1225 { | |
1226 oc = FETCH_CHAR (pos); | |
1227 if (oc < size) | |
1228 { | |
1229 nc = tt[oc]; | |
1230 if (nc != oc) | |
1231 { | |
1232 record_change (pos, 1); | |
1233 FETCH_CHAR (pos) = nc; | |
1234 signal_after_change (pos, 1, 1); | |
1235 ++cnt; | |
1236 } | |
1237 } | |
1238 } | |
1239 | |
1240 XFASTINT (z) = cnt; | |
1241 return (z); | |
1242 } | |
1243 | |
1244 DEFUN ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r", | |
1245 "Delete the text between point and mark.\n\ | |
1246 When called from a program, expects two arguments,\n\ | |
1247 positions (integers or markers) specifying the stretch to be deleted.") | |
1248 (b, e) | |
1249 Lisp_Object b, e; | |
1250 { | |
1251 validate_region (&b, &e); | |
1252 del_range (XINT (b), XINT (e)); | |
1253 return Qnil; | |
1254 } | |
1255 | |
1256 DEFUN ("widen", Fwiden, Swiden, 0, 0, "", | |
1257 "Remove restrictions (narrowing) from current buffer.\n\ | |
1258 This allows the buffer's full text to be seen and edited.") | |
1259 () | |
1260 { | |
1261 BEGV = BEG; | |
1262 SET_BUF_ZV (current_buffer, Z); | |
1263 clip_changed = 1; | |
330 | 1264 /* Changing the buffer bounds invalidates any recorded current column. */ |
1265 invalidate_current_column (); | |
305 | 1266 return Qnil; |
1267 } | |
1268 | |
1269 DEFUN ("narrow-to-region", Fnarrow_to_region, Snarrow_to_region, 2, 2, "r", | |
1270 "Restrict editing in this buffer to the current region.\n\ | |
1271 The rest of the text becomes temporarily invisible and untouchable\n\ | |
1272 but is not deleted; if you save the buffer in a file, the invisible\n\ | |
1273 text is included in the file. \\[widen] makes all visible again.\n\ | |
1274 See also `save-restriction'.\n\ | |
1275 \n\ | |
1276 When calling from a program, pass two arguments; positions (integers\n\ | |
1277 or markers) bounding the text that should remain visible.") | |
1278 (b, e) | |
1279 register Lisp_Object b, e; | |
1280 { | |
1281 register int i; | |
1282 | |
1283 CHECK_NUMBER_COERCE_MARKER (b, 0); | |
1284 CHECK_NUMBER_COERCE_MARKER (e, 1); | |
1285 | |
1286 if (XINT (b) > XINT (e)) | |
1287 { | |
1288 i = XFASTINT (b); | |
1289 b = e; | |
1290 XFASTINT (e) = i; | |
1291 } | |
1292 | |
1293 if (!(BEG <= XINT (b) && XINT (b) <= XINT (e) && XINT (e) <= Z)) | |
1294 args_out_of_range (b, e); | |
1295 | |
1296 BEGV = XFASTINT (b); | |
1297 SET_BUF_ZV (current_buffer, XFASTINT (e)); | |
1298 if (point < XFASTINT (b)) | |
1299 SET_PT (XFASTINT (b)); | |
1300 if (point > XFASTINT (e)) | |
1301 SET_PT (XFASTINT (e)); | |
1302 clip_changed = 1; | |
330 | 1303 /* Changing the buffer bounds invalidates any recorded current column. */ |
1304 invalidate_current_column (); | |
305 | 1305 return Qnil; |
1306 } | |
1307 | |
1308 Lisp_Object | |
1309 save_restriction_save () | |
1310 { | |
1311 register Lisp_Object bottom, top; | |
1312 /* Note: I tried using markers here, but it does not win | |
1313 because insertion at the end of the saved region | |
1314 does not advance mh and is considered "outside" the saved region. */ | |
1315 XFASTINT (bottom) = BEGV - BEG; | |
1316 XFASTINT (top) = Z - ZV; | |
1317 | |
1318 return Fcons (Fcurrent_buffer (), Fcons (bottom, top)); | |
1319 } | |
1320 | |
1321 Lisp_Object | |
1322 save_restriction_restore (data) | |
1323 Lisp_Object data; | |
1324 { | |
1325 register struct buffer *buf; | |
1326 register int newhead, newtail; | |
1327 register Lisp_Object tem; | |
1328 | |
1329 buf = XBUFFER (XCONS (data)->car); | |
1330 | |
1331 data = XCONS (data)->cdr; | |
1332 | |
1333 tem = XCONS (data)->car; | |
1334 newhead = XINT (tem); | |
1335 tem = XCONS (data)->cdr; | |
1336 newtail = XINT (tem); | |
1337 if (newhead + newtail > BUF_Z (buf) - BUF_BEG (buf)) | |
1338 { | |
1339 newhead = 0; | |
1340 newtail = 0; | |
1341 } | |
1342 BUF_BEGV (buf) = BUF_BEG (buf) + newhead; | |
1343 SET_BUF_ZV (buf, BUF_Z (buf) - newtail); | |
1344 clip_changed = 1; | |
1345 | |
1346 /* If point is outside the new visible range, move it inside. */ | |
1347 SET_BUF_PT (buf, | |
1348 clip_to_bounds (BUF_BEGV (buf), BUF_PT (buf), BUF_ZV (buf))); | |
1349 | |
1350 return Qnil; | |
1351 } | |
1352 | |
1353 DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0, | |
1354 "Execute BODY, saving and restoring current buffer's restrictions.\n\ | |
1355 The buffer's restrictions make parts of the beginning and end invisible.\n\ | |
1356 \(They are set up with `narrow-to-region' and eliminated with `widen'.)\n\ | |
1357 This special form, `save-restriction', saves the current buffer's restrictions\n\ | |
1358 when it is entered, and restores them when it is exited.\n\ | |
1359 So any `narrow-to-region' within BODY lasts only until the end of the form.\n\ | |
1360 The old restrictions settings are restored\n\ | |
1361 even in case of abnormal exit (throw or error).\n\ | |
1362 \n\ | |
1363 The value returned is the value of the last form in BODY.\n\ | |
1364 \n\ | |
1365 `save-restriction' can get confused if, within the BODY, you widen\n\ | |
1366 and then make changes outside the area within the saved restrictions.\n\ | |
1367 \n\ | |
1368 Note: if you are using both `save-excursion' and `save-restriction',\n\ | |
1369 use `save-excursion' outermost:\n\ | |
1370 (save-excursion (save-restriction ...))") | |
1371 (body) | |
1372 Lisp_Object body; | |
1373 { | |
1374 register Lisp_Object val; | |
1375 int count = specpdl_ptr - specpdl; | |
1376 | |
1377 record_unwind_protect (save_restriction_restore, save_restriction_save ()); | |
1378 val = Fprogn (body); | |
1379 return unbind_to (count, val); | |
1380 } | |
1381 | |
5884
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1382 /* Buffer for the most recent text displayed by Fmessage. */ |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1383 static char *message_text; |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1384 |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1385 /* Allocated length of that buffer. */ |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1386 static int message_length; |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1387 |
305 | 1388 DEFUN ("message", Fmessage, Smessage, 1, MANY, 0, |
1389 "Print a one-line message at the bottom of the screen.\n\ | |
1390 The first argument is a control string.\n\ | |
1391 It may contain %s or %d or %c to print successive following arguments.\n\ | |
1392 %s means print an argument as a string, %d means print as number in decimal,\n\ | |
1393 %c means print a number as a single character.\n\ | |
1394 The argument used by %s must be a string or a symbol;\n\ | |
1426
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1395 the argument used by %d or %c must be a number.\n\ |
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1396 If the first argument is nil, clear any existing message; let the\n\ |
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1397 minibuffer contents show.") |
305 | 1398 (nargs, args) |
1399 int nargs; | |
1400 Lisp_Object *args; | |
1401 { | |
1426
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1402 if (NILP (args[0])) |
1916
e21c1f3e37cb
* editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents:
1854
diff
changeset
|
1403 { |
e21c1f3e37cb
* editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents:
1854
diff
changeset
|
1404 message (0); |
e21c1f3e37cb
* editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents:
1854
diff
changeset
|
1405 return Qnil; |
e21c1f3e37cb
* editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents:
1854
diff
changeset
|
1406 } |
1426
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1407 else |
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1408 { |
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1409 register Lisp_Object val; |
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1410 val = Fformat (nargs, args); |
5884
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1411 /* Copy the data so that it won't move when we GC. */ |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1412 if (! message_text) |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1413 { |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1414 message_text = (char *)xmalloc (80); |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1415 message_length = 80; |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1416 } |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1417 if (XSTRING (val)->size > message_length) |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1418 { |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1419 message_length = XSTRING (val)->size; |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1420 message_text = (char *)xrealloc (message_text, message_length); |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1421 } |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1422 bcopy (XSTRING (val)->data, message_text, XSTRING (val)->size); |
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1423 message2 (message_text, XSTRING (val)->size); |
1426
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1424 return val; |
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1425 } |
305 | 1426 } |
1427 | |
1428 DEFUN ("format", Fformat, Sformat, 1, MANY, 0, | |
1429 "Format a string out of a control-string and arguments.\n\ | |
1430 The first argument is a control string.\n\ | |
1431 The other arguments are substituted into it to make the result, a string.\n\ | |
1432 It may contain %-sequences meaning to substitute the next argument.\n\ | |
1433 %s means print a string argument. Actually, prints any object, with `princ'.\n\ | |
1434 %d means print as number in decimal (%o octal, %x hex).\n\ | |
1435 %c means print a number as a single character.\n\ | |
1436 %S means print any object as an s-expression (using prin1).\n\ | |
330 | 1437 The argument used for %d, %o, %x or %c must be a number.\n\ |
1438 Use %% to put a single % into the output.") | |
305 | 1439 (nargs, args) |
1440 int nargs; | |
1441 register Lisp_Object *args; | |
1442 { | |
1443 register int n; /* The number of the next arg to substitute */ | |
1444 register int total = 5; /* An estimate of the final length */ | |
1445 char *buf; | |
1446 register unsigned char *format, *end; | |
1447 int length; | |
1448 extern char *index (); | |
1449 /* It should not be necessary to GCPRO ARGS, because | |
1450 the caller in the interpreter should take care of that. */ | |
1451 | |
1452 CHECK_STRING (args[0], 0); | |
1453 format = XSTRING (args[0])->data; | |
1454 end = format + XSTRING (args[0])->size; | |
1455 | |
1456 n = 0; | |
1457 while (format != end) | |
1458 if (*format++ == '%') | |
1459 { | |
1460 int minlen; | |
1461 | |
1462 /* Process a numeric arg and skip it. */ | |
1463 minlen = atoi (format); | |
1464 if (minlen > 0) | |
1465 total += minlen; | |
1466 else | |
1467 total -= minlen; | |
1468 while ((*format >= '0' && *format <= '9') | |
1469 || *format == '-' || *format == ' ' || *format == '.') | |
1470 format++; | |
1471 | |
1472 if (*format == '%') | |
1473 format++; | |
1474 else if (++n >= nargs) | |
6714
ce9404705b14
(Fformat): Reword confusing error message.
Karl Heuer <kwzh@gnu.org>
parents:
6528
diff
changeset
|
1475 error ("not enough arguments for format string"); |
305 | 1476 else if (*format == 'S') |
1477 { | |
1478 /* For `S', prin1 the argument and then treat like a string. */ | |
1479 register Lisp_Object tem; | |
1480 tem = Fprin1_to_string (args[n], Qnil); | |
1481 args[n] = tem; | |
1482 goto string; | |
1483 } | |
1484 else if (XTYPE (args[n]) == Lisp_Symbol) | |
1485 { | |
1486 XSET (args[n], Lisp_String, XSYMBOL (args[n])->name); | |
1487 goto string; | |
1488 } | |
1489 else if (XTYPE (args[n]) == Lisp_String) | |
1490 { | |
1491 string: | |
6528
d0f6a386b7cb
(Fformat): Validate number and type of arguments.
Karl Heuer <kwzh@gnu.org>
parents:
6206
diff
changeset
|
1492 if (*format != 's' && *format != 'S') |
d0f6a386b7cb
(Fformat): Validate number and type of arguments.
Karl Heuer <kwzh@gnu.org>
parents:
6206
diff
changeset
|
1493 error ("format specifier doesn't match argument type"); |
305 | 1494 total += XSTRING (args[n])->size; |
1495 } | |
1496 /* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */ | |
1497 else if (XTYPE (args[n]) == Lisp_Int && *format != 's') | |
1498 { | |
621 | 1499 #ifdef LISP_FLOAT_TYPE |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3522
diff
changeset
|
1500 /* The following loop assumes the Lisp type indicates |
305 | 1501 the proper way to pass the argument. |
1502 So make sure we have a flonum if the argument should | |
1503 be a double. */ | |
1504 if (*format == 'e' || *format == 'f' || *format == 'g') | |
1505 args[n] = Ffloat (args[n]); | |
621 | 1506 #endif |
305 | 1507 total += 10; |
1508 } | |
621 | 1509 #ifdef LISP_FLOAT_TYPE |
305 | 1510 else if (XTYPE (args[n]) == Lisp_Float && *format != 's') |
1511 { | |
1512 if (! (*format == 'e' || *format == 'f' || *format == 'g')) | |
1513 args[n] = Ftruncate (args[n]); | |
1514 total += 20; | |
1515 } | |
621 | 1516 #endif |
305 | 1517 else |
1518 { | |
1519 /* Anything but a string, convert to a string using princ. */ | |
1520 register Lisp_Object tem; | |
1521 tem = Fprin1_to_string (args[n], Qt); | |
1522 args[n] = tem; | |
1523 goto string; | |
1524 } | |
1525 } | |
1526 | |
1527 { | |
1528 register int nstrings = n + 1; | |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1529 |
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1530 /* Allocate twice as many strings as we have %-escapes; floats occupy |
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1531 two slots, and we're not sure how many of those we have. */ |
305 | 1532 register unsigned char **strings |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1533 = (unsigned char **) alloca (2 * nstrings * sizeof (unsigned char *)); |
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1534 int i; |
305 | 1535 |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1536 i = 0; |
305 | 1537 for (n = 0; n < nstrings; n++) |
1538 { | |
1539 if (n >= nargs) | |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1540 strings[i++] = (unsigned char *) ""; |
305 | 1541 else if (XTYPE (args[n]) == Lisp_Int) |
1542 /* We checked above that the corresponding format effector | |
1543 isn't %s, which would cause MPV. */ | |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1544 strings[i++] = (unsigned char *) XINT (args[n]); |
621 | 1545 #ifdef LISP_FLOAT_TYPE |
305 | 1546 else if (XTYPE (args[n]) == Lisp_Float) |
1547 { | |
1548 union { double d; int half[2]; } u; | |
1549 | |
1550 u.d = XFLOAT (args[n])->data; | |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1551 strings[i++] = (unsigned char *) u.half[0]; |
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1552 strings[i++] = (unsigned char *) u.half[1]; |
305 | 1553 } |
621 | 1554 #endif |
305 | 1555 else |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1556 strings[i++] = XSTRING (args[n])->data; |
305 | 1557 } |
1558 | |
1559 /* Format it in bigger and bigger buf's until it all fits. */ | |
1560 while (1) | |
1561 { | |
1562 buf = (char *) alloca (total + 1); | |
1563 buf[total - 1] = 0; | |
1564 | |
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1565 length = doprnt (buf, total + 1, strings[0], end, i-1, strings + 1); |
305 | 1566 if (buf[total - 1] == 0) |
1567 break; | |
1568 | |
1569 total *= 2; | |
1570 } | |
1571 } | |
1572 | |
1573 /* UNGCPRO; */ | |
1574 return make_string (buf, length); | |
1575 } | |
1576 | |
1577 /* VARARGS 1 */ | |
1578 Lisp_Object | |
1579 #ifdef NO_ARG_ARRAY | |
1580 format1 (string1, arg0, arg1, arg2, arg3, arg4) | |
1581 int arg0, arg1, arg2, arg3, arg4; | |
1582 #else | |
1583 format1 (string1) | |
1584 #endif | |
1585 char *string1; | |
1586 { | |
1587 char buf[100]; | |
1588 #ifdef NO_ARG_ARRAY | |
1589 int args[5]; | |
1590 args[0] = arg0; | |
1591 args[1] = arg1; | |
1592 args[2] = arg2; | |
1593 args[3] = arg3; | |
1594 args[4] = arg4; | |
1595 doprnt (buf, sizeof buf, string1, 0, 5, args); | |
1596 #else | |
1597 doprnt (buf, sizeof buf, string1, 0, 5, &string1 + 1); | |
1598 #endif | |
1599 return build_string (buf); | |
1600 } | |
1601 | |
1602 DEFUN ("char-equal", Fchar_equal, Schar_equal, 2, 2, 0, | |
1603 "Return t if two characters match, optionally ignoring case.\n\ | |
1604 Both arguments must be characters (i.e. integers).\n\ | |
1605 Case is ignored if `case-fold-search' is non-nil in the current buffer.") | |
1606 (c1, c2) | |
1607 register Lisp_Object c1, c2; | |
1608 { | |
1609 unsigned char *downcase = DOWNCASE_TABLE; | |
1610 CHECK_NUMBER (c1, 0); | |
1611 CHECK_NUMBER (c2, 1); | |
1612 | |
488 | 1613 if (!NILP (current_buffer->case_fold_search) |
2384
5ab51b7300e4
(Fchar_equal): Don't ignore high bits of character.
Richard M. Stallman <rms@gnu.org>
parents:
2154
diff
changeset
|
1614 ? (downcase[0xff & XFASTINT (c1)] == downcase[0xff & XFASTINT (c2)] |
5ab51b7300e4
(Fchar_equal): Don't ignore high bits of character.
Richard M. Stallman <rms@gnu.org>
parents:
2154
diff
changeset
|
1615 && (XFASTINT (c1) & ~0xff) == (XFASTINT (c2) & ~0xff)) |
305 | 1616 : XINT (c1) == XINT (c2)) |
1617 return Qt; | |
1618 return Qnil; | |
1619 } | |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1620 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1621 /* Transpose the markers in two regions of the current buffer, and |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1622 adjust the ones between them if necessary (i.e.: if the regions |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1623 differ in size). |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1624 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1625 Traverses the entire marker list of the buffer to do so, adding an |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1626 appropriate amount to some, subtracting from some, and leaving the |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1627 rest untouched. Most of this is copied from adjust_markers in insdel.c. |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1628 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1629 It's caller's job to see that (start1 <= end1 <= start2 <= end2), |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1630 and that the buffer gap will not conflict with the markers. This |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1631 last requirement is odd and maybe should be taken out, but it works |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1632 for now because Ftranspose_regions does in fact guarantee that, in |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1633 addition to providing universal health-care coverage. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1634 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1635 void |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1636 transpose_markers (start1, end1, start2, end2) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1637 register int start1, end1, start2, end2; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1638 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1639 register int amt1, amt2, diff, mpos; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1640 register Lisp_Object marker; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1641 register struct Lisp_Marker *m; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1642 |
7519
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1643 /* Update point as if it were a marker. |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1644 Do this before adjusting the start/end values for the gap. */ |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1645 if (PT < start1) |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1646 ; |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1647 else if (PT < end1) |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1648 TEMP_SET_PT (PT + (end2 - end1)); |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1649 else if (PT < start2) |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1650 TEMP_SET_PT (PT + (end2 - start2) - (end1 - start1)); |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1651 else if (PT < end2) |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1652 TEMP_SET_PT (PT - (start2 - start1)); |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1653 |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1654 /* Internally, marker positions take the gap into account, so if the |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1655 * gap is before one or both of the regions, the region's limits |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1656 * must be adjusted to compensate. The caller guaranteed that the |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1657 * gap is not inside any of the regions, however, so this is fairly |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1658 * simple. |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1659 */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1660 if (GPT < start1) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1661 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1662 register int gs = GAP_SIZE; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1663 start1 += gs; end1 += gs; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1664 start2 += gs; end2 += gs; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1665 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1666 else if (GPT < start2) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1667 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1668 /* If the regions are of equal size, the gap could, in theory, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1669 * be somewhere between them. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1670 register int gs = GAP_SIZE; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1671 start2 += gs; end2 += gs; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1672 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1673 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1674 /* The difference between the region's lengths */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1675 diff = (end2 - start2) - (end1 - start1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1676 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1677 /* For shifting each marker in a region by the length of the other |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1678 * region plus the distance between the regions. |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1679 */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1680 amt1 = (end2 - start2) + (start2 - end1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1681 amt2 = (end1 - start1) + (start2 - end1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1682 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1683 marker = current_buffer->markers; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1684 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1685 while (!NILP (marker)) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1686 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1687 m = XMARKER (marker); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1688 mpos = m->bufpos; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1689 if (mpos >= start1 && mpos < end1) /* in region 1 */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1690 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1691 m->bufpos += amt1; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1692 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1693 else if (mpos >= start2 && mpos < end2) /* in region 2 */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1694 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1695 m->bufpos -= amt2; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1696 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1697 else if (mpos >= end1 && mpos < start2) /* between the regions */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1698 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1699 m->bufpos += diff; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1700 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1701 marker = m->chain; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1702 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1703 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1704 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1705 DEFUN ("transpose-regions", Ftranspose_regions, Stranspose_regions, 4, 5, 0, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1706 "Transpose region START1 to END1 with START2 to END2.\n\ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1707 The regions may not be overlapping, because the size of the buffer is\n\ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1708 never changed in a transposition.\n\ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1709 \n\ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1710 Optional fifth arg LEAVE_MARKERS, if non-nil, means don't transpose\n\ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1711 any markers that happen to be located in the regions.\n\ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1712 \n\ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1713 Transposing beyond buffer boundaries is an error.") |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1714 (startr1, endr1, startr2, endr2, leave_markers) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1715 Lisp_Object startr1, endr1, startr2, endr2, leave_markers; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1716 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1717 register int start1, end1, start2, end2, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1718 gap, len1, len_mid, len2; |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1719 unsigned char *start1_addr, *start2_addr, *temp; |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1720 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1721 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1722 INTERVAL cur_intv, tmp_interval1, tmp_interval_mid, tmp_interval2; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1723 cur_intv = current_buffer->intervals; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1724 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1725 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1726 validate_region (&startr1, &endr1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1727 validate_region (&startr2, &endr2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1728 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1729 start1 = XFASTINT (startr1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1730 end1 = XFASTINT (endr1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1731 start2 = XFASTINT (startr2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1732 end2 = XFASTINT (endr2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1733 gap = GPT; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1734 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1735 /* Swap the regions if they're reversed. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1736 if (start2 < end1) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1737 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1738 register int glumph = start1; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1739 start1 = start2; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1740 start2 = glumph; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1741 glumph = end1; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1742 end1 = end2; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1743 end2 = glumph; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1744 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1745 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1746 len1 = end1 - start1; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1747 len2 = end2 - start2; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1748 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1749 if (start2 < end1) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1750 error ("transposed regions not properly ordered"); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1751 else if (start1 == end1 || start2 == end2) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1752 error ("transposed region may not be of length 0"); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1753 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1754 /* The possibilities are: |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1755 1. Adjacent (contiguous) regions, or separate but equal regions |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1756 (no, really equal, in this case!), or |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1757 2. Separate regions of unequal size. |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1758 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1759 The worst case is usually No. 2. It means that (aside from |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1760 potential need for getting the gap out of the way), there also |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1761 needs to be a shifting of the text between the two regions. So |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1762 if they are spread far apart, we are that much slower... sigh. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1763 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1764 /* It must be pointed out that the really studly thing to do would |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1765 be not to move the gap at all, but to leave it in place and work |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1766 around it if necessary. This would be extremely efficient, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1767 especially considering that people are likely to do |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1768 transpositions near where they are working interactively, which |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1769 is exactly where the gap would be found. However, such code |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1770 would be much harder to write and to read. So, if you are |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1771 reading this comment and are feeling squirrely, by all means have |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1772 a go! I just didn't feel like doing it, so I will simply move |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1773 the gap the minimum distance to get it out of the way, and then |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1774 deal with an unbroken array. */ |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1775 |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1776 /* Make sure the gap won't interfere, by moving it out of the text |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1777 we will operate on. */ |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1778 if (start1 < gap && gap < end2) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1779 { |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1780 if (gap - start1 < end2 - gap) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1781 move_gap (start1); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1782 else |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1783 move_gap (end2); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1784 } |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1785 |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1786 start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1787 start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1788 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1789 /* Hmmm... how about checking to see if the gap is large |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1790 enough to use as the temporary storage? That would avoid an |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1791 allocation... interesting. Later, don't fool with it now. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1792 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1793 /* Working without memmove, for portability (sigh), so must be |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1794 careful of overlapping subsections of the array... */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1795 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1796 if (end1 == start2) /* adjacent regions */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1797 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1798 modify_region (current_buffer, start1, end2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1799 record_change (start1, len1 + len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1800 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1801 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1802 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1803 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1804 Fset_text_properties (start1, end2, Qnil, Qnil); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1805 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1806 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1807 /* First region smaller than second. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1808 if (len1 < len2) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1809 { |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1810 /* We use alloca only if it is small, |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1811 because we want to avoid stack overflow. */ |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1812 if (len2 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1813 temp = (unsigned char *) xmalloc (len2); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1814 else |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1815 temp = (unsigned char *) alloca (len2); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1816 bcopy (start2_addr, temp, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1817 bcopy (start1_addr, start1_addr + len2, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1818 bcopy (temp, start1_addr, len2); |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1819 if (len2 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1820 free (temp); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1821 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1822 else |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1823 /* First region not smaller than second. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1824 { |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1825 if (len1 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1826 temp = (unsigned char *) xmalloc (len1); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1827 else |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1828 temp = (unsigned char *) alloca (len1); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1829 bcopy (start1_addr, temp, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1830 bcopy (start2_addr, start1_addr, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1831 bcopy (temp, start1_addr + len2, len1); |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1832 if (len1 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1833 free (temp); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1834 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1835 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1836 graft_intervals_into_buffer (tmp_interval1, start1 + len2, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1837 len1, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1838 graft_intervals_into_buffer (tmp_interval2, start1, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1839 len2, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1840 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1841 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1842 /* Non-adjacent regions, because end1 != start2, bleagh... */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1843 else |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1844 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1845 if (len1 == len2) |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1846 /* Regions are same size, though, how nice. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1847 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1848 modify_region (current_buffer, start1, end1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1849 modify_region (current_buffer, start2, end2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1850 record_change (start1, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1851 record_change (start2, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1852 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1853 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1854 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1855 Fset_text_properties (start1, end1, Qnil, Qnil); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1856 Fset_text_properties (start2, end2, Qnil, Qnil); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1857 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1858 |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1859 if (len1 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1860 temp = (unsigned char *) xmalloc (len1); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1861 else |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1862 temp = (unsigned char *) alloca (len1); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1863 bcopy (start1_addr, temp, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1864 bcopy (start2_addr, start1_addr, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1865 bcopy (temp, start2_addr, len1); |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1866 if (len1 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1867 free (temp); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1868 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1869 graft_intervals_into_buffer (tmp_interval1, start2, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1870 len1, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1871 graft_intervals_into_buffer (tmp_interval2, start1, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1872 len2, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1873 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1874 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1875 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1876 else if (len1 < len2) /* Second region larger than first */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1877 /* Non-adjacent & unequal size, area between must also be shifted. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1878 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1879 len_mid = start2 - end1; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1880 modify_region (current_buffer, start1, end2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1881 record_change (start1, (end2 - start1)); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1882 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1883 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1884 tmp_interval_mid = copy_intervals (cur_intv, end1, len_mid); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1885 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1886 Fset_text_properties (start1, end2, Qnil, Qnil); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1887 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1888 |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1889 /* holds region 2 */ |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1890 if (len2 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1891 temp = (unsigned char *) xmalloc (len2); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1892 else |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1893 temp = (unsigned char *) alloca (len2); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1894 bcopy (start2_addr, temp, len2); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1895 bcopy (start1_addr, start1_addr + len_mid + len2, len1); |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1896 safe_bcopy (start1_addr + len1, start1_addr + len2, len_mid); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1897 bcopy (temp, start1_addr, len2); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1898 if (len2 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1899 free (temp); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1900 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1901 graft_intervals_into_buffer (tmp_interval1, end2 - len1, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1902 len1, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1903 graft_intervals_into_buffer (tmp_interval_mid, start1 + len2, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1904 len_mid, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1905 graft_intervals_into_buffer (tmp_interval2, start1, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1906 len2, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1907 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1908 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1909 else |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1910 /* Second region smaller than first. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1911 { |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1912 len_mid = start2 - end1; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1913 record_change (start1, (end2 - start1)); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1914 modify_region (current_buffer, start1, end2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1915 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1916 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1917 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1918 tmp_interval_mid = copy_intervals (cur_intv, end1, len_mid); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1919 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1920 Fset_text_properties (start1, end2, Qnil, Qnil); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1921 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1922 |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1923 /* holds region 1 */ |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1924 if (len1 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1925 temp = (unsigned char *) xmalloc (len1); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1926 else |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1927 temp = (unsigned char *) alloca (len1); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1928 bcopy (start1_addr, temp, len1); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1929 bcopy (start2_addr, start1_addr, len2); |
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1930 bcopy (start1_addr + len1, start1_addr + len2, len_mid); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1931 bcopy (temp, start1_addr + len2 + len_mid, len1); |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1932 if (len1 > 20000) |
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
1933 free (temp); |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1934 #ifdef USE_TEXT_PROPERTIES |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1935 graft_intervals_into_buffer (tmp_interval1, end2 - len1, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1936 len1, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1937 graft_intervals_into_buffer (tmp_interval_mid, start1 + len2, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1938 len_mid, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1939 graft_intervals_into_buffer (tmp_interval2, start1, |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1940 len2, current_buffer, 0); |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1941 #endif /* USE_TEXT_PROPERTIES */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1942 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1943 } |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1944 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1945 /* todo: this will be slow, because for every transposition, we |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1946 traverse the whole friggin marker list. Possible solutions: |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1947 somehow get a list of *all* the markers across multiple |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1948 transpositions and do it all in one swell phoop. Or maybe modify |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1949 Emacs' marker code to keep an ordered list or tree. This might |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1950 be nicer, and more beneficial in the long run, but would be a |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1951 bunch of work. Plus the way they're arranged now is nice. */ |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1952 if (NILP (leave_markers)) |
7519
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1953 { |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1954 transpose_markers (start1, end1, start2, end2); |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1955 fix_overlays_in_range (start1, end2); |
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
1956 } |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1957 |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1958 return Qnil; |
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
1959 } |
305 | 1960 |
1961 | |
1962 void | |
1963 syms_of_editfns () | |
1964 { | |
4358
74004fb63311
(syms_of_editfns): Just staticpro Vuser...name
Richard M. Stallman <rms@gnu.org>
parents:
4047
diff
changeset
|
1965 staticpro (&Vuser_name); |
74004fb63311
(syms_of_editfns): Just staticpro Vuser...name
Richard M. Stallman <rms@gnu.org>
parents:
4047
diff
changeset
|
1966 staticpro (&Vuser_full_name); |
74004fb63311
(syms_of_editfns): Just staticpro Vuser...name
Richard M. Stallman <rms@gnu.org>
parents:
4047
diff
changeset
|
1967 staticpro (&Vuser_real_name); |
74004fb63311
(syms_of_editfns): Just staticpro Vuser...name
Richard M. Stallman <rms@gnu.org>
parents:
4047
diff
changeset
|
1968 staticpro (&Vsystem_name); |
305 | 1969 |
1970 defsubr (&Schar_equal); | |
1971 defsubr (&Sgoto_char); | |
1972 defsubr (&Sstring_to_char); | |
1973 defsubr (&Schar_to_string); | |
1974 defsubr (&Sbuffer_substring); | |
1975 defsubr (&Sbuffer_string); | |
1976 | |
1977 defsubr (&Spoint_marker); | |
1978 defsubr (&Smark_marker); | |
1979 defsubr (&Spoint); | |
1980 defsubr (&Sregion_beginning); | |
1981 defsubr (&Sregion_end); | |
1982 /* defsubr (&Smark); */ | |
1983 /* defsubr (&Sset_mark); */ | |
1984 defsubr (&Ssave_excursion); | |
1985 | |
1986 defsubr (&Sbufsize); | |
1987 defsubr (&Spoint_max); | |
1988 defsubr (&Spoint_min); | |
1989 defsubr (&Spoint_min_marker); | |
1990 defsubr (&Spoint_max_marker); | |
1991 | |
1992 defsubr (&Sbobp); | |
1993 defsubr (&Seobp); | |
1994 defsubr (&Sbolp); | |
1995 defsubr (&Seolp); | |
512 | 1996 defsubr (&Sfollowing_char); |
1997 defsubr (&Sprevious_char); | |
305 | 1998 defsubr (&Schar_after); |
1999 defsubr (&Sinsert); | |
2000 defsubr (&Sinsert_before_markers); | |
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2001 defsubr (&Sinsert_and_inherit); |
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2002 defsubr (&Sinsert_and_inherit_before_markers); |
305 | 2003 defsubr (&Sinsert_char); |
2004 | |
2005 defsubr (&Suser_login_name); | |
2006 defsubr (&Suser_real_login_name); | |
2007 defsubr (&Suser_uid); | |
2008 defsubr (&Suser_real_uid); | |
2009 defsubr (&Suser_full_name); | |
5373
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
2010 defsubr (&Semacs_pid); |
448 | 2011 defsubr (&Scurrent_time); |
305 | 2012 defsubr (&Scurrent_time_string); |
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
2013 defsubr (&Scurrent_time_zone); |
305 | 2014 defsubr (&Ssystem_name); |
2015 defsubr (&Smessage); | |
2016 defsubr (&Sformat); | |
2017 | |
2018 defsubr (&Sinsert_buffer_substring); | |
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
2019 defsubr (&Scompare_buffer_substrings); |
305 | 2020 defsubr (&Ssubst_char_in_region); |
2021 defsubr (&Stranslate_region); | |
2022 defsubr (&Sdelete_region); | |
2023 defsubr (&Swiden); | |
2024 defsubr (&Snarrow_to_region); | |
2025 defsubr (&Ssave_restriction); | |
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2026 defsubr (&Stranspose_regions); |
305 | 2027 } |