annotate src/editfns.c @ 12125:995be67f3fd1

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