Mercurial > emacs
annotate src/editfns.c @ 13904:d9bf85b9c19e
(dired-local-variables-file): Use convert-standard-filename.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 01 Jan 1996 23:32:07 +0000 |
| parents | 2a71500dfb93 |
| children | 59906ecd9b92 |
| rev | line source |
|---|---|
| 305 | 1 /* Lisp functions pertaining to editing. |
| 11235 | 2 Copyright (C) 1985,86,87,89,93,94,95 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 | |
| 12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
| 305 | 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 | |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
41 extern char **environ; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
42 extern Lisp_Object make_time (); |
|
9657
0fc126c193e7
(Finsert_buffer_substring): Use insert_from_buffer instead of insert.
Karl Heuer <kwzh@gnu.org>
parents:
9572
diff
changeset
|
43 extern void insert_from_buffer (); |
|
9812
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
44 static long difftm (); |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
45 static void set_time_zone_rule (); |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
46 static void update_buffer_properties (); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
47 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
48 Lisp_Object Vbuffer_access_fontify_functions; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
49 Lisp_Object Qbuffer_access_fontify_functions; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
50 Lisp_Object Vbuffer_access_fontified_property; |
|
9657
0fc126c193e7
(Finsert_buffer_substring): Use insert_from_buffer instead of insert.
Karl Heuer <kwzh@gnu.org>
parents:
9572
diff
changeset
|
51 |
| 305 | 52 /* Some static data, and a function to initialize it for each run */ |
| 53 | |
| 54 Lisp_Object Vsystem_name; | |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
55 Lisp_Object Vuser_real_login_name; /* login name of current user ID */ |
|
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
56 Lisp_Object Vuser_full_name; /* full name of current user */ |
|
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
57 Lisp_Object Vuser_login_name; /* user name from LOGNAME or USER */ |
| 305 | 58 |
| 59 void | |
| 60 init_editfns () | |
| 61 { | |
| 330 | 62 char *user_name; |
| 305 | 63 register unsigned char *p, *q, *r; |
| 64 struct passwd *pw; /* password entry for the current user */ | |
| 65 extern char *index (); | |
| 66 Lisp_Object tem; | |
| 67 | |
| 68 /* Set up system_name even when dumping. */ | |
|
7907
148ad20d6774
(init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents:
7862
diff
changeset
|
69 init_system_name (); |
| 305 | 70 |
| 71 #ifndef CANNOT_DUMP | |
| 72 /* Don't bother with this on initial start when just dumping out */ | |
| 73 if (!initialized) | |
| 74 return; | |
| 75 #endif /* not CANNOT_DUMP */ | |
| 76 | |
| 77 pw = (struct passwd *) getpwuid (getuid ()); | |
| 9572 | 78 #ifdef MSDOS |
| 79 /* We let the real user name default to "root" because that's quite | |
| 80 accurate on MSDOG and because it lets Emacs find the init file. | |
| 81 (The DVX libraries override the Djgpp libraries here.) */ | |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
82 Vuser_real_login_name = build_string (pw ? pw->pw_name : "root"); |
| 9572 | 83 #else |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
84 Vuser_real_login_name = build_string (pw ? pw->pw_name : "unknown"); |
| 9572 | 85 #endif |
| 305 | 86 |
| 330 | 87 /* Get the effective user name, by consulting environment variables, |
| 88 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
|
89 user_name = (char *) getenv ("LOGNAME"); |
| 330 | 90 if (!user_name) |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
91 #ifdef WINDOWSNT |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
92 user_name = (char *) getenv ("USERNAME"); /* it's USERNAME on NT */ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
93 #else /* WINDOWSNT */ |
|
5907
5fdb226fe9a4
(init_editfns): Look at LOGNAME before USER.
Karl Heuer <kwzh@gnu.org>
parents:
5884
diff
changeset
|
94 user_name = (char *) getenv ("USER"); |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
95 #endif /* WINDOWSNT */ |
| 305 | 96 if (!user_name) |
| 330 | 97 { |
| 98 pw = (struct passwd *) getpwuid (geteuid ()); | |
| 99 user_name = (char *) (pw ? pw->pw_name : "unknown"); | |
| 100 } | |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
101 Vuser_login_name = build_string (user_name); |
| 305 | 102 |
| 330 | 103 /* If the user name claimed in the environment vars differs from |
| 104 the real uid, use the claimed name to find the full name. */ | |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
105 tem = Fstring_equal (Vuser_login_name, Vuser_real_login_name); |
| 488 | 106 if (NILP (tem)) |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
107 pw = (struct passwd *) getpwnam (XSTRING (Vuser_login_name)->data); |
| 305 | 108 |
| 109 p = (unsigned char *) (pw ? USER_FULL_NAME : "unknown"); | |
| 110 q = (unsigned char *) index (p, ','); | |
| 111 Vuser_full_name = make_string (p, q ? q - p : strlen (p)); | |
| 112 | |
| 113 #ifdef AMPERSAND_FULL_NAME | |
| 114 p = XSTRING (Vuser_full_name)->data; | |
|
11447
d51e912495be
(init_editfns): Add casts.
Richard M. Stallman <rms@gnu.org>
parents:
11433
diff
changeset
|
115 q = (unsigned char *) index (p, '&'); |
| 305 | 116 /* Substitute the login name for the &, upcasing the first character. */ |
| 117 if (q) | |
| 118 { | |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
119 r = (unsigned char *) alloca (strlen (p) |
|
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
120 + XSTRING (Vuser_login_name)->size + 1); |
| 305 | 121 bcopy (p, r, q - p); |
| 122 r[q - p] = 0; | |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
123 strcat (r, XSTRING (Vuser_login_name)->data); |
| 305 | 124 r[q - p] = UPCASE (r[q - p]); |
| 125 strcat (r, q + 1); | |
| 126 Vuser_full_name = build_string (r); | |
| 127 } | |
| 128 #endif /* AMPERSAND_FULL_NAME */ | |
|
11135
9ab21ef32537
(init_editfns): Use NAME envvar to init user-full-name.
Richard M. Stallman <rms@gnu.org>
parents:
10480
diff
changeset
|
129 |
|
11447
d51e912495be
(init_editfns): Add casts.
Richard M. Stallman <rms@gnu.org>
parents:
11433
diff
changeset
|
130 p = (unsigned char *) getenv ("NAME"); |
|
11135
9ab21ef32537
(init_editfns): Use NAME envvar to init user-full-name.
Richard M. Stallman <rms@gnu.org>
parents:
10480
diff
changeset
|
131 if (p) |
|
9ab21ef32537
(init_editfns): Use NAME envvar to init user-full-name.
Richard M. Stallman <rms@gnu.org>
parents:
10480
diff
changeset
|
132 Vuser_full_name = build_string (p); |
| 305 | 133 } |
| 134 | |
| 135 DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0, | |
| 136 "Convert arg CHAR to a one-character string containing that character.") | |
| 137 (n) | |
| 138 Lisp_Object n; | |
| 139 { | |
| 140 char c; | |
| 141 CHECK_NUMBER (n, 0); | |
| 142 | |
| 143 c = XINT (n); | |
| 144 return make_string (&c, 1); | |
| 145 } | |
| 146 | |
| 147 DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0, | |
| 148 "Convert arg STRING to a character, the first character of that string.") | |
| 149 (str) | |
| 150 register Lisp_Object str; | |
| 151 { | |
| 152 register Lisp_Object val; | |
| 153 register struct Lisp_String *p; | |
| 154 CHECK_STRING (str, 0); | |
| 155 | |
| 156 p = XSTRING (str); | |
| 157 if (p->size) | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
158 XSETFASTINT (val, ((unsigned char *) p->data)[0]); |
| 305 | 159 else |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
160 XSETFASTINT (val, 0); |
| 305 | 161 return val; |
| 162 } | |
| 163 | |
| 164 static Lisp_Object | |
| 165 buildmark (val) | |
| 166 int val; | |
| 167 { | |
| 168 register Lisp_Object mark; | |
| 169 mark = Fmake_marker (); | |
| 170 Fset_marker (mark, make_number (val), Qnil); | |
| 171 return mark; | |
| 172 } | |
| 173 | |
| 174 DEFUN ("point", Fpoint, Spoint, 0, 0, 0, | |
| 175 "Return value of point, as an integer.\n\ | |
| 176 Beginning of buffer is position (point-min)") | |
| 177 () | |
| 178 { | |
| 179 Lisp_Object temp; | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
180 XSETFASTINT (temp, point); |
| 305 | 181 return temp; |
| 182 } | |
| 183 | |
| 184 DEFUN ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0, | |
| 185 "Return value of point, as a marker object.") | |
| 186 () | |
| 187 { | |
| 188 return buildmark (point); | |
| 189 } | |
| 190 | |
| 191 int | |
| 192 clip_to_bounds (lower, num, upper) | |
| 193 int lower, num, upper; | |
| 194 { | |
| 195 if (num < lower) | |
| 196 return lower; | |
| 197 else if (num > upper) | |
| 198 return upper; | |
| 199 else | |
| 200 return num; | |
| 201 } | |
| 202 | |
| 203 DEFUN ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ", | |
| 204 "Set point to POSITION, a number or marker.\n\ | |
| 205 Beginning of buffer is position (point-min), end is (point-max).") | |
| 206 (n) | |
| 207 register Lisp_Object n; | |
| 208 { | |
| 209 CHECK_NUMBER_COERCE_MARKER (n, 0); | |
| 210 | |
| 211 SET_PT (clip_to_bounds (BEGV, XINT (n), ZV)); | |
| 212 return n; | |
| 213 } | |
| 214 | |
| 215 static Lisp_Object | |
| 216 region_limit (beginningp) | |
| 217 int beginningp; | |
| 218 { | |
|
4047
e950abdc9ed2
(region_limit): Declare Vmark_even_if_inactive.
Roland McGrath <roland@gnu.org>
parents:
4038
diff
changeset
|
219 extern Lisp_Object Vmark_even_if_inactive; /* Defined in callint.c. */ |
| 305 | 220 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
|
221 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
|
222 && 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
|
223 Fsignal (Qmark_inactive, Qnil); |
| 305 | 224 m = Fmarker_position (current_buffer->mark); |
| 488 | 225 if (NILP (m)) error ("There is no region now"); |
| 305 | 226 if ((point < XFASTINT (m)) == beginningp) |
| 227 return (make_number (point)); | |
| 228 else | |
| 229 return (m); | |
| 230 } | |
| 231 | |
| 232 DEFUN ("region-beginning", Fregion_beginning, Sregion_beginning, 0, 0, 0, | |
| 233 "Return position of beginning of region, as an integer.") | |
| 234 () | |
| 235 { | |
| 236 return (region_limit (1)); | |
| 237 } | |
| 238 | |
| 239 DEFUN ("region-end", Fregion_end, Sregion_end, 0, 0, 0, | |
| 240 "Return position of end of region, as an integer.") | |
| 241 () | |
| 242 { | |
| 243 return (region_limit (0)); | |
| 244 } | |
| 245 | |
| 246 DEFUN ("mark-marker", Fmark_marker, Smark_marker, 0, 0, 0, | |
| 247 "Return this buffer's mark, as a marker object.\n\ | |
| 248 Watch out! Moving this marker changes the mark position.\n\ | |
| 249 If you set the marker not to point anywhere, the buffer will have no mark.") | |
| 250 () | |
| 251 { | |
| 252 return current_buffer->mark; | |
| 253 } | |
| 254 | |
| 255 Lisp_Object | |
| 256 save_excursion_save () | |
| 257 { | |
|
1254
c7e7e3438711
* editfns.c (save_excursion_save, save_excursion_restore):
Jim Blandy <jimb@redhat.com>
parents:
1117
diff
changeset
|
258 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
|
259 == current_buffer); |
| 305 | 260 |
| 261 return Fcons (Fpoint_marker (), | |
|
12982
385a67ad96c3
(save_excursion_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12973
diff
changeset
|
262 Fcons (Fcopy_marker (current_buffer->mark, Qnil), |
|
2049
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
263 Fcons (visible ? Qt : Qnil, |
|
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
264 current_buffer->mark_active))); |
| 305 | 265 } |
| 266 | |
| 267 Lisp_Object | |
| 268 save_excursion_restore (info) | |
| 269 register Lisp_Object info; | |
| 270 { | |
|
7485
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
271 register Lisp_Object tem, tem1, omark, nmark; |
| 305 | 272 |
| 273 tem = Fmarker_buffer (Fcar (info)); | |
| 274 /* If buffer being returned to is now deleted, avoid error */ | |
| 275 /* Otherwise could get error here while unwinding to top level | |
| 276 and crash */ | |
| 277 /* In that case, Fmarker_buffer returns nil now. */ | |
| 488 | 278 if (NILP (tem)) |
| 305 | 279 return Qnil; |
| 280 Fset_buffer (tem); | |
| 281 tem = Fcar (info); | |
| 282 Fgoto_char (tem); | |
| 283 unchain_marker (tem); | |
| 284 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
|
285 omark = Fmarker_position (current_buffer->mark); |
| 305 | 286 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
|
287 nmark = Fmarker_position (tem); |
| 305 | 288 unchain_marker (tem); |
| 289 tem = Fcdr (Fcdr (info)); | |
|
4420
8113d9ba472e
(save_excursion_restore): Never make the buffer visible.
Richard M. Stallman <rms@gnu.org>
parents:
4358
diff
changeset
|
290 #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
|
291 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
|
292 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
|
293 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
|
294 tem1 = Fcar (tem); |
|
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
295 if (!NILP (tem1) |
|
1254
c7e7e3438711
* editfns.c (save_excursion_save, save_excursion_restore):
Jim Blandy <jimb@redhat.com>
parents:
1117
diff
changeset
|
296 && current_buffer != XBUFFER (XWINDOW (selected_window)->buffer)) |
| 305 | 297 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
|
298 #endif /* 0 */ |
|
2049
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
299 |
|
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
300 tem1 = current_buffer->mark_active; |
|
a358c97a23e4
(save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1916
diff
changeset
|
301 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
|
302 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
|
303 { |
|
7485
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
304 /* 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
|
305 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
|
306 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
|
307 { |
|
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
308 if (! EQ (omark, nmark)) |
|
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
309 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
|
310 } |
|
a1b7f72e0ea2
(save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
311 /* 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
|
312 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
|
313 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
|
314 } |
| 305 | 315 return Qnil; |
| 316 } | |
| 317 | |
| 318 DEFUN ("save-excursion", Fsave_excursion, Ssave_excursion, 0, UNEVALLED, 0, | |
| 319 "Save point, mark, and current buffer; execute BODY; restore those things.\n\ | |
| 320 Executes BODY just like `progn'.\n\ | |
| 321 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
|
322 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
|
323 The state of activation of the mark is also restored.") |
| 305 | 324 (args) |
| 325 Lisp_Object args; | |
| 326 { | |
| 327 register Lisp_Object val; | |
| 328 int count = specpdl_ptr - specpdl; | |
| 329 | |
| 330 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
| 331 | |
| 332 val = Fprogn (args); | |
| 333 return unbind_to (count, val); | |
| 334 } | |
| 335 | |
| 336 DEFUN ("buffer-size", Fbufsize, Sbufsize, 0, 0, 0, | |
| 337 "Return the number of characters in the current buffer.") | |
| 338 () | |
| 339 { | |
| 340 Lisp_Object temp; | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
341 XSETFASTINT (temp, Z - BEG); |
| 305 | 342 return temp; |
| 343 } | |
| 344 | |
| 345 DEFUN ("point-min", Fpoint_min, Spoint_min, 0, 0, 0, | |
| 346 "Return the minimum permissible value of point in the current buffer.\n\ | |
| 4943 | 347 This is 1, unless narrowing (a buffer restriction) is in effect.") |
| 305 | 348 () |
| 349 { | |
| 350 Lisp_Object temp; | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
351 XSETFASTINT (temp, BEGV); |
| 305 | 352 return temp; |
| 353 } | |
| 354 | |
| 355 DEFUN ("point-min-marker", Fpoint_min_marker, Spoint_min_marker, 0, 0, 0, | |
| 356 "Return a marker to the minimum permissible value of point in this buffer.\n\ | |
| 4943 | 357 This is the beginning, unless narrowing (a buffer restriction) is in effect.") |
| 305 | 358 () |
| 359 { | |
| 360 return buildmark (BEGV); | |
| 361 } | |
| 362 | |
| 363 DEFUN ("point-max", Fpoint_max, Spoint_max, 0, 0, 0, | |
| 364 "Return the maximum permissible value of point in the current buffer.\n\ | |
| 4943 | 365 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)\n\ |
| 366 is in effect, in which case it is less.") | |
| 305 | 367 () |
| 368 { | |
| 369 Lisp_Object temp; | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
370 XSETFASTINT (temp, ZV); |
| 305 | 371 return temp; |
| 372 } | |
| 373 | |
| 374 DEFUN ("point-max-marker", Fpoint_max_marker, Spoint_max_marker, 0, 0, 0, | |
| 375 "Return a marker to the maximum permissible value of point in this buffer.\n\ | |
| 4943 | 376 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)\n\ |
| 377 is in effect, in which case it is less.") | |
| 305 | 378 () |
| 379 { | |
| 380 return buildmark (ZV); | |
| 381 } | |
| 382 | |
| 512 | 383 DEFUN ("following-char", Ffollowing_char, Sfollowing_char, 0, 0, 0, |
| 384 "Return the character following point, as a number.\n\ | |
| 385 At the end of the buffer or accessible region, return 0.") | |
| 305 | 386 () |
| 387 { | |
| 388 Lisp_Object temp; | |
| 512 | 389 if (point >= ZV) |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
390 XSETFASTINT (temp, 0); |
| 512 | 391 else |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
392 XSETFASTINT (temp, FETCH_CHAR (point)); |
| 305 | 393 return temp; |
| 394 } | |
| 395 | |
| 512 | 396 DEFUN ("preceding-char", Fprevious_char, Sprevious_char, 0, 0, 0, |
| 397 "Return the character preceding point, as a number.\n\ | |
| 398 At the beginning of the buffer or accessible region, return 0.") | |
| 305 | 399 () |
| 400 { | |
| 401 Lisp_Object temp; | |
| 402 if (point <= BEGV) | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
403 XSETFASTINT (temp, 0); |
| 305 | 404 else |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
405 XSETFASTINT (temp, FETCH_CHAR (point - 1)); |
| 305 | 406 return temp; |
| 407 } | |
| 408 | |
| 409 DEFUN ("bobp", Fbobp, Sbobp, 0, 0, 0, | |
| 410 "Return T if point is at the beginning of the buffer.\n\ | |
| 411 If the buffer is narrowed, this means the beginning of the narrowed part.") | |
| 412 () | |
| 413 { | |
| 414 if (point == BEGV) | |
| 415 return Qt; | |
| 416 return Qnil; | |
| 417 } | |
| 418 | |
| 419 DEFUN ("eobp", Feobp, Seobp, 0, 0, 0, | |
| 420 "Return T if point is at the end of the buffer.\n\ | |
| 421 If the buffer is narrowed, this means the end of the narrowed part.") | |
| 422 () | |
| 423 { | |
| 424 if (point == ZV) | |
| 425 return Qt; | |
| 426 return Qnil; | |
| 427 } | |
| 428 | |
| 429 DEFUN ("bolp", Fbolp, Sbolp, 0, 0, 0, | |
| 430 "Return T if point is at the beginning of a line.") | |
| 431 () | |
| 432 { | |
| 433 if (point == BEGV || FETCH_CHAR (point - 1) == '\n') | |
| 434 return Qt; | |
| 435 return Qnil; | |
| 436 } | |
| 437 | |
| 438 DEFUN ("eolp", Feolp, Seolp, 0, 0, 0, | |
| 439 "Return T if point is at the end of a line.\n\ | |
| 440 `End of a line' includes point being at the end of the buffer.") | |
| 441 () | |
| 442 { | |
| 443 if (point == ZV || FETCH_CHAR (point) == '\n') | |
| 444 return Qt; | |
| 445 return Qnil; | |
| 446 } | |
| 447 | |
| 448 DEFUN ("char-after", Fchar_after, Schar_after, 1, 1, 0, | |
| 449 "Return character in current buffer at position POS.\n\ | |
| 450 POS is an integer or a buffer pointer.\n\ | |
| 451 If POS is out of range, the value is nil.") | |
| 452 (pos) | |
| 453 Lisp_Object pos; | |
| 454 { | |
| 455 register Lisp_Object val; | |
| 456 register int n; | |
| 457 | |
| 458 CHECK_NUMBER_COERCE_MARKER (pos, 0); | |
| 459 | |
| 460 n = XINT (pos); | |
| 461 if (n < BEGV || n >= ZV) return Qnil; | |
| 462 | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
463 XSETFASTINT (val, FETCH_CHAR (n)); |
| 305 | 464 return val; |
| 465 } | |
| 466 | |
| 9572 | 467 DEFUN ("user-login-name", Fuser_login_name, Suser_login_name, 0, 1, 0, |
| 305 | 468 "Return the name under which the user logged in, as a string.\n\ |
| 469 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
|
470 Also, if the environment variable LOGNAME or USER is set,\n\ |
| 9572 | 471 that determines the value of this function.\n\n\ |
| 472 If optional argument UID is an integer, return the login name of the user\n\ | |
| 473 with that uid, or nil if there is no such user.") | |
| 474 (uid) | |
| 475 Lisp_Object uid; | |
| 305 | 476 { |
| 9572 | 477 struct passwd *pw; |
| 478 | |
|
9520
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
479 /* Set up the user name info if we didn't do it before. |
|
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
480 (That can happen if Emacs is dumpable |
|
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
481 but you decide to run `temacs -l loadup' and not dump. */ |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
482 if (INTEGERP (Vuser_login_name)) |
|
9520
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
483 init_editfns (); |
| 9572 | 484 |
| 485 if (NILP (uid)) | |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
486 return Vuser_login_name; |
| 9572 | 487 |
| 488 CHECK_NUMBER (uid, 0); | |
| 489 pw = (struct passwd *) getpwuid (XINT (uid)); | |
| 490 return (pw ? build_string (pw->pw_name) : Qnil); | |
| 305 | 491 } |
| 492 | |
| 493 DEFUN ("user-real-login-name", Fuser_real_login_name, Suser_real_login_name, | |
| 494 0, 0, 0, | |
| 495 "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
|
496 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
|
497 `user-login-name' when running under `su'.") |
| 305 | 498 () |
| 499 { | |
|
9520
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
500 /* Set up the user name info if we didn't do it before. |
|
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
501 (That can happen if Emacs is dumpable |
|
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
502 but you decide to run `temacs -l loadup' and not dump. */ |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
503 if (INTEGERP (Vuser_login_name)) |
|
9520
5187a4159d16
(Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents:
9305
diff
changeset
|
504 init_editfns (); |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
505 return Vuser_real_login_name; |
| 305 | 506 } |
| 507 | |
| 508 DEFUN ("user-uid", Fuser_uid, Suser_uid, 0, 0, 0, | |
| 509 "Return the effective uid of Emacs, as an integer.") | |
| 510 () | |
| 511 { | |
| 512 return make_number (geteuid ()); | |
| 513 } | |
| 514 | |
| 515 DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0, | |
| 516 "Return the real uid of Emacs, as an integer.") | |
| 517 () | |
| 518 { | |
| 519 return make_number (getuid ()); | |
| 520 } | |
| 521 | |
| 522 DEFUN ("user-full-name", Fuser_full_name, Suser_full_name, 0, 0, 0, | |
| 523 "Return the full name of the user logged in, as a string.") | |
| 524 () | |
| 525 { | |
| 526 return Vuser_full_name; | |
| 527 } | |
| 528 | |
| 529 DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0, | |
| 530 "Return the name of the machine you are running on, as a string.") | |
| 531 () | |
| 532 { | |
| 533 return Vsystem_name; | |
| 534 } | |
| 535 | |
|
7907
148ad20d6774
(init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents:
7862
diff
changeset
|
536 /* For the benefit of callers who don't want to include lisp.h */ |
|
148ad20d6774
(init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents:
7862
diff
changeset
|
537 char * |
|
148ad20d6774
(init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents:
7862
diff
changeset
|
538 get_system_name () |
|
148ad20d6774
(init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents:
7862
diff
changeset
|
539 { |
|
8333
e23908a4fa09
(get_system_name): Add a cast.
Richard M. Stallman <rms@gnu.org>
parents:
7907
diff
changeset
|
540 return (char *) XSTRING (Vsystem_name)->data; |
|
7907
148ad20d6774
(init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents:
7862
diff
changeset
|
541 } |
|
148ad20d6774
(init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents:
7862
diff
changeset
|
542 |
|
5373
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
543 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
|
544 "Return the process ID of Emacs, as an integer.") |
|
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 { |
|
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
547 return make_number (getpid ()); |
|
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
548 } |
|
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
549 |
| 448 | 550 DEFUN ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0, |
|
13618
5fe951036f57
(Fcurrent_time): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13450
diff
changeset
|
551 "Return the current time, as the number of seconds since 1970-01-01 00:00:00.\n\ |
| 577 | 552 The time is returned as a list of three integers. The first has the\n\ |
| 553 most significant 16 bits of the seconds, while the second has the\n\ | |
| 554 least significant 16 bits. The third integer gives the microsecond\n\ | |
| 555 count.\n\ | |
| 556 \n\ | |
| 557 The microsecond count is zero on systems that do not provide\n\ | |
| 558 resolution finer than a second.") | |
| 448 | 559 () |
| 560 { | |
| 577 | 561 EMACS_TIME t; |
| 562 Lisp_Object result[3]; | |
| 563 | |
| 564 EMACS_GET_TIME (t); | |
|
9265
e44908d7323b
(Fcurrent_time, Fformat): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
parents:
9163
diff
changeset
|
565 XSETINT (result[0], (EMACS_SECS (t) >> 16) & 0xffff); |
|
e44908d7323b
(Fcurrent_time, Fformat): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
parents:
9163
diff
changeset
|
566 XSETINT (result[1], (EMACS_SECS (t) >> 0) & 0xffff); |
|
e44908d7323b
(Fcurrent_time, Fformat): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
parents:
9163
diff
changeset
|
567 XSETINT (result[2], EMACS_USECS (t)); |
| 577 | 568 |
| 569 return Flist (3, result); | |
| 448 | 570 } |
| 571 | |
| 572 | |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
573 static int |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
574 lisp_time_argument (specified_time, result) |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
575 Lisp_Object specified_time; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
576 time_t *result; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
577 { |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
578 if (NILP (specified_time)) |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
579 return time (result) != -1; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
580 else |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
581 { |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
582 Lisp_Object high, low; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
583 high = Fcar (specified_time); |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
584 CHECK_NUMBER (high, 0); |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
585 low = Fcdr (specified_time); |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
586 if (CONSP (low)) |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
587 low = Fcar (low); |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
588 CHECK_NUMBER (low, 0); |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
589 *result = (XINT (high) << 16) + (XINT (low) & 0xffff); |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
590 return *result >> 16 == XINT (high); |
|
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 } |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
593 |
|
9154
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
594 DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 2, 2, 0, |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
595 "Use FORMAT-STRING to format the time TIME.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
596 TIME is specified as (HIGH LOW . IGNORED) or (HIGH . LOW), as from\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
597 `current-time' and `file-attributes'.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
598 FORMAT-STRING may contain %-sequences to substitute parts of the time.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
599 %a is replaced by the abbreviated name of the day of week.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
600 %A is replaced by the full name of the day of week.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
601 %b is replaced by the abbreviated name of the month.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
602 %B is replaced by the full name of the month.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
603 %c is a synonym for \"%x %X\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
604 %C is a locale-specific synonym, which defaults to \"%A, %B %e, %Y\" in the C locale.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
605 %d is replaced by the day of month, zero-padded.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
606 %D is a synonym for \"%m/%d/%y\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
607 %e is replaced by the day of month, blank-padded.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
608 %h is a synonym for \"%b\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
609 %H is replaced by the hour (00-23).\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
610 %I is replaced by the hour (00-12).\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
611 %j is replaced by the day of the year (001-366).\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
612 %k is replaced by the hour (0-23), blank padded.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
613 %l is replaced by the hour (1-12), blank padded.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
614 %m is replaced by the month (01-12).\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
615 %M is replaced by the minut (00-59).\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
616 %n is a synonym for \"\\n\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
617 %p is replaced by AM or PM, as appropriate.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
618 %r is a synonym for \"%I:%M:%S %p\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
619 %R is a synonym for \"%H:%M\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
620 %S is replaced by the seconds (00-60).\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
621 %t is a synonym for \"\\t\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
622 %T is a synonym for \"%H:%M:%S\".\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
623 %U is replaced by the week of the year (01-52), first day of week is Sunday.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
624 %w is replaced by the day of week (0-6), Sunday is day 0.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
625 %W is replaced by the week of the year (01-52), first day of week is Monday.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
626 %x is a locale-specific synonym, which defaults to \"%D\" in the C locale.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
627 %X is a locale-specific synonym, which defaults to \"%T\" in the C locale.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
628 %y is replaced by the year without century (00-99).\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
629 %Y is replaced by the year with century.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
630 %Z is replaced by the time zone abbreviation.\n\ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
631 \n\ |
|
11263
56feeecbb05a
(Fformat): Cast int to pointer by way of EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
632 The number of options reflects the `strftime' function.") |
|
9154
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
633 (format_string, time) |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
634 Lisp_Object format_string, time; |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
635 { |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
636 time_t value; |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
637 int size; |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
638 |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
639 CHECK_STRING (format_string, 1); |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
640 |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
641 if (! lisp_time_argument (time, &value)) |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
642 error ("Invalid time specification"); |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
643 |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
644 /* This is probably enough. */ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
645 size = XSTRING (format_string)->size * 6 + 50; |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
646 |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
647 while (1) |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
648 { |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
649 char *buf = (char *) alloca (size); |
|
11263
56feeecbb05a
(Fformat): Cast int to pointer by way of EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
650 if (emacs_strftime (buf, size, XSTRING (format_string)->data, |
|
56feeecbb05a
(Fformat): Cast int to pointer by way of EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
651 localtime (&value))) |
|
9154
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
652 return build_string (buf); |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
653 /* If buffer was too small, make it bigger. */ |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
654 size *= 2; |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
655 } |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
656 } |
|
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
657 |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
658 DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 1, 0, |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
659 "Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST ZONE).\n\ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
660 The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED)\n\ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
661 or (HIGH . LOW), as from `current-time' and `file-attributes', or `nil'\n\ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
662 to use the current time. The list has the following nine members:\n\ |
|
13013
2511f0ccd986
(Fdecode_time): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12982
diff
changeset
|
663 SEC is an integer between 0 and 60; SEC is 60 for a leap second, which\n\ |
|
2511f0ccd986
(Fdecode_time): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12982
diff
changeset
|
664 only some operating systems support. MINUTE is an integer between 0 and 59.\n\ |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
665 HOUR is an integer between 0 and 23. DAY is an integer between 1 and 31.\n\ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
666 MONTH is an integer between 1 and 12. YEAR is an integer indicating the\n\ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
667 four-digit year. DOW is the day of week, an integer between 0 and 6, where\n\ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
668 0 is Sunday. DST is t if daylight savings time is effect, otherwise nil.\n\ |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
669 ZONE is an integer indicating the number of seconds east of Greenwich.\n\ |
|
12973
2c0225a5aa91
(Fdecode_time): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12958
diff
changeset
|
670 \(Note that Common Lisp has different meanings for DOW and ZONE.)") |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
671 (specified_time) |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
672 Lisp_Object specified_time; |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
673 { |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
674 time_t time_spec; |
|
9812
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
675 struct tm save_tm; |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
676 struct tm *decoded_time; |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
677 Lisp_Object list_args[9]; |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
678 |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
679 if (! lisp_time_argument (specified_time, &time_spec)) |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
680 error ("Invalid time specification"); |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
681 |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
682 decoded_time = localtime (&time_spec); |
|
9812
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
683 XSETFASTINT (list_args[0], decoded_time->tm_sec); |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
684 XSETFASTINT (list_args[1], decoded_time->tm_min); |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
685 XSETFASTINT (list_args[2], decoded_time->tm_hour); |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
686 XSETFASTINT (list_args[3], decoded_time->tm_mday); |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
687 XSETFASTINT (list_args[4], decoded_time->tm_mon + 1); |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
688 XSETFASTINT (list_args[5], decoded_time->tm_year + 1900); |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
689 XSETFASTINT (list_args[6], decoded_time->tm_wday); |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
690 list_args[7] = (decoded_time->tm_isdst)? Qt : Qnil; |
|
9812
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
691 |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
692 /* Make a copy, in case gmtime modifies the struct. */ |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
693 save_tm = *decoded_time; |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
694 decoded_time = gmtime (&time_spec); |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
695 if (decoded_time == 0) |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
696 list_args[8] = Qnil; |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
697 else |
|
bc352c8f079c
(Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents:
9809
diff
changeset
|
698 XSETINT (list_args[8], difftm (&save_tm, decoded_time)); |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
699 return Flist (9, list_args); |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
700 } |
|
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
701 |
|
11402
66d935214d8e
(Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents:
11263
diff
changeset
|
702 DEFUN ("encode-time", Fencode_time, Sencode_time, 6, 7, 0, |
|
11710
0652683b14e6
(Fencode_time): Rename arg from min to minute.
Richard M. Stallman <rms@gnu.org>
parents:
11477
diff
changeset
|
703 "Convert SEC, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time.\n\ |
|
11451
2278f5ceb043
(Fencode_time): Fix missing \n\'s.
Karl Heuer <kwzh@gnu.org>
parents:
11447
diff
changeset
|
704 This is the reverse operation of `decode-time', which see. ZONE defaults\n\ |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
705 to the current time zone rule if not specified; if specified, it can\n\ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
706 be a string (as from `set-time-zone-rule'), or it can be a list\n\ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
707 (as from `current-time-zone') or an integer (as from `decode-time')\n\ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
708 applied without consideration for daylight savings time.\n\ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
709 Out-of-range values for SEC, MINUTE, HOUR, DAY, or MONTH are allowed;\n\ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
710 for example, a DAY of 0 means the day preceding the given month.\n\ |
|
11476
7917226c3ea9
(Fencode_time): Don't treat years < 100 as special.
Richard M. Stallman <rms@gnu.org>
parents:
11468
diff
changeset
|
711 Year numbers less than 100 are treated just like other year numbers.\n\ |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
712 If you want them to stand for years in this century, you must do that yourself.") |
|
11710
0652683b14e6
(Fencode_time): Rename arg from min to minute.
Richard M. Stallman <rms@gnu.org>
parents:
11477
diff
changeset
|
713 (sec, minute, hour, day, month, year, zone) |
|
0652683b14e6
(Fencode_time): Rename arg from min to minute.
Richard M. Stallman <rms@gnu.org>
parents:
11477
diff
changeset
|
714 Lisp_Object sec, minute, hour, day, month, year, zone; |
|
11402
66d935214d8e
(Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents:
11263
diff
changeset
|
715 { |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
716 time_t time; |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
717 struct tm tm; |
|
11402
66d935214d8e
(Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents:
11263
diff
changeset
|
718 |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
719 CHECK_NUMBER (sec, 0); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
720 CHECK_NUMBER (minute, 1); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
721 CHECK_NUMBER (hour, 2); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
722 CHECK_NUMBER (day, 3); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
723 CHECK_NUMBER (month, 4); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
724 CHECK_NUMBER (year, 5); |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
725 |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
726 tm.tm_sec = XINT (sec); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
727 tm.tm_min = XINT (minute); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
728 tm.tm_hour = XINT (hour); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
729 tm.tm_mday = XINT (day); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
730 tm.tm_mon = XINT (month) - 1; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
731 tm.tm_year = XINT (year) - 1900; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
732 tm.tm_isdst = -1; |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
733 |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
734 if (CONSP (zone)) |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
735 zone = Fcar (zone); |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
736 if (NILP (zone)) |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
737 time = mktime (&tm); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
738 else |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
739 { |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
740 char tzbuf[100]; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
741 char *tzstring; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
742 char **oldenv = environ, **newenv; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
743 |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
744 if (STRINGP (zone)) |
|
13347
186d80572f4f
(Fencode_time): Add cast.
Richard M. Stallman <rms@gnu.org>
parents:
13238
diff
changeset
|
745 tzstring = (char *) XSTRING (zone)->data; |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
746 else if (INTEGERP (zone)) |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
747 { |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
748 int abszone = abs (XINT (zone)); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
749 sprintf (tzbuf, "XXX%s%d:%02d:%02d", "-" + (XINT (zone) < 0), |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
750 abszone / (60*60), (abszone/60) % 60, abszone % 60); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
751 tzstring = tzbuf; |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
752 } |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
753 else |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
754 error ("Invalid time zone specification"); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
755 |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
756 /* Set TZ before calling mktime; merely adjusting mktime's returned |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
757 value doesn't suffice, since that would mishandle leap seconds. */ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
758 set_time_zone_rule (tzstring); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
759 |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
760 time = mktime (&tm); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
761 |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
762 /* Restore TZ to previous value. */ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
763 newenv = environ; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
764 environ = oldenv; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
765 free (newenv); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
766 #ifdef LOCALTIME_CACHE |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
767 tzset (); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
768 #endif |
|
11468
772f49d1969d
(Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents:
11451
diff
changeset
|
769 } |
|
11402
66d935214d8e
(Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents:
11263
diff
changeset
|
770 |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
771 if (time == (time_t) -1) |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
772 error ("Specified time is not representable"); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
773 |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
774 return make_time (time); |
|
11402
66d935214d8e
(Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents:
11263
diff
changeset
|
775 } |
|
66d935214d8e
(Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents:
11263
diff
changeset
|
776 |
|
2154
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
777 DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0, |
| 305 | 778 "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
|
779 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
|
780 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
|
781 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
|
782 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
|
783 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
|
784 (HIGH . LOW)\n\ |
|
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
785 or the form:\n\ |
|
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
786 (HIGH LOW . IGNORED).\n\ |
|
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
787 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
|
788 and from `file-attributes'.") |
|
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
789 (specified_time) |
|
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
790 Lisp_Object specified_time; |
| 305 | 791 { |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
792 time_t value; |
| 305 | 793 char buf[30]; |
|
2154
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
794 register char *tem; |
|
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
795 |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
796 if (! lisp_time_argument (specified_time, &value)) |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
797 value = -1; |
|
2154
69c58e548ca5
(Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents:
2049
diff
changeset
|
798 tem = (char *) ctime (&value); |
| 305 | 799 |
| 800 strncpy (buf, tem, 24); | |
| 801 buf[24] = 0; | |
| 802 | |
| 803 return build_string (buf); | |
| 804 } | |
|
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
805 |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
806 #define TM_YEAR_ORIGIN 1900 |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
807 |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
808 /* Yield A - B, measured in seconds. */ |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
809 static long |
| 5882 | 810 difftm (a, b) |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
811 struct tm *a, *b; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
812 { |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
813 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
|
814 int by = b->tm_year + (TM_YEAR_ORIGIN - 1); |
| 5882 | 815 /* Some compilers can't handle this as a single return statement. */ |
|
7710
36420d9e4b41
(difftm): Don't store a long value into an int variable.
Richard M. Stallman <rms@gnu.org>
parents:
7519
diff
changeset
|
816 long days = ( |
| 5882 | 817 /* difference in day of year */ |
| 818 a->tm_yday - b->tm_yday | |
| 819 /* + intervening leap days */ | |
| 820 + ((ay >> 2) - (by >> 2)) | |
| 821 - (ay/100 - by/100) | |
| 822 + ((ay/100 >> 2) - (by/100 >> 2)) | |
| 823 /* + difference in years * 365 */ | |
| 824 + (long)(ay-by) * 365 | |
| 825 ); | |
| 826 return (60*(60*(24*days + (a->tm_hour - b->tm_hour)) | |
| 827 + (a->tm_min - b->tm_min)) | |
| 828 + (a->tm_sec - b->tm_sec)); | |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
829 } |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
830 |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
831 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
|
832 "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
|
833 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
|
834 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
|
835 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
|
836 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
|
837 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
|
838 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
|
839 (HIGH . LOW)\n\ |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
840 or the form:\n\ |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
841 (HIGH LOW . IGNORED).\n\ |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
842 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
|
843 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
|
844 \n\ |
|
4a7e1c2a2a9e
* editfns.c (Fcurrent_time_zone): Return a list whose elements are
Jim Blandy <jimb@redhat.com>
parents:
2384
diff
changeset
|
845 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
|
846 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
|
847 the data it can't find.") |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
848 (specified_time) |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
849 Lisp_Object specified_time; |
|
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
850 { |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
851 time_t value; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
852 struct tm *t; |
|
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
853 |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
854 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
|
855 && (t = gmtime (&value)) != 0) |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
856 { |
|
2976
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
857 struct tm gmt; |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
858 long offset; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
859 char *s, buf[6]; |
|
2976
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
860 |
|
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
861 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
|
862 t = localtime (&value); |
|
6fe71a039fce
(Fcurrent_time_zone): Assign gmt, instead of init.
Richard M. Stallman <rms@gnu.org>
parents:
2962
diff
changeset
|
863 offset = difftm (t, &gmt); |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
864 s = 0; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
865 #ifdef HAVE_TM_ZONE |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
866 if (t->tm_zone) |
|
7506
9fa47d36798a
(Fcurrent_time_zone): Add cast.
Richard M. Stallman <rms@gnu.org>
parents:
7485
diff
changeset
|
867 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
|
868 #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
|
869 #ifdef HAVE_TZNAME |
|
dc9f7a107e28
(Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents:
2994
diff
changeset
|
870 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
|
871 s = tzname[t->tm_isdst]; |
|
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
872 #endif |
|
3522
dc9f7a107e28
(Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents:
2994
diff
changeset
|
873 #endif /* not HAVE_TM_ZONE */ |
|
2921
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
874 if (!s) |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
875 { |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
876 /* 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
|
877 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
|
878 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
|
879 s = buf; |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
880 } |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
881 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
|
882 } |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
883 else |
|
37503f466755
Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
884 return Fmake_list (2, Qnil); |
|
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
885 } |
|
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
886 |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
887 /* This holds the value of `environ' produced by the previous |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
888 call to Fset_time_zone_rule, or 0 if Fset_time_zone_rule |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
889 has never been called. */ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
890 static char **environbuf; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
891 |
|
13019
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
892 DEFUN ("set-time-zone-rule", Fset_time_zone_rule, Sset_time_zone_rule, 1, 1, 0, |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
893 "Set the local time zone using TZ, a string specifying a time zone rule.\n\ |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
894 If TZ is nil, use implementation-defined default time zone information.") |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
895 (tz) |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
896 Lisp_Object tz; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
897 { |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
898 char *tzstring; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
899 |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
900 if (NILP (tz)) |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
901 tzstring = 0; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
902 else |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
903 { |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
904 CHECK_STRING (tz, 0); |
|
13347
186d80572f4f
(Fencode_time): Add cast.
Richard M. Stallman <rms@gnu.org>
parents:
13238
diff
changeset
|
905 tzstring = (char *) XSTRING (tz)->data; |
|
13019
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
906 } |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
907 |
|
13025
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
908 set_time_zone_rule (tzstring); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
909 if (environbuf) |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
910 free (environbuf); |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
911 environbuf = environ; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
912 |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
913 return Qnil; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
914 } |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
915 |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
916 /* Set the local time zone rule to TZSTRING. |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
917 This allocates memory into `environ', which it is the caller's |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
918 responsibility to free. */ |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
919 static void |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
920 set_time_zone_rule (tzstring) |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
921 char *tzstring; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
922 { |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
923 int envptrs; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
924 char **from, **to, **newenv; |
|
1eab52043f10
(Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents:
13019
diff
changeset
|
925 |
|
13019
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
926 for (from = environ; *from; from++) |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
927 continue; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
928 envptrs = from - environ + 2; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
929 newenv = to = (char **) xmalloc (envptrs * sizeof (char *) |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
930 + (tzstring ? strlen (tzstring) + 4 : 0)); |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
931 if (tzstring) |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
932 { |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
933 char *t = (char *) (to + envptrs); |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
934 strcpy (t, "TZ="); |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
935 strcat (t, tzstring); |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
936 *to++ = t; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
937 } |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
938 |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
939 for (from = environ; *from; from++) |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
940 if (strncmp (*from, "TZ=", 3) != 0) |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
941 *to++ = *from; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
942 *to = 0; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
943 |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
944 environ = newenv; |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
945 |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
946 #ifdef LOCALTIME_CACHE |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
947 tzset (); |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
948 #endif |
|
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
949 } |
| 305 | 950 |
| 951 void | |
| 952 insert1 (arg) | |
| 953 Lisp_Object arg; | |
| 954 { | |
| 955 Finsert (1, &arg); | |
| 956 } | |
| 957 | |
| 330 | 958 |
| 959 /* Callers passing one argument to Finsert need not gcpro the | |
| 960 argument "array", since the only element of the array will | |
| 961 not be used after calling insert or insert_from_string, so | |
| 962 we don't care if it gets trashed. */ | |
| 963 | |
| 305 | 964 DEFUN ("insert", Finsert, Sinsert, 0, MANY, 0, |
| 965 "Insert the arguments, either strings or characters, at point.\n\ | |
| 966 Point moves forward so that it ends up after the inserted text.\n\ | |
| 967 Any other markers at the point of insertion remain before the text.") | |
| 968 (nargs, args) | |
| 969 int nargs; | |
| 970 register Lisp_Object *args; | |
| 971 { | |
| 972 register int argnum; | |
| 973 register Lisp_Object tem; | |
| 974 char str[1]; | |
| 975 | |
| 976 for (argnum = 0; argnum < nargs; argnum++) | |
| 977 { | |
| 978 tem = args[argnum]; | |
| 979 retry: | |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
980 if (INTEGERP (tem)) |
| 305 | 981 { |
| 982 str[0] = XINT (tem); | |
| 983 insert (str, 1); | |
| 984 } | |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
985 else if (STRINGP (tem)) |
| 305 | 986 { |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
987 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
|
988 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
989 else |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
990 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
991 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
|
992 goto retry; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
993 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
994 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
995 |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
996 return Qnil; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
997 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
998 |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
999 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
|
1000 0, MANY, 0, |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1001 "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
|
1002 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
|
1003 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
|
1004 (nargs, args) |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1005 int nargs; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1006 register Lisp_Object *args; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1007 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1008 register int argnum; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1009 register Lisp_Object tem; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1010 char str[1]; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1011 |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1012 for (argnum = 0; argnum < nargs; argnum++) |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1013 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1014 tem = args[argnum]; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1015 retry: |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1016 if (INTEGERP (tem)) |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1017 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1018 str[0] = XINT (tem); |
|
8667
abd7ff9a94da
(Finsert_and_inherit_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
8646
diff
changeset
|
1019 insert_and_inherit (str, 1); |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1020 } |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1021 else if (STRINGP (tem)) |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1022 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1023 insert_from_string (tem, 0, XSTRING (tem)->size, 1); |
| 305 | 1024 } |
| 1025 else | |
| 1026 { | |
| 1027 tem = wrong_type_argument (Qchar_or_string_p, tem); | |
| 1028 goto retry; | |
| 1029 } | |
| 1030 } | |
| 1031 | |
| 1032 return Qnil; | |
| 1033 } | |
| 1034 | |
| 1035 DEFUN ("insert-before-markers", Finsert_before_markers, Sinsert_before_markers, 0, MANY, 0, | |
| 1036 "Insert strings or characters at point, relocating markers after the text.\n\ | |
| 1037 Point moves forward so that it ends up after the inserted text.\n\ | |
| 1038 Any other markers at the point of insertion also end up after the text.") | |
| 1039 (nargs, args) | |
| 1040 int nargs; | |
| 1041 register Lisp_Object *args; | |
| 1042 { | |
| 1043 register int argnum; | |
| 1044 register Lisp_Object tem; | |
| 1045 char str[1]; | |
| 1046 | |
| 1047 for (argnum = 0; argnum < nargs; argnum++) | |
| 1048 { | |
| 1049 tem = args[argnum]; | |
| 1050 retry: | |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1051 if (INTEGERP (tem)) |
| 305 | 1052 { |
| 1053 str[0] = XINT (tem); | |
| 1054 insert_before_markers (str, 1); | |
| 1055 } | |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1056 else if (STRINGP (tem)) |
| 305 | 1057 { |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1058 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
|
1059 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1060 else |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1061 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1062 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
|
1063 goto retry; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1064 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1065 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1066 |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1067 return Qnil; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1068 } |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1069 |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1070 DEFUN ("insert-before-markers-and-inherit", |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1071 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
|
1072 0, MANY, 0, |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1073 "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
|
1074 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
|
1075 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
|
1076 (nargs, args) |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1077 int nargs; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1078 register Lisp_Object *args; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1079 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1080 register int argnum; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1081 register Lisp_Object tem; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1082 char str[1]; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1083 |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1084 for (argnum = 0; argnum < nargs; argnum++) |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1085 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1086 tem = args[argnum]; |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1087 retry: |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1088 if (INTEGERP (tem)) |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1089 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1090 str[0] = XINT (tem); |
|
8667
abd7ff9a94da
(Finsert_and_inherit_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
8646
diff
changeset
|
1091 insert_before_markers_and_inherit (str, 1); |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1092 } |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1093 else if (STRINGP (tem)) |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1094 { |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1095 insert_from_string_before_markers (tem, 0, XSTRING (tem)->size, 1); |
| 305 | 1096 } |
| 1097 else | |
| 1098 { | |
| 1099 tem = wrong_type_argument (Qchar_or_string_p, tem); | |
| 1100 goto retry; | |
| 1101 } | |
| 1102 } | |
| 1103 | |
| 1104 return Qnil; | |
| 1105 } | |
| 1106 | |
|
8646
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1107 DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0, |
| 305 | 1108 "Insert COUNT (second arg) copies of CHAR (first arg).\n\ |
| 1109 Point and all markers are affected as in the function `insert'.\n\ | |
|
8646
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1110 Both arguments are required.\n\ |
|
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1111 The optional third arg INHERIT, if non-nil, says to inherit text properties\n\ |
|
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1112 from adjoining text, if those properties are sticky.") |
|
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1113 (chr, count, inherit) |
|
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1114 Lisp_Object chr, count, inherit; |
| 305 | 1115 { |
| 1116 register unsigned char *string; | |
| 1117 register int strlen; | |
| 1118 register int i, n; | |
| 1119 | |
| 1120 CHECK_NUMBER (chr, 0); | |
| 1121 CHECK_NUMBER (count, 1); | |
| 1122 | |
| 1123 n = XINT (count); | |
| 1124 if (n <= 0) | |
| 1125 return Qnil; | |
| 1126 strlen = min (n, 256); | |
| 1127 string = (unsigned char *) alloca (strlen); | |
| 1128 for (i = 0; i < strlen; i++) | |
| 1129 string[i] = XFASTINT (chr); | |
| 1130 while (n >= strlen) | |
| 1131 { | |
|
8646
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1132 if (!NILP (inherit)) |
|
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1133 insert_and_inherit (string, strlen); |
|
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1134 else |
|
0f05e3e89f87
(Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
8333
diff
changeset
|
1135 insert (string, strlen); |
| 305 | 1136 n -= strlen; |
| 1137 } | |
| 1138 if (n > 0) | |
|
10382
9738aad59697
(Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents:
10308
diff
changeset
|
1139 { |
|
9738aad59697
(Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents:
10308
diff
changeset
|
1140 if (!NILP (inherit)) |
|
9738aad59697
(Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents:
10308
diff
changeset
|
1141 insert_and_inherit (string, n); |
|
9738aad59697
(Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents:
10308
diff
changeset
|
1142 else |
|
9738aad59697
(Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents:
10308
diff
changeset
|
1143 insert (string, n); |
|
9738aad59697
(Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents:
10308
diff
changeset
|
1144 } |
| 305 | 1145 return Qnil; |
| 1146 } | |
| 1147 | |
| 1148 | |
| 648 | 1149 /* Making strings from buffer contents. */ |
| 1150 | |
| 1151 /* 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
|
1152 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
|
1153 has properties in the range specified, the resulting string will also |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1154 have them, if PROPS is nonzero. |
| 648 | 1155 |
| 1156 We don't want to use plain old make_string here, because it calls | |
| 1157 make_uninit_string, which can cause the buffer arena to be | |
| 1158 compacted. make_string has no way of knowing that the data has | |
| 1159 been moved, and thus copies the wrong data into the string. This | |
| 1160 doesn't effect most of the other users of make_string, so it should | |
| 1161 be left as is. But we should use this function when conjuring | |
| 1162 buffer substrings. */ | |
|
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
1163 |
| 648 | 1164 Lisp_Object |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1165 make_buffer_string (start, end, props) |
| 648 | 1166 int start, end; |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1167 int props; |
| 648 | 1168 { |
|
6772
6e53158ad17d
(make_buffer_string): Copy properties whenever we have some
Richard M. Stallman <rms@gnu.org>
parents:
6714
diff
changeset
|
1169 Lisp_Object result, tem, tem1; |
| 648 | 1170 |
| 1171 if (start < GPT && GPT < end) | |
| 1172 move_gap (start); | |
| 1173 | |
| 1174 result = make_uninit_string (end - start); | |
| 1175 bcopy (&FETCH_CHAR (start), XSTRING (result)->data, end - start); | |
| 1176 | |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1177 /* If desired, update and copy the text properties. */ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1178 #ifdef USE_TEXT_PROPERTIES |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1179 if (props) |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1180 { |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1181 update_buffer_properties (start, end); |
|
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1182 |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1183 tem = Fnext_property_change (make_number (start), Qnil, make_number (end)); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1184 tem1 = Ftext_properties_at (make_number (start), Qnil); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1185 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1186 if (XINT (tem) != end || !NILP (tem1)) |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1187 copy_intervals_to_string (result, current_buffer, start, end - start); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1188 } |
|
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1189 #endif |
|
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
1190 |
| 648 | 1191 return result; |
| 1192 } | |
| 305 | 1193 |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1194 /* Call Vbuffer_access_fontify_functions for the range START ... END |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1195 in the current buffer, if necessary. */ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1196 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1197 static void |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1198 update_buffer_properties (start, end) |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1199 int start, end; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1200 { |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1201 #ifdef USE_TEXT_PROPERTIES |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1202 /* If this buffer has some access functions, |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1203 call them, specifying the range of the buffer being accessed. */ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1204 if (!NILP (Vbuffer_access_fontify_functions)) |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1205 { |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1206 Lisp_Object args[3]; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1207 Lisp_Object tem; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1208 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1209 args[0] = Qbuffer_access_fontify_functions; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1210 XSETINT (args[1], start); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1211 XSETINT (args[2], end); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1212 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1213 /* But don't call them if we can tell that the work |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1214 has already been done. */ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1215 if (!NILP (Vbuffer_access_fontified_property)) |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1216 { |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1217 tem = Ftext_property_any (args[1], args[2], |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1218 Vbuffer_access_fontified_property, |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1219 Qnil, Qnil); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1220 if (! NILP (tem)) |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1221 Frun_hook_with_args (3, &args); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1222 } |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1223 else |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1224 Frun_hook_with_args (3, &args); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1225 } |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1226 #endif |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1227 } |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1228 |
| 305 | 1229 DEFUN ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0, |
| 1230 "Return the contents of part of the current buffer as a string.\n\ | |
| 1231 The two arguments START and END are character positions;\n\ | |
| 1232 they can be in either order.") | |
| 1233 (b, e) | |
| 1234 Lisp_Object b, e; | |
| 1235 { | |
| 1236 register int beg, end; | |
| 1237 | |
| 1238 validate_region (&b, &e); | |
| 1239 beg = XINT (b); | |
| 1240 end = XINT (e); | |
| 1241 | |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1242 return make_buffer_string (beg, end, 1); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1243 } |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1244 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1245 DEFUN ("buffer-substring-no-properties", Fbuffer_substring_no_properties, |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1246 Sbuffer_substring_no_properties, 2, 2, 0, |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1247 "Return the characters of part of the buffer, without the text properties.\n\ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1248 The two arguments START and END are character positions;\n\ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1249 they can be in either order.") |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1250 (b, e) |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1251 Lisp_Object b, e; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1252 { |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1253 register int beg, end; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1254 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1255 validate_region (&b, &e); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1256 beg = XINT (b); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1257 end = XINT (e); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1258 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1259 return make_buffer_string (beg, end, 0); |
| 305 | 1260 } |
| 1261 | |
| 1262 DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0, | |
|
11433
6f7bdb6c3739
(Fbuffer_string): Doc clarification.
Karl Heuer <kwzh@gnu.org>
parents:
11402
diff
changeset
|
1263 "Return the contents of the current buffer as a string.\n\ |
|
6f7bdb6c3739
(Fbuffer_string): Doc clarification.
Karl Heuer <kwzh@gnu.org>
parents:
11402
diff
changeset
|
1264 If narrowing is in effect, this function returns only the visible part\n\ |
|
6f7bdb6c3739
(Fbuffer_string): Doc clarification.
Karl Heuer <kwzh@gnu.org>
parents:
11402
diff
changeset
|
1265 of the buffer.") |
| 305 | 1266 () |
| 1267 { | |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1268 return make_buffer_string (BEGV, ZV, 1); |
| 305 | 1269 } |
| 1270 | |
| 1271 DEFUN ("insert-buffer-substring", Finsert_buffer_substring, Sinsert_buffer_substring, | |
| 1272 1, 3, 0, | |
|
3776
301e2dca5fd7
(Finsert_buffer_substring): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
3591
diff
changeset
|
1273 "Insert before point a substring of the contents of buffer BUFFER.\n\ |
| 305 | 1274 BUFFER may be a buffer or a buffer name.\n\ |
| 1275 Arguments START and END are character numbers specifying the substring.\n\ | |
| 1276 They default to the beginning and the end of BUFFER.") | |
| 1277 (buf, b, e) | |
| 1278 Lisp_Object buf, b, e; | |
| 1279 { | |
|
9657
0fc126c193e7
(Finsert_buffer_substring): Use insert_from_buffer instead of insert.
Karl Heuer <kwzh@gnu.org>
parents:
9572
diff
changeset
|
1280 register int beg, end, temp; |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1281 register struct buffer *bp, *obuf; |
|
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1282 Lisp_Object buffer; |
| 305 | 1283 |
|
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1284 buffer = Fget_buffer (buf); |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1285 if (NILP (buffer)) |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1286 nsberror (buf); |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1287 bp = XBUFFER (buffer); |
| 305 | 1288 |
| 488 | 1289 if (NILP (b)) |
| 305 | 1290 beg = BUF_BEGV (bp); |
| 1291 else | |
| 1292 { | |
| 1293 CHECK_NUMBER_COERCE_MARKER (b, 0); | |
| 1294 beg = XINT (b); | |
| 1295 } | |
| 488 | 1296 if (NILP (e)) |
| 305 | 1297 end = BUF_ZV (bp); |
| 1298 else | |
| 1299 { | |
| 1300 CHECK_NUMBER_COERCE_MARKER (e, 1); | |
| 1301 end = XINT (e); | |
| 1302 } | |
| 1303 | |
| 1304 if (beg > end) | |
|
1285
d50533e23dff
* editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents:
1254
diff
changeset
|
1305 temp = beg, beg = end, end = temp; |
| 305 | 1306 |
|
9657
0fc126c193e7
(Finsert_buffer_substring): Use insert_from_buffer instead of insert.
Karl Heuer <kwzh@gnu.org>
parents:
9572
diff
changeset
|
1307 if (!(BUF_BEGV (bp) <= beg && end <= BUF_ZV (bp))) |
| 305 | 1308 args_out_of_range (b, e); |
| 1309 | |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1310 obuf = current_buffer; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1311 set_buffer_internal_1 (bp); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1312 update_buffer_properties (beg, end); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1313 set_buffer_internal_1 (obuf); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
1314 |
|
9657
0fc126c193e7
(Finsert_buffer_substring): Use insert_from_buffer instead of insert.
Karl Heuer <kwzh@gnu.org>
parents:
9572
diff
changeset
|
1315 insert_from_buffer (bp, beg, end - beg, 0); |
| 305 | 1316 return Qnil; |
| 1317 } | |
|
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1318 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1319 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
|
1320 6, 6, 0, |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1321 "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
|
1322 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
|
1323 +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
|
1324 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
|
1325 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
|
1326 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
|
1327 determines whether case is significant or ignored.") |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1328 (buffer1, start1, end1, buffer2, start2, end2) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1329 Lisp_Object buffer1, start1, end1, buffer2, start2, end2; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1330 { |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1331 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
|
1332 register struct buffer *bp1, *bp2; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1333 register unsigned char *trt |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1334 = (!NILP (current_buffer->case_fold_search) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1335 ? XSTRING (current_buffer->case_canon_table)->data : 0); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1336 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1337 /* Find the first buffer and its substring. */ |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1338 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1339 if (NILP (buffer1)) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1340 bp1 = current_buffer; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1341 else |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1342 { |
|
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1343 Lisp_Object buf1; |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1344 buf1 = Fget_buffer (buffer1); |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1345 if (NILP (buf1)) |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1346 nsberror (buffer1); |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1347 bp1 = XBUFFER (buf1); |
|
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1348 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1349 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1350 if (NILP (start1)) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1351 begp1 = BUF_BEGV (bp1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1352 else |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1353 { |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1354 CHECK_NUMBER_COERCE_MARKER (start1, 1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1355 begp1 = XINT (start1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1356 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1357 if (NILP (end1)) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1358 endp1 = BUF_ZV (bp1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1359 else |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1360 { |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1361 CHECK_NUMBER_COERCE_MARKER (end1, 2); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1362 endp1 = XINT (end1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1363 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1364 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1365 if (begp1 > endp1) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1366 temp = begp1, begp1 = endp1, endp1 = temp; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1367 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1368 if (!(BUF_BEGV (bp1) <= begp1 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1369 && begp1 <= endp1 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1370 && endp1 <= BUF_ZV (bp1))) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1371 args_out_of_range (start1, end1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1372 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1373 /* Likewise for second substring. */ |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1374 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1375 if (NILP (buffer2)) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1376 bp2 = current_buffer; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1377 else |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1378 { |
|
1854
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1379 Lisp_Object buf2; |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1380 buf2 = Fget_buffer (buffer2); |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1381 if (NILP (buf2)) |
|
5a18c36181fa
(Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1853
diff
changeset
|
1382 nsberror (buffer2); |
|
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1383 bp2 = XBUFFER (buffer2); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1384 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1385 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1386 if (NILP (start2)) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1387 begp2 = BUF_BEGV (bp2); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1388 else |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1389 { |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1390 CHECK_NUMBER_COERCE_MARKER (start2, 4); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1391 begp2 = XINT (start2); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1392 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1393 if (NILP (end2)) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1394 endp2 = BUF_ZV (bp2); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1395 else |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1396 { |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1397 CHECK_NUMBER_COERCE_MARKER (end2, 5); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1398 endp2 = XINT (end2); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1399 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1400 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1401 if (begp2 > endp2) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1402 temp = begp2, begp2 = endp2, endp2 = temp; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1403 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1404 if (!(BUF_BEGV (bp2) <= begp2 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1405 && begp2 <= endp2 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1406 && endp2 <= BUF_ZV (bp2))) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1407 args_out_of_range (start2, end2); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1408 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1409 len1 = endp1 - begp1; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1410 len2 = endp2 - begp2; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1411 length = len1; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1412 if (len2 < length) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1413 length = len2; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1414 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1415 for (i = 0; i < length; i++) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1416 { |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1417 int c1 = *BUF_CHAR_ADDRESS (bp1, begp1 + i); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1418 int c2 = *BUF_CHAR_ADDRESS (bp2, begp2 + i); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1419 if (trt) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1420 { |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1421 c1 = trt[c1]; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1422 c2 = trt[c2]; |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1423 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1424 if (c1 < c2) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1425 return make_number (- 1 - i); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1426 if (c1 > c2) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1427 return make_number (i + 1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1428 } |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1429 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1430 /* The strings match as far as they go. |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1431 If one is shorter, that one is less. */ |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1432 if (length < len1) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1433 return make_number (length + 1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1434 else if (length < len2) |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1435 return make_number (- length - 1); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1436 |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1437 /* Same length too => they are equal. */ |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1438 return make_number (0); |
|
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
1439 } |
| 305 | 1440 |
|
10480
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1441 static Lisp_Object |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1442 subst_char_in_region_unwind (arg) |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1443 Lisp_Object arg; |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1444 { |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1445 return current_buffer->undo_list = arg; |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1446 } |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1447 |
|
12622
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1448 static Lisp_Object |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1449 subst_char_in_region_unwind_1 (arg) |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1450 Lisp_Object arg; |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1451 { |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1452 return current_buffer->filename = arg; |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1453 } |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1454 |
| 305 | 1455 DEFUN ("subst-char-in-region", Fsubst_char_in_region, |
| 1456 Ssubst_char_in_region, 4, 5, 0, | |
| 1457 "From START to END, replace FROMCHAR with TOCHAR each time it occurs.\n\ | |
| 1458 If optional arg NOUNDO is non-nil, don't record this change for undo\n\ | |
| 1459 and don't mark the buffer as really changed.") | |
| 1460 (start, end, fromchar, tochar, noundo) | |
| 1461 Lisp_Object start, end, fromchar, tochar, noundo; | |
| 1462 { | |
| 1463 register int pos, stop, look; | |
|
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1464 int changed = 0; |
|
10480
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1465 int count = specpdl_ptr - specpdl; |
| 305 | 1466 |
| 1467 validate_region (&start, &end); | |
| 1468 CHECK_NUMBER (fromchar, 2); | |
| 1469 CHECK_NUMBER (tochar, 3); | |
| 1470 | |
| 1471 pos = XINT (start); | |
| 1472 stop = XINT (end); | |
| 1473 look = XINT (fromchar); | |
| 1474 | |
|
10480
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1475 /* If we don't want undo, turn off putting stuff on the list. |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1476 That's faster than getting rid of things, |
|
12622
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1477 and it prevents even the entry for a first change. |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1478 Also inhibit locking the file. */ |
|
10480
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1479 if (!NILP (noundo)) |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1480 { |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1481 record_unwind_protect (subst_char_in_region_unwind, |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1482 current_buffer->undo_list); |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1483 current_buffer->undo_list = Qt; |
|
12622
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1484 /* Don't do file-locking. */ |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1485 record_unwind_protect (subst_char_in_region_unwind_1, |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1486 current_buffer->filename); |
|
205232bb7efe
(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents:
12603
diff
changeset
|
1487 current_buffer->filename = Qnil; |
|
10480
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1488 } |
|
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1489 |
| 305 | 1490 while (pos < stop) |
| 1491 { | |
| 1492 if (FETCH_CHAR (pos) == look) | |
| 1493 { | |
|
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1494 if (! changed) |
|
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1495 { |
|
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1496 modify_region (current_buffer, XINT (start), stop); |
|
5242
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1497 |
|
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1498 if (! NILP (noundo)) |
|
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1499 { |
|
10308
90784ed0416f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9812
diff
changeset
|
1500 if (MODIFF - 1 == SAVE_MODIFF) |
|
90784ed0416f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9812
diff
changeset
|
1501 SAVE_MODIFF++; |
|
5242
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1502 if (MODIFF - 1 == current_buffer->auto_save_modified) |
|
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1503 current_buffer->auto_save_modified++; |
|
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1504 } |
|
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1505 |
|
0e99ea9941e2
(Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents:
5130
diff
changeset
|
1506 changed = 1; |
|
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1507 } |
|
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1508 |
| 488 | 1509 if (NILP (noundo)) |
| 305 | 1510 record_change (pos, 1); |
| 1511 FETCH_CHAR (pos) = XINT (tochar); | |
| 1512 } | |
| 1513 pos++; | |
| 1514 } | |
| 1515 | |
|
5130
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1516 if (changed) |
|
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1517 signal_after_change (XINT (start), |
|
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1518 stop - XINT (start), stop - XINT (start)); |
|
ddee29e260d2
(make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents:
4943
diff
changeset
|
1519 |
|
10480
fbb254882b9f
(subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10383
diff
changeset
|
1520 unbind_to (count, Qnil); |
| 305 | 1521 return Qnil; |
| 1522 } | |
| 1523 | |
| 1524 DEFUN ("translate-region", Ftranslate_region, Stranslate_region, 3, 3, 0, | |
| 1525 "From START to END, translate characters according to TABLE.\n\ | |
| 1526 TABLE is a string; the Nth character in it is the mapping\n\ | |
| 1527 for the character with code N. Returns the number of characters changed.") | |
| 1528 (start, end, table) | |
| 1529 Lisp_Object start; | |
| 1530 Lisp_Object end; | |
| 1531 register Lisp_Object table; | |
| 1532 { | |
| 1533 register int pos, stop; /* Limits of the region. */ | |
| 1534 register unsigned char *tt; /* Trans table. */ | |
| 1535 register int oc; /* Old character. */ | |
| 1536 register int nc; /* New character. */ | |
| 1537 int cnt; /* Number of changes made. */ | |
| 1538 Lisp_Object z; /* Return. */ | |
| 1539 int size; /* Size of translate table. */ | |
| 1540 | |
| 1541 validate_region (&start, &end); | |
| 1542 CHECK_STRING (table, 2); | |
| 1543 | |
| 1544 size = XSTRING (table)->size; | |
| 1545 tt = XSTRING (table)->data; | |
| 1546 | |
| 1547 pos = XINT (start); | |
| 1548 stop = XINT (end); | |
|
2783
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2462
diff
changeset
|
1549 modify_region (current_buffer, pos, stop); |
| 305 | 1550 |
| 1551 cnt = 0; | |
| 1552 for (; pos < stop; ++pos) | |
| 1553 { | |
| 1554 oc = FETCH_CHAR (pos); | |
| 1555 if (oc < size) | |
| 1556 { | |
| 1557 nc = tt[oc]; | |
| 1558 if (nc != oc) | |
| 1559 { | |
| 1560 record_change (pos, 1); | |
| 1561 FETCH_CHAR (pos) = nc; | |
| 1562 signal_after_change (pos, 1, 1); | |
| 1563 ++cnt; | |
| 1564 } | |
| 1565 } | |
| 1566 } | |
| 1567 | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
1568 XSETFASTINT (z, cnt); |
| 305 | 1569 return (z); |
| 1570 } | |
| 1571 | |
| 1572 DEFUN ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r", | |
| 1573 "Delete the text between point and mark.\n\ | |
| 1574 When called from a program, expects two arguments,\n\ | |
| 1575 positions (integers or markers) specifying the stretch to be deleted.") | |
| 1576 (b, e) | |
| 1577 Lisp_Object b, e; | |
| 1578 { | |
| 1579 validate_region (&b, &e); | |
| 1580 del_range (XINT (b), XINT (e)); | |
| 1581 return Qnil; | |
| 1582 } | |
| 1583 | |
| 1584 DEFUN ("widen", Fwiden, Swiden, 0, 0, "", | |
| 1585 "Remove restrictions (narrowing) from current buffer.\n\ | |
| 1586 This allows the buffer's full text to be seen and edited.") | |
| 1587 () | |
| 1588 { | |
| 1589 BEGV = BEG; | |
| 1590 SET_BUF_ZV (current_buffer, Z); | |
|
12489
d0f5c21803e1
(Fwiden): Set clip_changed in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1591 current_buffer->clip_changed = 1; |
| 330 | 1592 /* Changing the buffer bounds invalidates any recorded current column. */ |
| 1593 invalidate_current_column (); | |
| 305 | 1594 return Qnil; |
| 1595 } | |
| 1596 | |
| 1597 DEFUN ("narrow-to-region", Fnarrow_to_region, Snarrow_to_region, 2, 2, "r", | |
| 1598 "Restrict editing in this buffer to the current region.\n\ | |
| 1599 The rest of the text becomes temporarily invisible and untouchable\n\ | |
| 1600 but is not deleted; if you save the buffer in a file, the invisible\n\ | |
| 1601 text is included in the file. \\[widen] makes all visible again.\n\ | |
| 1602 See also `save-restriction'.\n\ | |
| 1603 \n\ | |
| 1604 When calling from a program, pass two arguments; positions (integers\n\ | |
| 1605 or markers) bounding the text that should remain visible.") | |
| 1606 (b, e) | |
| 1607 register Lisp_Object b, e; | |
| 1608 { | |
| 1609 CHECK_NUMBER_COERCE_MARKER (b, 0); | |
| 1610 CHECK_NUMBER_COERCE_MARKER (e, 1); | |
| 1611 | |
| 1612 if (XINT (b) > XINT (e)) | |
| 1613 { | |
|
10383
a7fe0fb11314
(Fnarrow_to_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
10382
diff
changeset
|
1614 Lisp_Object tem; |
|
a7fe0fb11314
(Fnarrow_to_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
10382
diff
changeset
|
1615 tem = b; b = e; e = tem; |
| 305 | 1616 } |
| 1617 | |
| 1618 if (!(BEG <= XINT (b) && XINT (b) <= XINT (e) && XINT (e) <= Z)) | |
| 1619 args_out_of_range (b, e); | |
| 1620 | |
| 1621 BEGV = XFASTINT (b); | |
| 1622 SET_BUF_ZV (current_buffer, XFASTINT (e)); | |
| 1623 if (point < XFASTINT (b)) | |
| 1624 SET_PT (XFASTINT (b)); | |
| 1625 if (point > XFASTINT (e)) | |
| 1626 SET_PT (XFASTINT (e)); | |
|
12489
d0f5c21803e1
(Fwiden): Set clip_changed in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1627 current_buffer->clip_changed = 1; |
| 330 | 1628 /* Changing the buffer bounds invalidates any recorded current column. */ |
| 1629 invalidate_current_column (); | |
| 305 | 1630 return Qnil; |
| 1631 } | |
| 1632 | |
| 1633 Lisp_Object | |
| 1634 save_restriction_save () | |
| 1635 { | |
| 1636 register Lisp_Object bottom, top; | |
| 1637 /* Note: I tried using markers here, but it does not win | |
| 1638 because insertion at the end of the saved region | |
| 1639 does not advance mh and is considered "outside" the saved region. */ | |
|
9305
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
1640 XSETFASTINT (bottom, BEGV - BEG); |
|
ac077e2a75f1
(Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents:
9265
diff
changeset
|
1641 XSETFASTINT (top, Z - ZV); |
| 305 | 1642 |
| 1643 return Fcons (Fcurrent_buffer (), Fcons (bottom, top)); | |
| 1644 } | |
| 1645 | |
| 1646 Lisp_Object | |
| 1647 save_restriction_restore (data) | |
| 1648 Lisp_Object data; | |
| 1649 { | |
| 1650 register struct buffer *buf; | |
| 1651 register int newhead, newtail; | |
| 1652 register Lisp_Object tem; | |
| 1653 | |
| 1654 buf = XBUFFER (XCONS (data)->car); | |
| 1655 | |
| 1656 data = XCONS (data)->cdr; | |
| 1657 | |
| 1658 tem = XCONS (data)->car; | |
| 1659 newhead = XINT (tem); | |
| 1660 tem = XCONS (data)->cdr; | |
| 1661 newtail = XINT (tem); | |
| 1662 if (newhead + newtail > BUF_Z (buf) - BUF_BEG (buf)) | |
| 1663 { | |
| 1664 newhead = 0; | |
| 1665 newtail = 0; | |
| 1666 } | |
| 1667 BUF_BEGV (buf) = BUF_BEG (buf) + newhead; | |
| 1668 SET_BUF_ZV (buf, BUF_Z (buf) - newtail); | |
|
12489
d0f5c21803e1
(Fwiden): Set clip_changed in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1669 current_buffer->clip_changed = 1; |
| 305 | 1670 |
| 1671 /* If point is outside the new visible range, move it inside. */ | |
| 1672 SET_BUF_PT (buf, | |
| 1673 clip_to_bounds (BUF_BEGV (buf), BUF_PT (buf), BUF_ZV (buf))); | |
| 1674 | |
| 1675 return Qnil; | |
| 1676 } | |
| 1677 | |
| 1678 DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0, | |
| 1679 "Execute BODY, saving and restoring current buffer's restrictions.\n\ | |
| 1680 The buffer's restrictions make parts of the beginning and end invisible.\n\ | |
| 1681 \(They are set up with `narrow-to-region' and eliminated with `widen'.)\n\ | |
| 1682 This special form, `save-restriction', saves the current buffer's restrictions\n\ | |
| 1683 when it is entered, and restores them when it is exited.\n\ | |
| 1684 So any `narrow-to-region' within BODY lasts only until the end of the form.\n\ | |
| 1685 The old restrictions settings are restored\n\ | |
| 1686 even in case of abnormal exit (throw or error).\n\ | |
| 1687 \n\ | |
| 1688 The value returned is the value of the last form in BODY.\n\ | |
| 1689 \n\ | |
| 1690 `save-restriction' can get confused if, within the BODY, you widen\n\ | |
| 1691 and then make changes outside the area within the saved restrictions.\n\ | |
| 1692 \n\ | |
| 1693 Note: if you are using both `save-excursion' and `save-restriction',\n\ | |
| 1694 use `save-excursion' outermost:\n\ | |
| 1695 (save-excursion (save-restriction ...))") | |
| 1696 (body) | |
| 1697 Lisp_Object body; | |
| 1698 { | |
| 1699 register Lisp_Object val; | |
| 1700 int count = specpdl_ptr - specpdl; | |
| 1701 | |
| 1702 record_unwind_protect (save_restriction_restore, save_restriction_save ()); | |
| 1703 val = Fprogn (body); | |
| 1704 return unbind_to (count, val); | |
| 1705 } | |
| 1706 | |
|
5884
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1707 /* 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
|
1708 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
|
1709 |
|
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1710 /* 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
|
1711 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
|
1712 |
| 305 | 1713 DEFUN ("message", Fmessage, Smessage, 1, MANY, 0, |
| 1714 "Print a one-line message at the bottom of the screen.\n\ | |
| 12602 | 1715 The first argument is a format control string, and the rest are data\n\ |
| 1716 to be formatted under control of the string. See `format' for details.\n\ | |
| 1717 \n\ | |
|
1426
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1718 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
|
1719 minibuffer contents show.") |
| 305 | 1720 (nargs, args) |
| 1721 int nargs; | |
| 1722 Lisp_Object *args; | |
| 1723 { | |
|
1426
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1724 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
|
1725 { |
|
e21c1f3e37cb
* editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents:
1854
diff
changeset
|
1726 message (0); |
|
e21c1f3e37cb
* editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents:
1854
diff
changeset
|
1727 return Qnil; |
|
e21c1f3e37cb
* editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents:
1854
diff
changeset
|
1728 } |
|
1426
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1729 else |
|
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1730 { |
|
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1731 register Lisp_Object val; |
|
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1732 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
|
1733 /* 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
|
1734 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
|
1735 { |
|
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1736 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
|
1737 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
|
1738 } |
|
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1739 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
|
1740 { |
|
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1741 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
|
1742 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
|
1743 } |
|
d02095ea13a5
(Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents:
5882
diff
changeset
|
1744 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
|
1745 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
|
1746 return val; |
|
67fd35416ba3
* * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents:
1285
diff
changeset
|
1747 } |
| 305 | 1748 } |
| 1749 | |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1750 DEFUN ("message-box", Fmessage_box, Smessage_box, 1, MANY, 0, |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1751 "Display a message, in a dialog box if possible.\n\ |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1752 If a dialog box is not available, use the echo area.\n\ |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1753 The first argument is a format control string, and the rest are data\n\ |
|
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1754 to be formatted under control of the string. See `format' for details.\n\ |
|
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1755 \n\ |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1756 If the first argument is nil, clear any existing message; let the\n\ |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1757 minibuffer contents show.") |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1758 (nargs, args) |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1759 int nargs; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1760 Lisp_Object *args; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1761 { |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1762 if (NILP (args[0])) |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1763 { |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1764 message (0); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1765 return Qnil; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1766 } |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1767 else |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1768 { |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1769 register Lisp_Object val; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1770 val = Fformat (nargs, args); |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1771 #ifdef HAVE_MENUS |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1772 { |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1773 Lisp_Object pane, menu, obj; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1774 struct gcpro gcpro1; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1775 pane = Fcons (Fcons (build_string ("OK"), Qt), Qnil); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1776 GCPRO1 (pane); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1777 menu = Fcons (val, pane); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1778 obj = Fx_popup_dialog (Qt, menu); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1779 UNGCPRO; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1780 return val; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1781 } |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1782 #else /* not HAVE_MENUS */ |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1783 /* Copy the data so that it won't move when we GC. */ |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1784 if (! message_text) |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1785 { |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1786 message_text = (char *)xmalloc (80); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1787 message_length = 80; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1788 } |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1789 if (XSTRING (val)->size > message_length) |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1790 { |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1791 message_length = XSTRING (val)->size; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1792 message_text = (char *)xrealloc (message_text, message_length); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1793 } |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1794 bcopy (XSTRING (val)->data, message_text, XSTRING (val)->size); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1795 message2 (message_text, XSTRING (val)->size); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1796 return val; |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1797 #endif /* not HAVE_MENUS */ |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1798 } |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1799 } |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1800 #ifdef HAVE_MENUS |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1801 extern Lisp_Object last_nonmenu_event; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1802 #endif |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1803 |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1804 DEFUN ("message-or-box", Fmessage_or_box, Smessage_or_box, 1, MANY, 0, |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1805 "Display a message in a dialog box or in the echo area.\n\ |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1806 If this command was invoked with the mouse, use a dialog box.\n\ |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1807 Otherwise, use the echo area.\n\ |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1808 The first argument is a format control string, and the rest are data\n\ |
|
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1809 to be formatted under control of the string. See `format' for details.\n\ |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1810 \n\ |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1811 If the first argument is nil, clear any existing message; let the\n\ |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1812 minibuffer contents show.") |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1813 (nargs, args) |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1814 int nargs; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1815 Lisp_Object *args; |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1816 { |
|
13878
2a71500dfb93
(Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents:
13767
diff
changeset
|
1817 #ifdef HAVE_MENUS |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1818 if (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) |
|
8981
6e1a5ff3d795
(Fmessage_or_box): Use Fmessage_box with new name.
Richard M. Stallman <rms@gnu.org>
parents:
8975
diff
changeset
|
1819 return Fmessage_box (nargs, args); |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1820 #endif |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1821 return Fmessage (nargs, args); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1822 } |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
1823 |
| 305 | 1824 DEFUN ("format", Fformat, Sformat, 1, MANY, 0, |
| 1825 "Format a string out of a control-string and arguments.\n\ | |
| 1826 The first argument is a control string.\n\ | |
| 1827 The other arguments are substituted into it to make the result, a string.\n\ | |
| 1828 It may contain %-sequences meaning to substitute the next argument.\n\ | |
| 1829 %s means print a string argument. Actually, prints any object, with `princ'.\n\ | |
| 1830 %d means print as number in decimal (%o octal, %x hex).\n\ | |
| 12623 | 1831 %e means print a number in exponential notation.\n\ |
| 1832 %f means print a number in decimal-point notation.\n\ | |
| 1833 %g means print a number in exponential notation\n\ | |
| 1834 or decimal-point notation, whichever uses fewer characters.\n\ | |
| 305 | 1835 %c means print a number as a single character.\n\ |
| 1836 %S means print any object as an s-expression (using prin1).\n\ | |
| 12623 | 1837 The argument used for %d, %o, %x, %e, %f, %g or %c must be a number.\n\ |
| 330 | 1838 Use %% to put a single % into the output.") |
| 305 | 1839 (nargs, args) |
| 1840 int nargs; | |
| 1841 register Lisp_Object *args; | |
| 1842 { | |
| 1843 register int n; /* The number of the next arg to substitute */ | |
| 1844 register int total = 5; /* An estimate of the final length */ | |
| 1845 char *buf; | |
| 1846 register unsigned char *format, *end; | |
| 1847 int length; | |
| 1848 extern char *index (); | |
| 1849 /* It should not be necessary to GCPRO ARGS, because | |
| 1850 the caller in the interpreter should take care of that. */ | |
| 1851 | |
| 1852 CHECK_STRING (args[0], 0); | |
| 1853 format = XSTRING (args[0])->data; | |
| 1854 end = format + XSTRING (args[0])->size; | |
| 1855 | |
| 1856 n = 0; | |
| 1857 while (format != end) | |
| 1858 if (*format++ == '%') | |
| 1859 { | |
| 1860 int minlen; | |
| 1861 | |
| 1862 /* Process a numeric arg and skip it. */ | |
| 1863 minlen = atoi (format); | |
|
12831
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1864 if (minlen < 0) |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1865 minlen = - minlen; |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1866 |
| 305 | 1867 while ((*format >= '0' && *format <= '9') |
| 1868 || *format == '-' || *format == ' ' || *format == '.') | |
| 1869 format++; | |
| 1870 | |
| 1871 if (*format == '%') | |
| 1872 format++; | |
| 1873 else if (++n >= nargs) | |
|
12831
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1874 error ("Not enough arguments for format string"); |
| 305 | 1875 else if (*format == 'S') |
| 1876 { | |
| 1877 /* For `S', prin1 the argument and then treat like a string. */ | |
| 1878 register Lisp_Object tem; | |
| 1879 tem = Fprin1_to_string (args[n], Qnil); | |
| 1880 args[n] = tem; | |
| 1881 goto string; | |
| 1882 } | |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1883 else if (SYMBOLP (args[n])) |
| 305 | 1884 { |
|
9265
e44908d7323b
(Fcurrent_time, Fformat): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
parents:
9163
diff
changeset
|
1885 XSETSTRING (args[n], XSYMBOL (args[n])->name); |
| 305 | 1886 goto string; |
| 1887 } | |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1888 else if (STRINGP (args[n])) |
| 305 | 1889 { |
| 1890 string: | |
|
6528
d0f6a386b7cb
(Fformat): Validate number and type of arguments.
Karl Heuer <kwzh@gnu.org>
parents:
6206
diff
changeset
|
1891 if (*format != 's' && *format != 'S') |
|
d0f6a386b7cb
(Fformat): Validate number and type of arguments.
Karl Heuer <kwzh@gnu.org>
parents:
6206
diff
changeset
|
1892 error ("format specifier doesn't match argument type"); |
| 305 | 1893 total += XSTRING (args[n])->size; |
|
12831
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1894 /* We have to put an arbitrary limit on minlen |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1895 since otherwise it could make alloca fail. */ |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1896 if (minlen < XSTRING (args[n])->size + 1000) |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1897 total += minlen; |
| 305 | 1898 } |
| 1899 /* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */ | |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1900 else if (INTEGERP (args[n]) && *format != 's') |
| 305 | 1901 { |
| 621 | 1902 #ifdef LISP_FLOAT_TYPE |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3522
diff
changeset
|
1903 /* The following loop assumes the Lisp type indicates |
| 305 | 1904 the proper way to pass the argument. |
| 1905 So make sure we have a flonum if the argument should | |
| 1906 be a double. */ | |
| 1907 if (*format == 'e' || *format == 'f' || *format == 'g') | |
| 1908 args[n] = Ffloat (args[n]); | |
| 621 | 1909 #endif |
|
11710
0652683b14e6
(Fencode_time): Rename arg from min to minute.
Richard M. Stallman <rms@gnu.org>
parents:
11477
diff
changeset
|
1910 total += 30; |
|
12831
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1911 /* We have to put an arbitrary limit on minlen |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1912 since otherwise it could make alloca fail. */ |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1913 if (minlen < 1000) |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1914 total += minlen; |
| 305 | 1915 } |
| 621 | 1916 #ifdef LISP_FLOAT_TYPE |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1917 else if (FLOATP (args[n]) && *format != 's') |
| 305 | 1918 { |
| 1919 if (! (*format == 'e' || *format == 'f' || *format == 'g')) | |
| 1920 args[n] = Ftruncate (args[n]); | |
|
11710
0652683b14e6
(Fencode_time): Rename arg from min to minute.
Richard M. Stallman <rms@gnu.org>
parents:
11477
diff
changeset
|
1921 total += 30; |
|
12831
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1922 /* We have to put an arbitrary limit on minlen |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1923 since otherwise it could make alloca fail. */ |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1924 if (minlen < 1000) |
|
3917c5d131d3
(Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents:
12623
diff
changeset
|
1925 total += minlen; |
| 305 | 1926 } |
| 621 | 1927 #endif |
| 305 | 1928 else |
| 1929 { | |
| 1930 /* Anything but a string, convert to a string using princ. */ | |
| 1931 register Lisp_Object tem; | |
| 1932 tem = Fprin1_to_string (args[n], Qt); | |
| 1933 args[n] = tem; | |
| 1934 goto string; | |
| 1935 } | |
| 1936 } | |
| 1937 | |
| 1938 { | |
| 1939 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
|
1940 |
|
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1941 /* 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
|
1942 two slots, and we're not sure how many of those we have. */ |
| 305 | 1943 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
|
1944 = (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
|
1945 int i; |
| 305 | 1946 |
|
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1947 i = 0; |
| 305 | 1948 for (n = 0; n < nstrings; n++) |
| 1949 { | |
| 1950 if (n >= nargs) | |
|
4019
0463aae99f4e
* editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents:
3776
diff
changeset
|
1951 strings[i++] = (unsigned char *) ""; |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1952 else if (INTEGERP (args[n])) |
| 305 | 1953 /* We checked above that the corresponding format effector |
| 1954 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
|
1955 strings[i++] = (unsigned char *) XINT (args[n]); |
| 621 | 1956 #ifdef LISP_FLOAT_TYPE |
|
9163
41fe5f636879
(lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents:
9154
diff
changeset
|
1957 else if (FLOATP (args[n])) |
| 305 | 1958 { |
|
11877
1c98f33055fa
(Fformat): Split double into two pointers, not two ints.
Karl Heuer <kwzh@gnu.org>
parents:
11711
diff
changeset
|
1959 union { double d; char *half[2]; } u; |
| 305 | 1960 |
| 1961 u.d = XFLOAT (args[n])->data; | |
|
11877
1c98f33055fa
(Fformat): Split double into two pointers, not two ints.
Karl Heuer <kwzh@gnu.org>
parents:
11711
diff
changeset
|
1962 strings[i++] = (unsigned char *) u.half[0]; |
|
1c98f33055fa
(Fformat): Split double into two pointers, not two ints.
Karl Heuer <kwzh@gnu.org>
parents:
11711
diff
changeset
|
1963 strings[i++] = (unsigned char *) u.half[1]; |
| 305 | 1964 } |
| 621 | 1965 #endif |
|
13450
9a1e7191803f
(Fformat): Use doprnt_lisp.
Richard M. Stallman <rms@gnu.org>
parents:
13347
diff
changeset
|
1966 else if (i == 0) |
|
9a1e7191803f
(Fformat): Use doprnt_lisp.
Richard M. Stallman <rms@gnu.org>
parents:
13347
diff
changeset
|
1967 /* The first string is treated differently |
|
9a1e7191803f
(Fformat): Use doprnt_lisp.
Richard M. Stallman <rms@gnu.org>
parents:
13347
diff
changeset
|
1968 because it is the format string. */ |
|
9a1e7191803f
(Fformat): Use doprnt_lisp.
Richard M. Stallman <rms@gnu.org>
parents:
13347
diff
changeset
|
1969 strings[i++] = XSTRING (args[n])->data; |
| 305 | 1970 else |
|
13450
9a1e7191803f
(Fformat): Use doprnt_lisp.
Richard M. Stallman <rms@gnu.org>
parents:
13347
diff
changeset
|
1971 strings[i++] = (unsigned char *) XFASTINT (args[n]); |
| 305 | 1972 } |
| 1973 | |
|
12603
6d033c8501d4
(Fformat): Increment total for size of control string.
Richard M. Stallman <rms@gnu.org>
parents:
12602
diff
changeset
|
1974 /* Make room in result for all the non-%-codes in the control string. */ |
|
6d033c8501d4
(Fformat): Increment total for size of control string.
Richard M. Stallman <rms@gnu.org>
parents:
12602
diff
changeset
|
1975 total += XSTRING (args[0])->size; |
|
6d033c8501d4
(Fformat): Increment total for size of control string.
Richard M. Stallman <rms@gnu.org>
parents:
12602
diff
changeset
|
1976 |
| 305 | 1977 /* Format it in bigger and bigger buf's until it all fits. */ |
| 1978 while (1) | |
| 1979 { | |
| 1980 buf = (char *) alloca (total + 1); | |
| 1981 buf[total - 1] = 0; | |
| 1982 | |
|
13450
9a1e7191803f
(Fformat): Use doprnt_lisp.
Richard M. Stallman <rms@gnu.org>
parents:
13347
diff
changeset
|
1983 length = doprnt_lisp (buf, total + 1, strings[0], |
|
9a1e7191803f
(Fformat): Use doprnt_lisp.
Richard M. Stallman <rms@gnu.org>
parents:
13347
diff
changeset
|
1984 end, i-1, strings + 1); |
| 305 | 1985 if (buf[total - 1] == 0) |
| 1986 break; | |
| 1987 | |
| 1988 total *= 2; | |
| 1989 } | |
| 1990 } | |
| 1991 | |
| 1992 /* UNGCPRO; */ | |
| 1993 return make_string (buf, length); | |
| 1994 } | |
| 1995 | |
| 1996 /* VARARGS 1 */ | |
| 1997 Lisp_Object | |
| 1998 #ifdef NO_ARG_ARRAY | |
| 1999 format1 (string1, arg0, arg1, arg2, arg3, arg4) | |
|
8824
589f82d1bb32
(Fnarrow_to_region, format1): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8771
diff
changeset
|
2000 EMACS_INT arg0, arg1, arg2, arg3, arg4; |
| 305 | 2001 #else |
| 2002 format1 (string1) | |
| 2003 #endif | |
| 2004 char *string1; | |
| 2005 { | |
| 2006 char buf[100]; | |
| 2007 #ifdef NO_ARG_ARRAY | |
|
8824
589f82d1bb32
(Fnarrow_to_region, format1): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8771
diff
changeset
|
2008 EMACS_INT args[5]; |
| 305 | 2009 args[0] = arg0; |
| 2010 args[1] = arg1; | |
| 2011 args[2] = arg2; | |
| 2012 args[3] = arg3; | |
| 2013 args[4] = arg4; | |
| 11912 | 2014 doprnt (buf, sizeof buf, string1, (char *)0, 5, args); |
| 305 | 2015 #else |
| 11912 | 2016 doprnt (buf, sizeof buf, string1, (char *)0, 5, &string1 + 1); |
| 305 | 2017 #endif |
| 2018 return build_string (buf); | |
| 2019 } | |
| 2020 | |
| 2021 DEFUN ("char-equal", Fchar_equal, Schar_equal, 2, 2, 0, | |
| 2022 "Return t if two characters match, optionally ignoring case.\n\ | |
| 2023 Both arguments must be characters (i.e. integers).\n\ | |
| 2024 Case is ignored if `case-fold-search' is non-nil in the current buffer.") | |
| 2025 (c1, c2) | |
| 2026 register Lisp_Object c1, c2; | |
| 2027 { | |
|
13238
10a489bbf5c3
(Fchar_equal): Handle char-table as case table.
Richard M. Stallman <rms@gnu.org>
parents:
13025
diff
changeset
|
2028 Lisp_Object *downcase = DOWNCASE_TABLE; |
| 305 | 2029 CHECK_NUMBER (c1, 0); |
| 2030 CHECK_NUMBER (c2, 1); | |
| 2031 | |
| 488 | 2032 if (!NILP (current_buffer->case_fold_search) |
|
13238
10a489bbf5c3
(Fchar_equal): Handle char-table as case table.
Richard M. Stallman <rms@gnu.org>
parents:
13025
diff
changeset
|
2033 ? ((XINT (downcase[0xff & XFASTINT (c1)]) |
|
10a489bbf5c3
(Fchar_equal): Handle char-table as case table.
Richard M. Stallman <rms@gnu.org>
parents:
13025
diff
changeset
|
2034 == XINT (downcase[0xff & XFASTINT (c2)])) |
|
2384
5ab51b7300e4
(Fchar_equal): Don't ignore high bits of character.
Richard M. Stallman <rms@gnu.org>
parents:
2154
diff
changeset
|
2035 && (XFASTINT (c1) & ~0xff) == (XFASTINT (c2) & ~0xff)) |
| 305 | 2036 : XINT (c1) == XINT (c2)) |
| 2037 return Qt; | |
| 2038 return Qnil; | |
| 2039 } | |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2040 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2041 /* 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
|
2042 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
|
2043 differ in size). |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2044 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2045 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
|
2046 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
|
2047 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
|
2048 |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2049 It's the caller's job to see that (start1 <= end1 <= start2 <= end2). */ |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2050 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2051 void |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2052 transpose_markers (start1, end1, start2, end2) |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2053 register int start1, end1, start2, end2; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2054 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2055 register int amt1, amt2, diff, mpos; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2056 register Lisp_Object marker; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2057 |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2058 /* Update point as if it were a marker. */ |
|
7519
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2059 if (PT < start1) |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2060 ; |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2061 else if (PT < end1) |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2062 TEMP_SET_PT (PT + (end2 - end1)); |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2063 else if (PT < start2) |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2064 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
|
2065 else if (PT < end2) |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2066 TEMP_SET_PT (PT - (start2 - start1)); |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2067 |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2068 /* We used to adjust the endpoints here to account for the gap, but that |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2069 isn't good enough. Even if we assume the caller has tried to move the |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2070 gap out of our way, it might still be at start1 exactly, for example; |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2071 and that places it `inside' the interval, for our purposes. The amount |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2072 of adjustment is nontrivial if there's a `denormalized' marker whose |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2073 position is between GPT and GPT + GAP_SIZE, so it's simpler to leave |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2074 the dirty work to Fmarker_position, below. */ |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2075 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2076 /* The difference between the region's lengths */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2077 diff = (end2 - start2) - (end1 - start1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2078 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2079 /* 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
|
2080 * region plus the distance between the regions. |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2081 */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2082 amt1 = (end2 - start2) + (start2 - end1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2083 amt2 = (end1 - start1) + (start2 - end1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2084 |
|
10308
90784ed0416f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9812
diff
changeset
|
2085 for (marker = BUF_MARKERS (current_buffer); !NILP (marker); |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2086 marker = XMARKER (marker)->chain) |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2087 { |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2088 mpos = Fmarker_position (marker); |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2089 if (mpos >= start1 && mpos < end2) |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2090 { |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2091 if (mpos < end1) |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2092 mpos += amt1; |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2093 else if (mpos < start2) |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2094 mpos += diff; |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2095 else |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2096 mpos -= amt2; |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2097 if (mpos > GPT) mpos += GAP_SIZE; |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2098 XMARKER (marker)->bufpos = mpos; |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2099 } |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2100 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2101 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2102 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2103 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
|
2104 "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
|
2105 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
|
2106 never changed in a transposition.\n\ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2107 \n\ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2108 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
|
2109 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
|
2110 \n\ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2111 Transposing beyond buffer boundaries is an error.") |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2112 (startr1, endr1, startr2, endr2, leave_markers) |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2113 Lisp_Object startr1, endr1, startr2, endr2, leave_markers; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2114 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2115 register int start1, end1, start2, end2, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2116 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
|
2117 unsigned char *start1_addr, *start2_addr, *temp; |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2118 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2119 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2120 INTERVAL cur_intv, tmp_interval1, tmp_interval_mid, tmp_interval2; |
|
10308
90784ed0416f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9812
diff
changeset
|
2121 cur_intv = BUF_INTERVALS (current_buffer); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2122 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2123 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2124 validate_region (&startr1, &endr1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2125 validate_region (&startr2, &endr2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2126 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2127 start1 = XFASTINT (startr1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2128 end1 = XFASTINT (endr1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2129 start2 = XFASTINT (startr2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2130 end2 = XFASTINT (endr2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2131 gap = GPT; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2132 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2133 /* Swap the regions if they're reversed. */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2134 if (start2 < end1) |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2135 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2136 register int glumph = start1; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2137 start1 = start2; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2138 start2 = glumph; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2139 glumph = end1; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2140 end1 = end2; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2141 end2 = glumph; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2142 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2143 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2144 len1 = end1 - start1; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2145 len2 = end2 - start2; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2146 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2147 if (start2 < end1) |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2148 error ("transposed regions not properly ordered"); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2149 else if (start1 == end1 || start2 == end2) |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2150 error ("transposed region may not be of length 0"); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2151 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2152 /* The possibilities are: |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2153 1. Adjacent (contiguous) regions, or separate but equal regions |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2154 (no, really equal, in this case!), or |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2155 2. Separate regions of unequal size. |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2156 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2157 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
|
2158 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
|
2159 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
|
2160 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
|
2161 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2162 /* 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
|
2163 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
|
2164 around it if necessary. This would be extremely efficient, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2165 especially considering that people are likely to do |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2166 transpositions near where they are working interactively, which |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2167 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
|
2168 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
|
2169 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
|
2170 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
|
2171 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
|
2172 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
|
2173 |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2174 /* 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
|
2175 we will operate on. */ |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2176 if (start1 < gap && gap < end2) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2177 { |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2178 if (gap - start1 < end2 - gap) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2179 move_gap (start1); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2180 else |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2181 move_gap (end2); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2182 } |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2183 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2184 /* 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
|
2185 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
|
2186 allocation... interesting. Later, don't fool with it now. */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2187 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2188 /* Working without memmove, for portability (sigh), so must be |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2189 careful of overlapping subsections of the array... */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2190 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2191 if (end1 == start2) /* adjacent regions */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2192 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2193 modify_region (current_buffer, start1, end2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2194 record_change (start1, len1 + len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2195 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2196 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2197 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2198 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2199 Fset_text_properties (start1, end2, Qnil, Qnil); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2200 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2201 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2202 /* First region smaller than second. */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2203 if (len1 < len2) |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2204 { |
|
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2205 /* 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
|
2206 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
|
2207 if (len2 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2208 temp = (unsigned char *) xmalloc (len2); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2209 else |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2210 temp = (unsigned char *) alloca (len2); |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2211 |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2212 /* Don't precompute these addresses. We have to compute them |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2213 at the last minute, because the relocating allocator might |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2214 have moved the buffer around during the xmalloc. */ |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2215 start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1); |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2216 start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2); |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2217 |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2218 bcopy (start2_addr, temp, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2219 bcopy (start1_addr, start1_addr + len2, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2220 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
|
2221 if (len2 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2222 free (temp); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2223 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2224 else |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2225 /* First region not smaller than second. */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2226 { |
|
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2227 if (len1 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2228 temp = (unsigned char *) xmalloc (len1); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2229 else |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2230 temp = (unsigned char *) alloca (len1); |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2231 start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1); |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2232 start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2233 bcopy (start1_addr, temp, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2234 bcopy (start2_addr, start1_addr, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2235 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
|
2236 if (len1 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2237 free (temp); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2238 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2239 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2240 graft_intervals_into_buffer (tmp_interval1, start1 + len2, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2241 len1, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2242 graft_intervals_into_buffer (tmp_interval2, start1, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2243 len2, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2244 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2245 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2246 /* Non-adjacent regions, because end1 != start2, bleagh... */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2247 else |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2248 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2249 if (len1 == len2) |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2250 /* Regions are same size, though, how nice. */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2251 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2252 modify_region (current_buffer, start1, end1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2253 modify_region (current_buffer, start2, end2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2254 record_change (start1, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2255 record_change (start2, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2256 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2257 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2258 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2259 Fset_text_properties (start1, end1, Qnil, Qnil); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2260 Fset_text_properties (start2, end2, Qnil, Qnil); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2261 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2262 |
|
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2263 if (len1 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2264 temp = (unsigned char *) xmalloc (len1); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2265 else |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2266 temp = (unsigned char *) alloca (len1); |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2267 start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1); |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2268 start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2269 bcopy (start1_addr, temp, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2270 bcopy (start2_addr, start1_addr, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2271 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
|
2272 if (len1 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2273 free (temp); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2274 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2275 graft_intervals_into_buffer (tmp_interval1, start2, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2276 len1, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2277 graft_intervals_into_buffer (tmp_interval2, start1, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2278 len2, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2279 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2280 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2281 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2282 else if (len1 < len2) /* Second region larger than first */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2283 /* 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
|
2284 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2285 len_mid = start2 - end1; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2286 modify_region (current_buffer, start1, end2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2287 record_change (start1, (end2 - start1)); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2288 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2289 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2290 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
|
2291 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2292 Fset_text_properties (start1, end2, Qnil, Qnil); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2293 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2294 |
|
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2295 /* holds region 2 */ |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2296 if (len2 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2297 temp = (unsigned char *) xmalloc (len2); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2298 else |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2299 temp = (unsigned char *) alloca (len2); |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2300 start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1); |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2301 start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2); |
|
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2302 bcopy (start2_addr, temp, len2); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2303 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
|
2304 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
|
2305 bcopy (temp, start1_addr, len2); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2306 if (len2 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2307 free (temp); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2308 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2309 graft_intervals_into_buffer (tmp_interval1, end2 - len1, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2310 len1, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2311 graft_intervals_into_buffer (tmp_interval_mid, start1 + len2, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2312 len_mid, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2313 graft_intervals_into_buffer (tmp_interval2, start1, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2314 len2, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2315 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2316 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2317 else |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2318 /* Second region smaller than first. */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2319 { |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2320 len_mid = start2 - end1; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2321 record_change (start1, (end2 - start1)); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2322 modify_region (current_buffer, start1, end2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2323 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2324 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2325 tmp_interval1 = copy_intervals (cur_intv, start1, len1); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2326 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
|
2327 tmp_interval2 = copy_intervals (cur_intv, start2, len2); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2328 Fset_text_properties (start1, end2, Qnil, Qnil); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2329 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2330 |
|
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2331 /* holds region 1 */ |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2332 if (len1 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2333 temp = (unsigned char *) xmalloc (len1); |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2334 else |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2335 temp = (unsigned char *) alloca (len1); |
|
7862
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2336 start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1); |
|
0b6f46029ea2
(transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents:
7710
diff
changeset
|
2337 start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2); |
|
7250
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2338 bcopy (start1_addr, temp, len1); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2339 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
|
2340 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
|
2341 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
|
2342 if (len1 > 20000) |
|
67bb3bb1b62d
(Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents:
7207
diff
changeset
|
2343 free (temp); |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2344 #ifdef USE_TEXT_PROPERTIES |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2345 graft_intervals_into_buffer (tmp_interval1, end2 - len1, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2346 len1, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2347 graft_intervals_into_buffer (tmp_interval_mid, start1 + len2, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2348 len_mid, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2349 graft_intervals_into_buffer (tmp_interval2, start1, |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2350 len2, current_buffer, 0); |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2351 #endif /* USE_TEXT_PROPERTIES */ |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2352 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2353 } |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2354 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2355 /* 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
|
2356 traverse the whole friggin marker list. Possible solutions: |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2357 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
|
2358 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
|
2359 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
|
2360 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
|
2361 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
|
2362 if (NILP (leave_markers)) |
|
7519
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2363 { |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2364 transpose_markers (start1, end1, start2, end2); |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2365 fix_overlays_in_range (start1, end2); |
|
987ab382275c
(Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents:
7506
diff
changeset
|
2366 } |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2367 |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2368 return Qnil; |
|
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2369 } |
| 305 | 2370 |
| 2371 | |
| 2372 void | |
| 2373 syms_of_editfns () | |
| 2374 { | |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2375 environbuf = 0; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2376 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2377 Qbuffer_access_fontify_functions |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2378 = intern ("buffer-access-fontify-functions"); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2379 staticpro (&Qbuffer_access_fontify_functions); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2380 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2381 DEFVAR_LISP ("buffer-access-fontify-functions", |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2382 &Vbuffer_access_fontify_functions, |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2383 "List of functions called by `buffer-substring' to fontify if necessary.\n\ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2384 Each function is called with two arguments which specify the range\n\ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2385 of the buffer being accessed."); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2386 Vbuffer_access_fontify_functions = Qnil; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2387 |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2388 DEFVAR_LISP ("buffer_access_fontified_property", |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2389 &Vbuffer_access_fontified_property, |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2390 "Property which (if non-nil) indicates text has been fontified.\n\ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2391 `buffer-substring' need not call the `buffer-access-fontify-functions'\n\ |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2392 functions if all the text being accessed has this property."); |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2393 Vbuffer_access_fontified_property = Qnil; |
|
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2394 |
|
8771
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2395 DEFVAR_LISP ("system-name", &Vsystem_name, |
|
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2396 "The name of the machine Emacs is running on."); |
|
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2397 |
|
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2398 DEFVAR_LISP ("user-full-name", &Vuser_full_name, |
|
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2399 "The full name of the user logged in."); |
|
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2400 |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
2401 DEFVAR_LISP ("user-login-name", &Vuser_login_name, |
|
8771
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2402 "The user's name, taken from environment variables if possible."); |
|
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2403 |
|
12026
505a894d943e
(syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents:
11912
diff
changeset
|
2404 DEFVAR_LISP ("user-real-login-name", &Vuser_real_login_name, |
|
8771
31b8e48045f3
(syms_of_editfns): Make Vsystem_name and Vuser...name lisp variables again.
Karl Heuer <kwzh@gnu.org>
parents:
8667
diff
changeset
|
2405 "The user's name, based upon the real uid only."); |
| 305 | 2406 |
| 2407 defsubr (&Schar_equal); | |
| 2408 defsubr (&Sgoto_char); | |
| 2409 defsubr (&Sstring_to_char); | |
| 2410 defsubr (&Schar_to_string); | |
| 2411 defsubr (&Sbuffer_substring); | |
|
13767
862fff660446
(Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents:
13618
diff
changeset
|
2412 defsubr (&Sbuffer_substring_no_properties); |
| 305 | 2413 defsubr (&Sbuffer_string); |
| 2414 | |
| 2415 defsubr (&Spoint_marker); | |
| 2416 defsubr (&Smark_marker); | |
| 2417 defsubr (&Spoint); | |
| 2418 defsubr (&Sregion_beginning); | |
| 2419 defsubr (&Sregion_end); | |
| 2420 /* defsubr (&Smark); */ | |
| 2421 /* defsubr (&Sset_mark); */ | |
| 2422 defsubr (&Ssave_excursion); | |
| 2423 | |
| 2424 defsubr (&Sbufsize); | |
| 2425 defsubr (&Spoint_max); | |
| 2426 defsubr (&Spoint_min); | |
| 2427 defsubr (&Spoint_min_marker); | |
| 2428 defsubr (&Spoint_max_marker); | |
| 2429 | |
| 2430 defsubr (&Sbobp); | |
| 2431 defsubr (&Seobp); | |
| 2432 defsubr (&Sbolp); | |
| 2433 defsubr (&Seolp); | |
| 512 | 2434 defsubr (&Sfollowing_char); |
| 2435 defsubr (&Sprevious_char); | |
| 305 | 2436 defsubr (&Schar_after); |
| 2437 defsubr (&Sinsert); | |
| 2438 defsubr (&Sinsert_before_markers); | |
|
4714
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2439 defsubr (&Sinsert_and_inherit); |
|
350231e38e68
(Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2440 defsubr (&Sinsert_and_inherit_before_markers); |
| 305 | 2441 defsubr (&Sinsert_char); |
| 2442 | |
| 2443 defsubr (&Suser_login_name); | |
| 2444 defsubr (&Suser_real_login_name); | |
| 2445 defsubr (&Suser_uid); | |
| 2446 defsubr (&Suser_real_uid); | |
| 2447 defsubr (&Suser_full_name); | |
|
5373
a70b89d2d6bb
(Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5242
diff
changeset
|
2448 defsubr (&Semacs_pid); |
| 448 | 2449 defsubr (&Scurrent_time); |
|
9154
b4739bcefc44
(Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents:
8981
diff
changeset
|
2450 defsubr (&Sformat_time_string); |
|
9801
7003b5184aec
(init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents:
9657
diff
changeset
|
2451 defsubr (&Sdecode_time); |
|
11402
66d935214d8e
(Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents:
11263
diff
changeset
|
2452 defsubr (&Sencode_time); |
| 305 | 2453 defsubr (&Scurrent_time_string); |
|
962
3533821d6edc
* editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
690
diff
changeset
|
2454 defsubr (&Scurrent_time_zone); |
|
13019
5381e2022370
(Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13013
diff
changeset
|
2455 defsubr (&Sset_time_zone_rule); |
| 305 | 2456 defsubr (&Ssystem_name); |
| 2457 defsubr (&Smessage); | |
|
8975
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
2458 defsubr (&Smessage_box); |
|
e8a4c71251cb
(Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents:
8824
diff
changeset
|
2459 defsubr (&Smessage_or_box); |
| 305 | 2460 defsubr (&Sformat); |
| 2461 | |
| 2462 defsubr (&Sinsert_buffer_substring); | |
|
1853
8866e36c0ed5
(Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1748
diff
changeset
|
2463 defsubr (&Scompare_buffer_substrings); |
| 305 | 2464 defsubr (&Ssubst_char_in_region); |
| 2465 defsubr (&Stranslate_region); | |
| 2466 defsubr (&Sdelete_region); | |
| 2467 defsubr (&Swiden); | |
| 2468 defsubr (&Snarrow_to_region); | |
| 2469 defsubr (&Ssave_restriction); | |
|
7207
c83b161fe62c
(Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6878
diff
changeset
|
2470 defsubr (&Stranspose_regions); |
| 305 | 2471 } |
