annotate src/editfns.c @ 109119:00accbd76dbd

lib-src/ebrowse.c (match_qualified_namespace_alias): Check for null pointer.
author Juanma Barranquero <lekktu@gmail.com>
date Sat, 03 Jul 2010 12:46:27 +0200
parents 2bc9a0c04c87
children aec1143e8d85
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.
108957
81d65beb3ea5 * src/editfns.c (Fbyte_to_string): Pacify compiler.
Glenn Morris <rgm@gnu.org>
parents: 108663
diff changeset
2
81d65beb3ea5 * src/editfns.c (Fbyte_to_string): Pacify compiler.
Glenn Morris <rgm@gnu.org>
parents: 108663
diff changeset
3 Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997,
81d65beb3ea5 * src/editfns.c (Fbyte_to_string): Pacify compiler.
Glenn Morris <rgm@gnu.org>
parents: 108663
diff changeset
4 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
81d65beb3ea5 * src/editfns.c (Fbyte_to_string): Pacify compiler.
Glenn Morris <rgm@gnu.org>
parents: 108663
diff changeset
5 2009, 2010 Free Software Foundation, Inc.
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 This file is part of GNU Emacs.
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93921
diff changeset
9 GNU Emacs is free software: you can redistribute it and/or modify
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93921
diff changeset
11 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93921
diff changeset
12 (at your option) any later version.
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU Emacs is distributed in the hope that it will be useful,
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 GNU General Public License for more details.
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93921
diff changeset
20 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
23 #include <config.h>
2962
79314d830f7d * editfns.c: #include <sys/types.h>, to get time_t for Eggert's
Jim Blandy <jimb@redhat.com>
parents: 2921
diff changeset
24 #include <sys/types.h>
58029
46a652255057 Move #include "systime.h" before <sys/resource.h>.
Eli Zaretskii <eliz@gnu.org>
parents: 58011
diff changeset
25 #include <stdio.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105661
diff changeset
26 #include <setjmp.h>
2962
79314d830f7d * editfns.c: #include <sys/types.h>, to get time_t for Eggert's
Jim Blandy <jimb@redhat.com>
parents: 2921
diff changeset
27
61700
8a54ce1fae6a Remove reference to defunct vms-pwd.h.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 61017
diff changeset
28 #ifdef HAVE_PWD_H
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include <pwd.h>
372
481e29c1e27e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 330
diff changeset
30 #endif
481e29c1e27e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 330
diff changeset
31
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21381
diff changeset
32 #ifdef HAVE_UNISTD_H
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21381
diff changeset
33 #include <unistd.h>
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21381
diff changeset
34 #endif
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21381
diff changeset
35
59644
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
36 #ifdef HAVE_SYS_UTSNAME_H
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
37 #include <sys/utsname.h>
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
38 #endif
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
39
65763
1a50ac5aaa75 Move systime.h include after lisp.h.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 65739
diff changeset
40 #include "lisp.h"
1a50ac5aaa75 Move systime.h include after lisp.h.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 65739
diff changeset
41
58029
46a652255057 Move #include "systime.h" before <sys/resource.h>.
Eli Zaretskii <eliz@gnu.org>
parents: 58011
diff changeset
42 /* systime.h includes <sys/time.h> which, on some systems, is required
46a652255057 Move #include "systime.h" before <sys/resource.h>.
Eli Zaretskii <eliz@gnu.org>
parents: 58011
diff changeset
43 for <sys/resource.h>; thus systime.h must be included before
46a652255057 Move #include "systime.h" before <sys/resource.h>.
Eli Zaretskii <eliz@gnu.org>
parents: 58011
diff changeset
44 <sys/resource.h> */
46a652255057 Move #include "systime.h" before <sys/resource.h>.
Eli Zaretskii <eliz@gnu.org>
parents: 58011
diff changeset
45 #include "systime.h"
58011
79614f2016d5 editfns.c: Adding in better patch
Steven Tamm <steventamm@mac.com>
parents: 58010
diff changeset
46
79614f2016d5 editfns.c: Adding in better patch
Steven Tamm <steventamm@mac.com>
parents: 58010
diff changeset
47 #if defined HAVE_SYS_RESOURCE_H
57987
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
48 #include <sys/resource.h>
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
49 #endif
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
50
40699
d51d2fa675d0 Move the include of ctype.h after unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
51 #include <ctype.h>
d51d2fa675d0 Move the include of ctype.h after unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
52
1285
d50533e23dff * editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents: 1254
diff changeset
53 #include "intervals.h"
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 #include "buffer.h"
88372
7d0adc8c7f07 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 43042
diff changeset
55 #include "character.h"
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
56 #include "coding.h"
38059
0b34b024286d (Fmessage_box): If the frame is not under a window
Eli Zaretskii <eliz@gnu.org>
parents: 37864
diff changeset
57 #include "frame.h"
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58 #include "window.h"
71817
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
59 #include "blockinput.h"
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
60
38519
200c049178cc (toplevel) [STDC_HEADERS]: Include float.h.
Gerd Moellmann <gerd@gnu.org>
parents: 38059
diff changeset
61 #ifdef STDC_HEADERS
200c049178cc (toplevel) [STDC_HEADERS]: Include float.h.
Gerd Moellmann <gerd@gnu.org>
parents: 38059
diff changeset
62 #include <float.h>
200c049178cc (toplevel) [STDC_HEADERS]: Include float.h.
Gerd Moellmann <gerd@gnu.org>
parents: 38059
diff changeset
63 #define MAX_10_EXP DBL_MAX_10_EXP
200c049178cc (toplevel) [STDC_HEADERS]: Include float.h.
Gerd Moellmann <gerd@gnu.org>
parents: 38059
diff changeset
64 #else
200c049178cc (toplevel) [STDC_HEADERS]: Include float.h.
Gerd Moellmann <gerd@gnu.org>
parents: 38059
diff changeset
65 #define MAX_10_EXP 310
200c049178cc (toplevel) [STDC_HEADERS]: Include float.h.
Gerd Moellmann <gerd@gnu.org>
parents: 38059
diff changeset
66 #endif
200c049178cc (toplevel) [STDC_HEADERS]: Include float.h.
Gerd Moellmann <gerd@gnu.org>
parents: 38059
diff changeset
67
19441
2e2b54ae9b9d (NULL): Define, if not defined.
Richard M. Stallman <rms@gnu.org>
parents: 19416
diff changeset
68 #ifndef NULL
2e2b54ae9b9d (NULL): Define, if not defined.
Richard M. Stallman <rms@gnu.org>
parents: 19416
diff changeset
69 #define NULL 0
2e2b54ae9b9d (NULL): Define, if not defined.
Richard M. Stallman <rms@gnu.org>
parents: 19416
diff changeset
70 #endif
2e2b54ae9b9d (NULL): Define, if not defined.
Richard M. Stallman <rms@gnu.org>
parents: 19416
diff changeset
71
97655
287457e9bac1 (USER_FULL_NAME): Define to pw->pw_gecos if undefined.
Eli Zaretskii <eliz@gnu.org>
parents: 96718
diff changeset
72 #ifndef USER_FULL_NAME
287457e9bac1 (USER_FULL_NAME): Define to pw->pw_gecos if undefined.
Eli Zaretskii <eliz@gnu.org>
parents: 96718
diff changeset
73 #define USER_FULL_NAME pw->pw_gecos
287457e9bac1 (USER_FULL_NAME): Define to pw->pw_gecos if undefined.
Eli Zaretskii <eliz@gnu.org>
parents: 96718
diff changeset
74 #endif
287457e9bac1 (USER_FULL_NAME): Define to pw->pw_gecos if undefined.
Eli Zaretskii <eliz@gnu.org>
parents: 96718
diff changeset
75
31095
e19d38e14720 [USE_CRT_DLL]: Remove unnecessary extern, which screws
Andrew Innes <andrewi@gnu.org>
parents: 31016
diff changeset
76 #ifndef USE_CRT_DLL
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
77 extern char **environ;
31095
e19d38e14720 [USE_CRT_DLL]: Remove unnecessary extern, which screws
Andrew Innes <andrewi@gnu.org>
parents: 31016
diff changeset
78 #endif
e19d38e14720 [USE_CRT_DLL]: Remove unnecessary extern, which screws
Andrew Innes <andrewi@gnu.org>
parents: 31016
diff changeset
79
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
80 #define TM_YEAR_BASE 1900
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
81
69790
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
82 /* Nonzero if TM_YEAR is a struct tm's tm_year value that causes
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
83 asctime to have well-defined behavior. */
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
84 #ifndef TM_YEAR_IN_ASCTIME_RANGE
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
85 # define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
86 (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
87 #endif
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
88
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
89 extern size_t emacs_strftimeu (char *, size_t, const char *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
90 const struct tm *, int);
81422
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
91
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
92 #ifdef WINDOWSNT
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
93 extern Lisp_Object w32_get_internal_run_time ();
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
94 #endif
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
95
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
96 static int tm_diff (struct tm *, struct tm *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
97 static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
98 static void update_buffer_properties (int, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
99 static Lisp_Object region_limit (int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
100 int lisp_time_argument (Lisp_Object, time_t *, int *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
101 static size_t emacs_memftimeu (char *, size_t, const char *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
102 size_t, const struct tm *, int);
102759
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
103 static void general_insert_function (void (*) (const unsigned char *, EMACS_INT),
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
104 void (*) (Lisp_Object, EMACS_INT,
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
105 EMACS_INT, EMACS_INT,
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
106 EMACS_INT, int),
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
107 int, int, Lisp_Object *);
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
108 static Lisp_Object subst_char_in_region_unwind (Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
109 static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
110 static void transpose_markers (int, int, int, int, int, int, int, int);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
111
31336
3ecef4a7b3cd Remove includes of
Gerd Moellmann <gerd@gnu.org>
parents: 31225
diff changeset
112 #ifdef HAVE_INDEX
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
113 extern char *index (const char *, int);
31336
3ecef4a7b3cd Remove includes of
Gerd Moellmann <gerd@gnu.org>
parents: 31225
diff changeset
114 #endif
3ecef4a7b3cd Remove includes of
Gerd Moellmann <gerd@gnu.org>
parents: 31225
diff changeset
115
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
116 Lisp_Object Vbuffer_access_fontify_functions;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
117 Lisp_Object Qbuffer_access_fontify_functions;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
118 Lisp_Object Vbuffer_access_fontified_property;
9657
0fc126c193e7 (Finsert_buffer_substring): Use insert_from_buffer instead of insert.
Karl Heuer <kwzh@gnu.org>
parents: 9572
diff changeset
119
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
120 Lisp_Object Fuser_full_name (Lisp_Object);
17829
2d98572c57ab Declare Fuser_full_name as Lisp_Object in advance to
Kenichi Handa <handa@m17n.org>
parents: 17115
diff changeset
121
27077
19a664c654ab (Vinhibit_field_text_motion): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 26853
diff changeset
122 /* Non-nil means don't stop at field boundary in text motion commands. */
19a664c654ab (Vinhibit_field_text_motion): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 26853
diff changeset
123
19a664c654ab (Vinhibit_field_text_motion): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 26853
diff changeset
124 Lisp_Object Vinhibit_field_text_motion;
19a664c654ab (Vinhibit_field_text_motion): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 26853
diff changeset
125
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126 /* Some static data, and a function to initialize it for each run */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
128 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
129 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
130 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
131 Lisp_Object Vuser_login_name; /* user name from LOGNAME or USER */
59644
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
132 Lisp_Object Voperating_system_release; /* Operating System Release */
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
134 /* Symbol for the text property used to mark fields. */
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
135
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
136 Lisp_Object Qfield;
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
137
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
138 /* A special value for Qfield properties. */
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
139
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
140 Lisp_Object Qboundary;
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
141
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
142
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
143 void
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144 init_editfns ()
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145 {
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
146 char *user_name;
25782
8f59abd3a02b (init_editfns): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25662
diff changeset
147 register unsigned char *p;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148 struct passwd *pw; /* password entry for the current user */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 Lisp_Object tem;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151 /* 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
152 init_system_name ();
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 #ifndef CANNOT_DUMP
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 /* Don't bother with this on initial start when just dumping out */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 if (!initialized)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 return;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 #endif /* not CANNOT_DUMP */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 pw = (struct passwd *) getpwuid (getuid ());
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
161 #ifdef MSDOS
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
162 /* 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
163 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
164 (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
165 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
166 #else
12026
505a894d943e (syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents: 11912
diff changeset
167 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
168 #endif
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
170 /* Get the effective user name, by consulting environment variables,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
171 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
172 user_name = (char *) getenv ("LOGNAME");
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
173 if (!user_name)
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
174 #ifdef WINDOWSNT
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
175 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
176 #else /* WINDOWSNT */
5907
5fdb226fe9a4 (init_editfns): Look at LOGNAME before USER.
Karl Heuer <kwzh@gnu.org>
parents: 5884
diff changeset
177 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
178 #endif /* WINDOWSNT */
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
179 if (!user_name)
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
180 {
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
181 pw = (struct passwd *) getpwuid (geteuid ());
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
182 user_name = (char *) (pw ? pw->pw_name : "unknown");
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
183 }
12026
505a894d943e (syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents: 11912
diff changeset
184 Vuser_login_name = build_string (user_name);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
186 /* If the user name claimed in the environment vars differs from
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
187 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
188 tem = Fstring_equal (Vuser_login_name, Vuser_real_login_name);
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
189 Vuser_full_name = Fuser_full_name (NILP (tem)? make_number (geteuid())
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
190 : Vuser_login_name);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
191
11447
d51e912495be (init_editfns): Add casts.
Richard M. Stallman <rms@gnu.org>
parents: 11433
diff changeset
192 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
193 if (p)
9ab21ef32537 (init_editfns): Use NAME envvar to init user-full-name.
Richard M. Stallman <rms@gnu.org>
parents: 10480
diff changeset
194 Vuser_full_name = build_string (p);
16683
6802dbd07a80 (Fuser_full_name): Return nil if the specified user doesn't exist.
Richard M. Stallman <rms@gnu.org>
parents: 16648
diff changeset
195 else if (NILP (Vuser_full_name))
6802dbd07a80 (Fuser_full_name): Return nil if the specified user doesn't exist.
Richard M. Stallman <rms@gnu.org>
parents: 16648
diff changeset
196 Vuser_full_name = build_string ("unknown");
59644
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
197
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
198 #ifdef HAVE_SYS_UTSNAME_H
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
199 {
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
200 struct utsname uts;
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
201 uname (&uts);
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
202 Voperating_system_release = build_string (uts.release);
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
203 }
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
204 #else
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
205 Voperating_system_release = Qnil;
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
206 #endif
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0,
40203
9d2aeb5c05b4 (char-to-string): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40140
diff changeset
210 doc: /* Convert arg CHAR to a string containing that character.
9d2aeb5c05b4 (char-to-string): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40140
diff changeset
211 usage: (char-to-string CHAR) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
212 (character)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
213 Lisp_Object character;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 {
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
215 int len;
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
216 unsigned char str[MAX_MULTIBYTE_LENGTH];
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
217
90800
37b19435acef (Fchar_to_string): Use CHARACTERP, not INTEGERP.
Kenichi Handa <handa@m17n.org>
parents: 90796
diff changeset
218 CHECK_CHARACTER (character);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219
88372
7d0adc8c7f07 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 43042
diff changeset
220 len = CHAR_STRING (XFASTINT (character), str);
21257
205a5aa4aa2f (Fchar_to_string): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21245
diff changeset
221 return make_string_from_bytes (str, 1, len);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223
108663
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
224 DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0,
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
225 doc: /* Convert arg BYTE to a string containing that byte. */)
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
226 (byte)
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
227 Lisp_Object byte;
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
228 {
108957
81d65beb3ea5 * src/editfns.c (Fbyte_to_string): Pacify compiler.
Glenn Morris <rgm@gnu.org>
parents: 108663
diff changeset
229 unsigned char b;
108663
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
230 CHECK_NUMBER (byte);
108957
81d65beb3ea5 * src/editfns.c (Fbyte_to_string): Pacify compiler.
Glenn Morris <rgm@gnu.org>
parents: 108663
diff changeset
231 b = XINT (byte);
108663
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
232 return make_string_from_bytes (&b, 1, 1);
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
233 }
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
234
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
236 doc: /* Convert arg STRING to a character, the first character of that string.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
237 A multibyte character is handled correctly. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
238 (string)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
239 register Lisp_Object string;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 register Lisp_Object val;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
242 CHECK_STRING (string);
46443
b612fecce4cc (Fstring_to_char): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
243 if (SCHARS (string))
23650
3cc42e65f25b (Fstring_to_char): Don't return a multibyte character
Kenichi Handa <handa@m17n.org>
parents: 23596
diff changeset
244 {
3cc42e65f25b (Fstring_to_char): Don't return a multibyte character
Kenichi Handa <handa@m17n.org>
parents: 23596
diff changeset
245 if (STRING_MULTIBYTE (string))
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
246 XSETFASTINT (val, STRING_CHAR (SDATA (string)));
23650
3cc42e65f25b (Fstring_to_char): Don't return a multibyte character
Kenichi Handa <handa@m17n.org>
parents: 23596
diff changeset
247 else
46443
b612fecce4cc (Fstring_to_char): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
248 XSETFASTINT (val, SREF (string, 0));
23650
3cc42e65f25b (Fstring_to_char): Don't return a multibyte character
Kenichi Handa <handa@m17n.org>
parents: 23596
diff changeset
249 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 else
9305
ac077e2a75f1 (Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents: 9265
diff changeset
251 XSETFASTINT (val, 0);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 return val;
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 static Lisp_Object
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
256 buildmark (charpos, bytepos)
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
257 int charpos, bytepos;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259 register Lisp_Object mark;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
260 mark = Fmake_marker ();
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
261 set_marker_both (mark, Qnil, charpos, bytepos);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262 return mark;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
265 DEFUN ("point", Fpoint, Spoint, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
266 doc: /* Return value of point, as an integer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
267 Beginning of buffer is position (point-min). */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
268 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
270 Lisp_Object temp;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15910
diff changeset
271 XSETFASTINT (temp, PT);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 return temp;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275 DEFUN ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
276 doc: /* Return value of point, as a marker object. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
277 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
278 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
279 return buildmark (PT, PT_BYTE);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
281
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
282 int
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
283 clip_to_bounds (lower, num, upper)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284 int lower, num, upper;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
286 if (num < lower)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
287 return lower;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
288 else if (num > upper)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
289 return upper;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 else
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
291 return num;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
294 DEFUN ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
295 doc: /* Set point to POSITION, a number or marker.
76709
af7c3ea6462e (Fgoto_char): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 76703
diff changeset
296 Beginning of buffer is position (point-min), end is (point-max).
af7c3ea6462e (Fgoto_char): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 76703
diff changeset
297
af7c3ea6462e (Fgoto_char): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 76703
diff changeset
298 The return value is POSITION. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
299 (position)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
300 register Lisp_Object position;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
301 {
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
302 int pos;
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
303
21226
c8d0df2cbd3d (Fgoto_char): If POSITION is a marker pointing a
Richard M. Stallman <rms@gnu.org>
parents: 21225
diff changeset
304 if (MARKERP (position)
c8d0df2cbd3d (Fgoto_char): If POSITION is a marker pointing a
Richard M. Stallman <rms@gnu.org>
parents: 21225
diff changeset
305 && current_buffer == XMARKER (position)->buffer)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
306 {
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
307 pos = marker_position (position);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
308 if (pos < BEGV)
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
309 SET_PT_BOTH (BEGV, BEGV_BYTE);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
310 else if (pos > ZV)
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
311 SET_PT_BOTH (ZV, ZV_BYTE);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
312 else
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
313 SET_PT_BOTH (pos, marker_byte_position (position));
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
314
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
315 return position;
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
316 }
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
317
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
318 CHECK_NUMBER_COERCE_MARKER (position);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
320 pos = clip_to_bounds (BEGV, XINT (position), ZV);
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
321 SET_PT (pos);
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
322 return position;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
323 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
325
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
326 /* Return the start or end position of the region.
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
327 BEGINNINGP non-zero means return the start.
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
328 If there is no region active, signal an error. */
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
329
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
330 static Lisp_Object
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
331 region_limit (beginningp)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
332 int beginningp;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333 {
4047
e950abdc9ed2 (region_limit): Declare Vmark_even_if_inactive.
Roland McGrath <roland@gnu.org>
parents: 4038
diff changeset
334 extern Lisp_Object Vmark_even_if_inactive; /* Defined in callint.c. */
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
335 Lisp_Object m;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49472
diff changeset
336
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
337 if (!NILP (Vtransient_mark_mode)
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
338 && NILP (Vmark_even_if_inactive)
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
339 && NILP (current_buffer->mark_active))
71975
6d29dff081c5 (region_limit, Fget_internal_run_time): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents: 71865
diff changeset
340 xsignal0 (Qmark_inactive);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49472
diff changeset
341
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
342 m = Fmarker_position (current_buffer->mark);
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
343 if (NILP (m))
43042
63639e690611 (region_limit): Nicer error message.
Richard M. Stallman <rms@gnu.org>
parents: 42484
diff changeset
344 error ("The mark is not set now, so there is no region");
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49472
diff changeset
345
52451
c7860e5cc982 (region_limit): Support any non-zero value of BEGINNINGP.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
346 if ((PT < XFASTINT (m)) == (beginningp != 0))
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
347 m = make_number (PT);
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
348 return m;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
349 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 DEFUN ("region-beginning", Fregion_beginning, Sregion_beginning, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
352 doc: /* Return position of beginning of region, as an integer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
353 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 {
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
355 return region_limit (1);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 DEFUN ("region-end", Fregion_end, Sregion_end, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
359 doc: /* Return position of end of region, as an integer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
360 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361 {
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
362 return region_limit (0);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
365 DEFUN ("mark-marker", Fmark_marker, Smark_marker, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
366 doc: /* Return this buffer's mark, as a marker object.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
367 Watch out! Moving this marker changes the mark position.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
368 If you set the marker not to point anywhere, the buffer will have no mark. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
369 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
370 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 return current_buffer->mark;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 }
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
373
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
374
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
375 /* Find all the overlays in the current buffer that touch position POS.
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
376 Return the number found, and store them in a vector in VEC
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
377 of length LEN. */
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
378
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
379 static int
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
380 overlays_around (pos, vec, len)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
381 int pos;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
382 Lisp_Object *vec;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
383 int len;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
384 {
51841
59ba1f5d0a16 (overlays_around): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51670
diff changeset
385 Lisp_Object overlay, start, end;
59ba1f5d0a16 (overlays_around): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51670
diff changeset
386 struct Lisp_Overlay *tail;
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
387 int startpos, endpos;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
388 int idx = 0;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
389
51841
59ba1f5d0a16 (overlays_around): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51670
diff changeset
390 for (tail = current_buffer->overlays_before; tail; tail = tail->next)
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
391 {
51841
59ba1f5d0a16 (overlays_around): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51670
diff changeset
392 XSETMISC (overlay, tail);
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
393
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
394 end = OVERLAY_END (overlay);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
395 endpos = OVERLAY_POSITION (end);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
396 if (endpos < pos)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
397 break;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
398 start = OVERLAY_START (overlay);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
399 startpos = OVERLAY_POSITION (start);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
400 if (startpos <= pos)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
401 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
402 if (idx < len)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
403 vec[idx] = overlay;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
404 /* Keep counting overlays even if we can't return them all. */
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
405 idx++;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
406 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
407 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
408
51841
59ba1f5d0a16 (overlays_around): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51670
diff changeset
409 for (tail = current_buffer->overlays_after; tail; tail = tail->next)
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
410 {
51841
59ba1f5d0a16 (overlays_around): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51670
diff changeset
411 XSETMISC (overlay, tail);
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
412
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
413 start = OVERLAY_START (overlay);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
414 startpos = OVERLAY_POSITION (start);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
415 if (pos < startpos)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
416 break;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
417 end = OVERLAY_END (overlay);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
418 endpos = OVERLAY_POSITION (end);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
419 if (pos <= endpos)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
420 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
421 if (idx < len)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
422 vec[idx] = overlay;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
423 idx++;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
424 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
425 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
426
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
427 return idx;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
428 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
429
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
430 /* Return the value of property PROP, in OBJECT at POSITION.
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
431 It's the value of PROP that a char inserted at POSITION would get.
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
432 OBJECT is optional and defaults to the current buffer.
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
433 If OBJECT is a buffer, then overlay properties are considered as well as
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
434 text properties.
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
435 If OBJECT is a window, then that window's buffer is used, but
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
436 window-specific overlays are considered only if they are associated
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
437 with OBJECT. */
48134
ef2b87569c38 (get_pos_property): Don't hardcode Qfield.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48115
diff changeset
438 Lisp_Object
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
439 get_pos_property (position, prop, object)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
440 Lisp_Object position, object;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
441 register Lisp_Object prop;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
442 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
443 CHECK_NUMBER_COERCE_MARKER (position);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
444
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
445 if (NILP (object))
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
446 XSETBUFFER (object, current_buffer);
51042
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
447 else if (WINDOWP (object))
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
448 object = XWINDOW (object)->buffer;
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
449
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
450 if (!BUFFERP (object))
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
451 /* pos-property only makes sense in buffers right now, since strings
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
452 have no overlays and no notion of insertion for which stickiness
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
453 could be obeyed. */
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
454 return Fget_text_property (position, prop, object);
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
455 else
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
456 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
457 int posn = XINT (position);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
458 int noverlays;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
459 Lisp_Object *overlay_vec, tem;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
460 struct buffer *obuf = current_buffer;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
461
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
462 set_buffer_temp (XBUFFER (object));
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
463
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
464 /* First try with room for 40 overlays. */
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
465 noverlays = 40;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
466 overlay_vec = (Lisp_Object *) alloca (noverlays * sizeof (Lisp_Object));
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
467 noverlays = overlays_around (posn, overlay_vec, noverlays);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
468
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
469 /* If there are more than 40,
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
470 make enough space for all, and try again. */
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
471 if (noverlays > 40)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
472 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
473 overlay_vec = (Lisp_Object *) alloca (noverlays * sizeof (Lisp_Object));
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
474 noverlays = overlays_around (posn, overlay_vec, noverlays);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
475 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
476 noverlays = sort_overlays (overlay_vec, noverlays, NULL);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
477
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
478 set_buffer_temp (obuf);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
479
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
480 /* Now check the overlays in order of decreasing priority. */
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
481 while (--noverlays >= 0)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
482 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
483 Lisp_Object ol = overlay_vec[noverlays];
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
484 tem = Foverlay_get (ol, prop);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
485 if (!NILP (tem))
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
486 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
487 /* Check the overlay is indeed active at point. */
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
488 Lisp_Object start = OVERLAY_START (ol), finish = OVERLAY_END (ol);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
489 if ((OVERLAY_POSITION (start) == posn
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
490 && XMARKER (start)->insertion_type == 1)
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
491 || (OVERLAY_POSITION (finish) == posn
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
492 && XMARKER (finish)->insertion_type == 0))
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
493 ; /* The overlay will not cover a char inserted at point. */
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
494 else
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
495 {
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
496 return tem;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
497 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
498 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
499 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49472
diff changeset
500
93921
f7d6d03d8ceb (Ffield_string_no_properties): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 93038
diff changeset
501 { /* Now check the text properties. */
51042
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
502 int stickiness = text_property_stickiness (prop, position, object);
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
503 if (stickiness > 0)
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
504 return Fget_text_property (position, prop, object);
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
505 else if (stickiness < 0
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
506 && XINT (position) > BUF_BEGV (XBUFFER (object)))
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
507 return Fget_text_property (make_number (XINT (position) - 1),
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
508 prop, object);
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
509 else
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
510 return Qnil;
edeae7524de9 (get_pos_property): Don't assume that `object' = nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50746
diff changeset
511 }
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
512 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
513 }
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
514
26389
e2acf63b5403 (Fline_beginning_position): If N is not 1,
Richard M. Stallman <rms@gnu.org>
parents: 26372
diff changeset
515 /* Find the field surrounding POS in *BEG and *END. If POS is nil,
70188
6d253e1d0183 (find_field): Fix comment.
Lars Hansen <larsh@soem.dk>
parents: 69790
diff changeset
516 the value of point is used instead. If BEG or END is null,
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
517 means don't store the beginning or end of the field.
26389
e2acf63b5403 (Fline_beginning_position): If N is not 1,
Richard M. Stallman <rms@gnu.org>
parents: 26372
diff changeset
518
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
519 BEG_LIMIT and END_LIMIT serve to limit the ranged of the returned
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
520 results; they do not effect boundary behavior.
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
521
70213
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
522 If MERGE_AT_BOUNDARY is nonzero, then if POS is at the very first
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
523 position of a field, then the beginning of the previous field is
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
524 returned instead of the beginning of POS's field (since the end of a
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
525 field is actually also the beginning of the next input field, this
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
526 behavior is sometimes useful). Additionally in the MERGE_AT_BOUNDARY
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
527 true case, if two fields are separated by a field with the special
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
528 value `boundary', and POS lies within it, then the two separated
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
529 fields are considered to be adjacent, and POS between them, when
70213
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
530 finding the beginning and ending of the "merged" field.
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
531
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
532 Either BEG or END may be 0, in which case the corresponding value
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
533 is not stored. */
26389
e2acf63b5403 (Fline_beginning_position): If N is not 1,
Richard M. Stallman <rms@gnu.org>
parents: 26372
diff changeset
534
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
535 static void
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
536 find_field (pos, merge_at_boundary, beg_limit, beg, end_limit, end)
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
537 Lisp_Object pos;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
538 Lisp_Object merge_at_boundary;
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
539 Lisp_Object beg_limit, end_limit;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
540 int *beg, *end;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
541 {
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
542 /* Fields right before and after the point. */
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
543 Lisp_Object before_field, after_field;
26389
e2acf63b5403 (Fline_beginning_position): If N is not 1,
Richard M. Stallman <rms@gnu.org>
parents: 26372
diff changeset
544 /* 1 if POS counts as the start of a field. */
e2acf63b5403 (Fline_beginning_position): If N is not 1,
Richard M. Stallman <rms@gnu.org>
parents: 26372
diff changeset
545 int at_field_start = 0;
e2acf63b5403 (Fline_beginning_position): If N is not 1,
Richard M. Stallman <rms@gnu.org>
parents: 26372
diff changeset
546 /* 1 if POS counts as the end of a field. */
e2acf63b5403 (Fline_beginning_position): If N is not 1,
Richard M. Stallman <rms@gnu.org>
parents: 26372
diff changeset
547 int at_field_end = 0;
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
548
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
549 if (NILP (pos))
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
550 XSETFASTINT (pos, PT);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
551 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
552 CHECK_NUMBER_COERCE_MARKER (pos);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
553
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
554 after_field
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
555 = get_char_property_and_overlay (pos, Qfield, Qnil, NULL);
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
556 before_field
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
557 = (XFASTINT (pos) > BEGV
32850
6958fdfed738 (find_field):
Miles Bader <miles@gnu.org>
parents: 32517
diff changeset
558 ? get_char_property_and_overlay (make_number (XINT (pos) - 1),
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
559 Qfield, Qnil, NULL)
68394
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
560 /* Using nil here would be a more obvious choice, but it would
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
561 fail when the buffer starts with a non-sticky field. */
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
562 : after_field);
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
563
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
564 /* See if we need to handle the case where MERGE_AT_BOUNDARY is nil
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
565 and POS is at beginning of a field, which can also be interpreted
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
566 as the end of the previous field. Note that the case where if
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
567 MERGE_AT_BOUNDARY is non-nil (see function comment) is actually the
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
568 more natural one; then we avoid treating the beginning of a field
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
569 specially. */
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
570 if (NILP (merge_at_boundary))
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
571 {
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
572 Lisp_Object field = get_pos_property (pos, Qfield, Qnil);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
573 if (!EQ (field, after_field))
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
574 at_field_end = 1;
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
575 if (!EQ (field, before_field))
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
576 at_field_start = 1;
48111
7103ad01172d (find_field): Make an exception for nil fields.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48094
diff changeset
577 if (NILP (field) && at_field_start && at_field_end)
7103ad01172d (find_field): Make an exception for nil fields.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48094
diff changeset
578 /* If an inserted char would have a nil field while the surrounding
7103ad01172d (find_field): Make an exception for nil fields.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48094
diff changeset
579 text is non-nil, we're probably not looking at a
7103ad01172d (find_field): Make an exception for nil fields.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48094
diff changeset
580 zero-length field, but instead at a non-nil field that's
7103ad01172d (find_field): Make an exception for nil fields.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48094
diff changeset
581 not intended for editing (such as comint's prompts). */
7103ad01172d (find_field): Make an exception for nil fields.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48094
diff changeset
582 at_field_end = at_field_start = 0;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
583 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
584
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
585 /* Note about special `boundary' fields:
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
586
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
587 Consider the case where the point (`.') is between the fields `x' and `y':
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
588
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
589 xxxx.yyyy
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
590
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
591 In this situation, if merge_at_boundary is true, we consider the
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
592 `x' and `y' fields as forming one big merged field, and so the end
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
593 of the field is the end of `y'.
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
594
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
595 However, if `x' and `y' are separated by a special `boundary' field
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
596 (a field with a `field' char-property of 'boundary), then we ignore
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
597 this special field when merging adjacent fields. Here's the same
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
598 situation, but with a `boundary' field between the `x' and `y' fields:
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
599
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
600 xxx.BBBByyyy
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
601
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
602 Here, if point is at the end of `x', the beginning of `y', or
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
603 anywhere in-between (within the `boundary' field), we merge all
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
604 three fields and consider the beginning as being the beginning of
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
605 the `x' field, and the end as being the end of the `y' field. */
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
606
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
607 if (beg)
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
608 {
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
609 if (at_field_start)
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
610 /* POS is at the edge of a field, and we should consider it as
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
611 the beginning of the following field. */
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
612 *beg = XFASTINT (pos);
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
613 else
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
614 /* Find the previous field boundary. */
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
615 {
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
616 Lisp_Object p = pos;
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
617 if (!NILP (merge_at_boundary) && EQ (before_field, Qboundary))
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
618 /* Skip a `boundary' field. */
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
619 p = Fprevious_single_char_property_change (p, Qfield, Qnil,
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
620 beg_limit);
48094
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
621
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
622 p = Fprevious_single_char_property_change (p, Qfield, Qnil,
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
623 beg_limit);
2a8ba962e34d (overlays_around, get_pos_property): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48020
diff changeset
624 *beg = NILP (p) ? BEGV : XFASTINT (p);
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
625 }
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
626 }
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
627
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
628 if (end)
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
629 {
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
630 if (at_field_end)
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
631 /* POS is at the edge of a field, and we should consider it as
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
632 the end of the previous field. */
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
633 *end = XFASTINT (pos);
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
634 else
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
635 /* Find the next field boundary. */
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
636 {
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
637 if (!NILP (merge_at_boundary) && EQ (after_field, Qboundary))
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
638 /* Skip a `boundary' field. */
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
639 pos = Fnext_single_char_property_change (pos, Qfield, Qnil,
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
640 end_limit);
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
641
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
642 pos = Fnext_single_char_property_change (pos, Qfield, Qnil,
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
643 end_limit);
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
644 *end = NILP (pos) ? ZV : XFASTINT (pos);
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
645 }
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
646 }
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
647 }
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
648
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
649
26629
05dcbc266797 (Fdelete_field): Make it noninteractive. Return nil.
Richard M. Stallman <rms@gnu.org>
parents: 26526
diff changeset
650 DEFUN ("delete-field", Fdelete_field, Sdelete_field, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
651 doc: /* Delete the field surrounding POS.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
652 A field is a region of text with the same `field' property.
72194
06ca00cbd2ca Undo 2006-06-28 change.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 71975
diff changeset
653 If POS is nil, the value of point is used for POS. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
654 (pos)
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
655 Lisp_Object pos;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
656 {
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
657 int beg, end;
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
658 find_field (pos, Qnil, Qnil, &beg, Qnil, &end);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
659 if (beg != end)
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
660 del_range (beg, end);
26629
05dcbc266797 (Fdelete_field): Make it noninteractive. Return nil.
Richard M. Stallman <rms@gnu.org>
parents: 26526
diff changeset
661 return Qnil;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
662 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
663
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
664 DEFUN ("field-string", Ffield_string, Sfield_string, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
665 doc: /* Return the contents of the field surrounding POS as a string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
666 A field is a region of text with the same `field' property.
72194
06ca00cbd2ca Undo 2006-06-28 change.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 71975
diff changeset
667 If POS is nil, the value of point is used for POS. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
668 (pos)
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
669 Lisp_Object pos;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
670 {
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
671 int beg, end;
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
672 find_field (pos, Qnil, Qnil, &beg, Qnil, &end);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
673 return make_buffer_string (beg, end, 1);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
674 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
675
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
676 DEFUN ("field-string-no-properties", Ffield_string_no_properties, Sfield_string_no_properties, 0, 1, 0,
93921
f7d6d03d8ceb (Ffield_string_no_properties): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 93038
diff changeset
677 doc: /* Return the contents of the field around POS, without text properties.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
678 A field is a region of text with the same `field' property.
72194
06ca00cbd2ca Undo 2006-06-28 change.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 71975
diff changeset
679 If POS is nil, the value of point is used for POS. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
680 (pos)
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
681 Lisp_Object pos;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
682 {
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
683 int beg, end;
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
684 find_field (pos, Qnil, Qnil, &beg, Qnil, &end);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
685 return make_buffer_string (beg, end, 0);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
686 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
687
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
688 DEFUN ("field-beginning", Ffield_beginning, Sfield_beginning, 0, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
689 doc: /* Return the beginning of the field surrounding POS.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
690 A field is a region of text with the same `field' property.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
691 If POS is nil, the value of point is used for POS.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
692 If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
693 field, then the beginning of the *previous* field is returned.
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
694 If LIMIT is non-nil, it is a buffer position; if the beginning of the field
72194
06ca00cbd2ca Undo 2006-06-28 change.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 71975
diff changeset
695 is before LIMIT, then LIMIT will be returned instead. */)
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
696 (pos, escape_from_edge, limit)
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
697 Lisp_Object pos, escape_from_edge, limit;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
698 {
70213
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
699 int beg;
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
700 find_field (pos, escape_from_edge, limit, &beg, Qnil, 0);
e9ea7c53ddc7 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-245
Miles Bader <miles@gnu.org>
parents: 70188
diff changeset
701 return make_number (beg);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
702 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
703
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
704 DEFUN ("field-end", Ffield_end, Sfield_end, 0, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
705 doc: /* Return the end of the field surrounding POS.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
706 A field is a region of text with the same `field' property.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
707 If POS is nil, the value of point is used for POS.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
708 If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field,
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
709 then the end of the *following* field is returned.
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
710 If LIMIT is non-nil, it is a buffer position; if the end of the field
72194
06ca00cbd2ca Undo 2006-06-28 change.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 71975
diff changeset
711 is after LIMIT, then LIMIT will be returned instead. */)
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
712 (pos, escape_from_edge, limit)
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
713 Lisp_Object pos, escape_from_edge, limit;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
714 {
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
715 int end;
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
716 find_field (pos, escape_from_edge, Qnil, 0, limit, &end);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
717 return make_number (end);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
718 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
719
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
720 DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
721 doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
722
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
723 A field is a region of text with the same `field' property.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
724 If NEW-POS is nil, then the current point is used instead, and set to the
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
725 constrained position if that is different.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
726
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
727 If OLD-POS is at the boundary of two fields, then the allowable
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
728 positions for NEW-POS depends on the value of the optional argument
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
729 ESCAPE-FROM-EDGE: If ESCAPE-FROM-EDGE is nil, then NEW-POS is
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
730 constrained to the field that has the same `field' char-property
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
731 as any new characters inserted at OLD-POS, whereas if ESCAPE-FROM-EDGE
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
732 is non-nil, NEW-POS is constrained to the union of the two adjacent
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
733 fields. Additionally, if two fields are separated by another field with
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
734 the special value `boundary', then any point within this special field is
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
735 also considered to be `on the boundary'.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
736
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
737 If the optional argument ONLY-IN-LINE is non-nil and constraining
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
738 NEW-POS would move it to a different line, NEW-POS is returned
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
739 unconstrained. This useful for commands that move by line, like
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
740 \\[next-line] or \\[beginning-of-line], which should generally respect field boundaries
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
741 only in the case where they can still move to the right line.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
742
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
743 If the optional argument INHIBIT-CAPTURE-PROPERTY is non-nil, and OLD-POS has
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
744 a non-nil property of that name, then any field boundaries are ignored.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
745
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
746 Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
747 (new_pos, old_pos, escape_from_edge, only_in_line, inhibit_capture_property)
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
748 Lisp_Object new_pos, old_pos;
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
749 Lisp_Object escape_from_edge, only_in_line, inhibit_capture_property;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
750 {
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
751 /* If non-zero, then the original point, before re-positioning. */
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
752 int orig_point = 0;
68626
ee9f9dd4337d (Fconstrain_to_field): Fix int/Lisp_Object mixup.
Ken Raeburn <raeburn@raeburn.org>
parents: 68394
diff changeset
753 int fwd;
ee9f9dd4337d (Fconstrain_to_field): Fix int/Lisp_Object mixup.
Ken Raeburn <raeburn@raeburn.org>
parents: 68394
diff changeset
754 Lisp_Object prev_old, prev_new;
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
755
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
756 if (NILP (new_pos))
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
757 /* Use the current point, and afterwards, set it. */
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
758 {
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
759 orig_point = PT;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
760 XSETFASTINT (new_pos, PT);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
761 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
762
68394
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
763 CHECK_NUMBER_COERCE_MARKER (new_pos);
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
764 CHECK_NUMBER_COERCE_MARKER (old_pos);
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
765
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
766 fwd = (XFASTINT (new_pos) > XFASTINT (old_pos));
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
767
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
768 prev_old = make_number (XFASTINT (old_pos) - 1);
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
769 prev_new = make_number (XFASTINT (new_pos) - 1);
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
770
27081
f068649f1c28 (Fconstrain_to_field): Don't constrain if
Gerd Moellmann <gerd@gnu.org>
parents: 27077
diff changeset
771 if (NILP (Vinhibit_field_text_motion)
f068649f1c28 (Fconstrain_to_field): Don't constrain if
Gerd Moellmann <gerd@gnu.org>
parents: 27077
diff changeset
772 && !EQ (new_pos, old_pos)
68669
82590f3df577 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-51
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
773 && (!NILP (Fget_char_property (new_pos, Qfield, Qnil))
82590f3df577 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-51
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
774 || !NILP (Fget_char_property (old_pos, Qfield, Qnil))
68394
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
775 /* To recognize field boundaries, we must also look at the
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
776 previous positions; we could use `get_pos_property'
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
777 instead, but in itself that would fail inside non-sticky
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
778 fields (like comint prompts). */
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
779 || (XFASTINT (new_pos) > BEGV
68669
82590f3df577 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-51
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
780 && !NILP (Fget_char_property (prev_new, Qfield, Qnil)))
68394
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
781 || (XFASTINT (old_pos) > BEGV
68669
82590f3df577 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-51
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
782 && !NILP (Fget_char_property (prev_old, Qfield, Qnil))))
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
783 && (NILP (inhibit_capture_property)
68394
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
784 /* Field boundaries are again a problem; but now we must
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
785 decide the case exactly, so we need to call
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
786 `get_pos_property' as well. */
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
787 || (NILP (get_pos_property (old_pos, inhibit_capture_property, Qnil))
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
788 && (XFASTINT (old_pos) <= BEGV
68669
82590f3df577 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-51
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
789 || NILP (Fget_char_property (old_pos, inhibit_capture_property, Qnil))
82590f3df577 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-51
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
790 || NILP (Fget_char_property (prev_old, inhibit_capture_property, Qnil))))))
68392
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
791 /* It is possible that NEW_POS is not within the same field as
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
792 OLD_POS; try to move NEW_POS so that it is. */
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
793 {
68394
0b6d0aad4517 (Fconstrain_to_field): Fix behaviour on field boundaries.
Károly Lőrentey <lorentey@elte.hu>
parents: 68392
diff changeset
794 int shortage;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
795 Lisp_Object field_bound;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
796
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
797 if (fwd)
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
798 field_bound = Ffield_end (old_pos, escape_from_edge, new_pos);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
799 else
41065
af0215d05281 (find_field): Add BEG_LIMIT and END_LIMIT parameters.
Miles Bader <miles@gnu.org>
parents: 41062
diff changeset
800 field_bound = Ffield_beginning (old_pos, escape_from_edge, new_pos);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
801
30550
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
802 if (/* See if ESCAPE_FROM_EDGE caused FIELD_BOUND to jump to the
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
803 other side of NEW_POS, which would mean that NEW_POS is
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
804 already acceptable, and it's not necessary to constrain it
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
805 to FIELD_BOUND. */
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
806 ((XFASTINT (field_bound) < XFASTINT (new_pos)) ? fwd : !fwd)
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
807 /* NEW_POS should be constrained, but only if either
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
808 ONLY_IN_LINE is nil (in which case any constraint is OK),
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
809 or NEW_POS and FIELD_BOUND are on the same line (in which
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
810 case the constraint is OK even if ONLY_IN_LINE is non-nil). */
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
811 && (NILP (only_in_line)
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
812 /* This is the ONLY_IN_LINE case, check that NEW_POS and
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
813 FIELD_BOUND are on the same line by seeing whether
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
814 there's an intervening newline or not. */
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
815 || (scan_buffer ('\n',
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
816 XFASTINT (new_pos), XFASTINT (field_bound),
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
817 fwd ? -1 : 1, &shortage, 1),
73040724e653 (Fconstrain_to_field): Fix the conditions for deciding when to constrain
Miles Bader <miles@gnu.org>
parents: 30503
diff changeset
818 shortage != 0)))
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
819 /* Constrain NEW_POS to FIELD_BOUND. */
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
820 new_pos = field_bound;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
821
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
822 if (orig_point && XFASTINT (new_pos) != orig_point)
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
823 /* The NEW_POS argument was originally nil, so automatically set PT. */
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
824 SET_PT (XFASTINT (new_pos));
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
825 }
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
826
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
827 return new_pos;
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
828 }
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
829
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
830
40042
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
831 DEFUN ("line-beginning-position",
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
832 Fline_beginning_position, Sline_beginning_position, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
833 doc: /* Return the character position of the first character on the current line.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
834 With argument N not nil or 1, move forward N - 1 lines first.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
835 If scan reaches end of buffer, return that position.
40042
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
836
68392
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
837 This function constrains the returned position to the current field
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
838 unless that would be on a different line than the original,
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
839 unconstrained result. If N is nil or 1, and a front-sticky field
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
840 starts at point, the scan stops as soon as it starts. To ignore field
40042
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
841 boundaries bind `inhibit-field-text-motion' to t.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
842
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
843 This function does not move point. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
844 (n)
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
845 Lisp_Object n;
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
846 {
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
847 int orig, orig_byte, end;
70619
f5917c21d187 * intervals.c (set_point_both): Fix mixup before before and after
Chong Yidong <cyd@stupidchicken.com>
parents: 70213
diff changeset
848 int count = SPECPDL_INDEX ();
f5917c21d187 * intervals.c (set_point_both): Fix mixup before before and after
Chong Yidong <cyd@stupidchicken.com>
parents: 70213
diff changeset
849 specbind (Qinhibit_point_motion_hooks, Qt);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
850
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
851 if (NILP (n))
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
852 XSETFASTINT (n, 1);
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
853 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
854 CHECK_NUMBER (n);
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
855
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
856 orig = PT;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
857 orig_byte = PT_BYTE;
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
858 Fforward_line (make_number (XINT (n) - 1));
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
859 end = PT;
25647
947cb0e32a1d (Fline_beginning_position): Handle minibuffer prompt here.
Richard M. Stallman <rms@gnu.org>
parents: 25609
diff changeset
860
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
861 SET_PT_BOTH (orig, orig_byte);
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
862
70619
f5917c21d187 * intervals.c (set_point_both): Fix mixup before before and after
Chong Yidong <cyd@stupidchicken.com>
parents: 70213
diff changeset
863 unbind_to (count, Qnil);
f5917c21d187 * intervals.c (set_point_both): Fix mixup before before and after
Chong Yidong <cyd@stupidchicken.com>
parents: 70213
diff changeset
864
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
865 /* Return END constrained to the current input field. */
27081
f068649f1c28 (Fconstrain_to_field): Don't constrain if
Gerd Moellmann <gerd@gnu.org>
parents: 27077
diff changeset
866 return Fconstrain_to_field (make_number (end), make_number (orig),
f068649f1c28 (Fconstrain_to_field): Don't constrain if
Gerd Moellmann <gerd@gnu.org>
parents: 27077
diff changeset
867 XINT (n) != 1 ? Qt : Qnil,
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
868 Qt, Qnil);
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
869 }
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
870
40042
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
871 DEFUN ("line-end-position", Fline_end_position, Sline_end_position, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
872 doc: /* Return the character position of the last character on the current line.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
873 With argument N not nil or 1, move forward N - 1 lines first.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
874 If scan reaches end of buffer, return that position.
40042
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
875
68392
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
876 This function constrains the returned position to the current field
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
877 unless that would be on a different line than the original,
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
878 unconstrained result. If N is nil or 1, and a rear-sticky field ends
a0208539b9a3 (Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
Károly Lőrentey <lorentey@elte.hu>
parents: 66500
diff changeset
879 at point, the scan stops as soon as it starts. To ignore field
40042
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
880 boundaries bind `inhibit-field-text-motion' to t.
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
881
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
882 This function does not move point. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
883 (n)
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
884 Lisp_Object n;
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
885 {
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
886 int end_pos;
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
887 int orig = PT;
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
888
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
889 if (NILP (n))
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
890 XSETFASTINT (n, 1);
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
891 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
892 CHECK_NUMBER (n);
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
893
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
894 end_pos = find_before_next_newline (orig, 0, XINT (n) - (XINT (n) <= 0));
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
895
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
896 /* Return END_POS constrained to the current input field. */
27081
f068649f1c28 (Fconstrain_to_field): Don't constrain if
Gerd Moellmann <gerd@gnu.org>
parents: 27077
diff changeset
897 return Fconstrain_to_field (make_number (end_pos), make_number (orig),
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
898 Qnil, Qt, Qnil);
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
899 }
40042
c9ad5da1f79d (Fline_beginning_position, Fline_end_position): Clarify documentation.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
900
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
901
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
902 Lisp_Object
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
903 save_excursion_save ()
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
904 {
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
905 int visible = (XBUFFER (XWINDOW (selected_window)->buffer)
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
906 == current_buffer);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
907
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
908 return Fcons (Fpoint_marker (),
12982
385a67ad96c3 (save_excursion_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents: 12973
diff changeset
909 Fcons (Fcopy_marker (current_buffer->mark, Qnil),
2049
a358c97a23e4 (save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1916
diff changeset
910 Fcons (visible ? Qt : Qnil,
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
911 Fcons (current_buffer->mark_active,
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
912 selected_window))));
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
913 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
914
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
915 Lisp_Object
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
916 save_excursion_restore (info)
15075
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
917 Lisp_Object info;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
918 {
15075
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
919 Lisp_Object tem, tem1, omark, nmark;
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
920 struct gcpro gcpro1, gcpro2, gcpro3;
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
921 int visible_p;
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
922
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
923 tem = Fmarker_buffer (XCAR (info));
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
924 /* If buffer being returned to is now deleted, avoid error */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
925 /* Otherwise could get error here while unwinding to top level
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
926 and crash */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
927 /* In that case, Fmarker_buffer returns nil now. */
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 448
diff changeset
928 if (NILP (tem))
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929 return Qnil;
15075
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
930
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
931 omark = nmark = Qnil;
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
932 GCPRO3 (info, omark, nmark);
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
933
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
934 Fset_buffer (tem);
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
935
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
936 /* Point marker. */
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
937 tem = XCAR (info);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
938 Fgoto_char (tem);
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
939 unchain_marker (XMARKER (tem));
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
940
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
941 /* Mark marker. */
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
942 info = XCDR (info);
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
943 tem = XCAR (info);
7485
a1b7f72e0ea2 (save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
944 omark = Fmarker_position (current_buffer->mark);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
945 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
946 nmark = Fmarker_position (tem);
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
947 unchain_marker (XMARKER (tem));
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
948
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
949 /* visible */
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
950 info = XCDR (info);
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
951 visible_p = !NILP (XCAR (info));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49472
diff changeset
952
4420
8113d9ba472e (save_excursion_restore): Never make the buffer visible.
Richard M. Stallman <rms@gnu.org>
parents: 4358
diff changeset
953 #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
954 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
955 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
956 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
957 tem1 = Fcar (tem);
a358c97a23e4 (save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1916
diff changeset
958 if (!NILP (tem1)
1254
c7e7e3438711 * editfns.c (save_excursion_save, save_excursion_restore):
Jim Blandy <jimb@redhat.com>
parents: 1117
diff changeset
959 && current_buffer != XBUFFER (XWINDOW (selected_window)->buffer))
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
960 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
961 #endif /* 0 */
2049
a358c97a23e4 (save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1916
diff changeset
962
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
963 /* Mark active */
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
964 info = XCDR (info);
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
965 tem = XCAR (info);
2049
a358c97a23e4 (save_excursion_save): Save mark_active of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1916
diff changeset
966 tem1 = current_buffer->mark_active;
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
967 current_buffer->mark_active = tem;
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
968
6206
67c608b0e2f7 (save_excursion_restore): Don't call Vrun_hooks if nil.
Richard M. Stallman <rms@gnu.org>
parents: 5915
diff changeset
969 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
970 {
7485
a1b7f72e0ea2 (save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
971 /* 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
972 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
973 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
974 {
a1b7f72e0ea2 (save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
975 if (! EQ (omark, nmark))
a1b7f72e0ea2 (save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
976 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
977 }
a1b7f72e0ea2 (save_excursion_restore): Don't run activate-mark-hook
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
978 /* 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
979 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
980 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
981 }
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
982
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
983 /* If buffer was visible in a window, and a different window was
34165
3b3a64fbcb05 (save_excursion_restore): Don't move point
Gerd Moellmann <gerd@gnu.org>
parents: 32857
diff changeset
984 selected, and the old selected window is still showing this
3b3a64fbcb05 (save_excursion_restore): Don't move point
Gerd Moellmann <gerd@gnu.org>
parents: 32857
diff changeset
985 buffer, restore point in that window. */
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
986 tem = XCDR (info);
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
987 if (visible_p
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
988 && !EQ (tem, selected_window)
37492
b9cea35cf91f (save_excursion_restore): Don't use XBUFFER on
Gerd Moellmann <gerd@gnu.org>
parents: 37217
diff changeset
989 && (tem1 = XWINDOW (tem)->buffer,
b9cea35cf91f (save_excursion_restore): Don't use XBUFFER on
Gerd Moellmann <gerd@gnu.org>
parents: 37217
diff changeset
990 (/* Window is live... */
b9cea35cf91f (save_excursion_restore): Don't use XBUFFER on
Gerd Moellmann <gerd@gnu.org>
parents: 37217
diff changeset
991 BUFFERP (tem1)
b9cea35cf91f (save_excursion_restore): Don't use XBUFFER on
Gerd Moellmann <gerd@gnu.org>
parents: 37217
diff changeset
992 /* ...and it shows the current buffer. */
b9cea35cf91f (save_excursion_restore): Don't use XBUFFER on
Gerd Moellmann <gerd@gnu.org>
parents: 37217
diff changeset
993 && XBUFFER (tem1) == current_buffer)))
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
994 Fset_window_point (tem, make_number (PT));
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
995
15075
e8613675066c (save_excursion_restore): Add gcpros.
Richard M. Stallman <rms@gnu.org>
parents: 15015
diff changeset
996 UNGCPRO;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
998 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
999
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1000 DEFUN ("save-excursion", Fsave_excursion, Ssave_excursion, 0, UNEVALLED, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1001 doc: /* Save point, mark, and current buffer; execute BODY; restore those things.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1002 Executes BODY just like `progn'.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1003 The values of point, mark and the current buffer are restored
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1004 even in case of abnormal exit (throw or error).
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1005 The state of activation of the mark is also restored.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1006
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1007 This construct does not save `deactivate-mark', and therefore
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1008 functions that change the buffer will still cause deactivation
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1009 of the mark at the end of the command. To prevent that, bind
40140
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
1010 `deactivate-mark' with `let'.
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
1011
106630
af4f4af3e19f (Fsave_excursion): Mention save-current-buffer in the docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1012 If you only want to save the current buffer but not point nor mark,
af4f4af3e19f (Fsave_excursion): Mention save-current-buffer in the docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1013 then just use `save-current-buffer', or even `with-current-buffer'.
af4f4af3e19f (Fsave_excursion): Mention save-current-buffer in the docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1014
40140
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
1015 usage: (save-excursion &rest BODY) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1016 (args)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1017 Lisp_Object args;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1018 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1019 register Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45398
diff changeset
1020 int count = SPECPDL_INDEX ();
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 record_unwind_protect (save_excursion_restore, save_excursion_save ());
16298
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1023
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1024 val = Fprogn (args);
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1025 return unbind_to (count, val);
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1026 }
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1027
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1028 DEFUN ("save-current-buffer", Fsave_current_buffer, Ssave_current_buffer, 0, UNEVALLED, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1029 doc: /* Save the current buffer; execute BODY; restore the current buffer.
40140
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
1030 Executes BODY just like `progn'.
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
1031 usage: (save-current-buffer &rest BODY) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1032 (args)
16298
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1033 Lisp_Object args;
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1034 {
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
1035 Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45398
diff changeset
1036 int count = SPECPDL_INDEX ();
16298
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1037
20696
cdbe4824e7f1 (Fsave_current_buffer): Use set_buffer_if_live.
Richard M. Stallman <rms@gnu.org>
parents: 20688
diff changeset
1038 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
16298
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
1039
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1040 val = Fprogn (args);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1041 return unbind_to (count, val);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1042 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1043
25608
1cdab17df2b3 (Fbufsize): Accept an extra BUFFER parameter.
Richard M. Stallman <rms@gnu.org>
parents: 25507
diff changeset
1044 DEFUN ("buffer-size", Fbufsize, Sbufsize, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1045 doc: /* Return the number of characters in the current buffer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1046 If BUFFER, return the number of characters in that buffer instead. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1047 (buffer)
25608
1cdab17df2b3 (Fbufsize): Accept an extra BUFFER parameter.
Richard M. Stallman <rms@gnu.org>
parents: 25507
diff changeset
1048 Lisp_Object buffer;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1049 {
25608
1cdab17df2b3 (Fbufsize): Accept an extra BUFFER parameter.
Richard M. Stallman <rms@gnu.org>
parents: 25507
diff changeset
1050 if (NILP (buffer))
1cdab17df2b3 (Fbufsize): Accept an extra BUFFER parameter.
Richard M. Stallman <rms@gnu.org>
parents: 25507
diff changeset
1051 return make_number (Z - BEG);
25609
157f0e91232e Clear up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 25608
diff changeset
1052 else
157f0e91232e Clear up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 25608
diff changeset
1053 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1054 CHECK_BUFFER (buffer);
25609
157f0e91232e Clear up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 25608
diff changeset
1055 return make_number (BUF_Z (XBUFFER (buffer))
157f0e91232e Clear up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 25608
diff changeset
1056 - BUF_BEG (XBUFFER (buffer)));
157f0e91232e Clear up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 25608
diff changeset
1057 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1058 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1059
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1060 DEFUN ("point-min", Fpoint_min, Spoint_min, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1061 doc: /* Return the minimum permissible value of point in the current buffer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1062 This is 1, unless narrowing (a buffer restriction) is in effect. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1063 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1064 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1065 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
1066 XSETFASTINT (temp, BEGV);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1067 return temp;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1070 DEFUN ("point-min-marker", Fpoint_min_marker, Spoint_min_marker, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1071 doc: /* Return a marker to the minimum permissible value of point in this buffer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1072 This is the beginning, unless narrowing (a buffer restriction) is in effect. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1073 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1074 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1075 return buildmark (BEGV, BEGV_BYTE);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1076 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1077
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1078 DEFUN ("point-max", Fpoint_max, Spoint_max, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1079 doc: /* Return the maximum permissible value of point in the current buffer.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1080 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1081 is in effect, in which case it is less. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1082 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1083 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084 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
1085 XSETFASTINT (temp, ZV);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086 return temp;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1089 DEFUN ("point-max-marker", Fpoint_max_marker, Spoint_max_marker, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1090 doc: /* Return a marker to the maximum permissible value of point in this buffer.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1091 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1092 is in effect, in which case it is less. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1093 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1095 return buildmark (ZV, ZV_BYTE);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1096 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1097
21821
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1098 DEFUN ("gap-position", Fgap_position, Sgap_position, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1099 doc: /* Return the position of the gap, in the current buffer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1100 See also `gap-size'. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1101 ()
21821
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1102 {
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1103 Lisp_Object temp;
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1104 XSETFASTINT (temp, GPT);
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1105 return temp;
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1106 }
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1107
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1108 DEFUN ("gap-size", Fgap_size, Sgap_size, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1109 doc: /* Return the size of the current buffer's gap.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1110 See also `gap-position'. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1111 ()
21821
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1112 {
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1113 Lisp_Object temp;
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1114 XSETFASTINT (temp, GAP_SIZE);
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1115 return temp;
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1116 }
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
1117
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
1118 DEFUN ("position-bytes", Fposition_bytes, Sposition_bytes, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1119 doc: /* Return the byte position for character position POSITION.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1120 If POSITION is out of range, the value is nil. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1121 (position)
20879
64d2baa47498 (Fposition_bytes): Declare arg POSITION as Lips_Object.
Kenichi Handa <handa@m17n.org>
parents: 20878
diff changeset
1122 Lisp_Object position;
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
1123 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1124 CHECK_NUMBER_COERCE_MARKER (position);
23132
1c8e0e09aea1 (Fposition_bytes): If the arg POSITION is out of
Kenichi Handa <handa@m17n.org>
parents: 23063
diff changeset
1125 if (XINT (position) < BEG || XINT (position) > Z)
1c8e0e09aea1 (Fposition_bytes): If the arg POSITION is out of
Kenichi Handa <handa@m17n.org>
parents: 23063
diff changeset
1126 return Qnil;
20878
34e0c8eb49eb (Fposition_bytes): Allow marker as arg POSITION. Use
Kenichi Handa <handa@m17n.org>
parents: 20861
diff changeset
1127 return make_number (CHAR_TO_BYTE (XINT (position)));
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
1128 }
22645
e5b201634497 (Fbyte_to_position): New function.
Richard M. Stallman <rms@gnu.org>
parents: 22199
diff changeset
1129
e5b201634497 (Fbyte_to_position): New function.
Richard M. Stallman <rms@gnu.org>
parents: 22199
diff changeset
1130 DEFUN ("byte-to-position", Fbyte_to_position, Sbyte_to_position, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1131 doc: /* Return the character position for byte position BYTEPOS.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1132 If BYTEPOS is out of range, the value is nil. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1133 (bytepos)
22645
e5b201634497 (Fbyte_to_position): New function.
Richard M. Stallman <rms@gnu.org>
parents: 22199
diff changeset
1134 Lisp_Object bytepos;
e5b201634497 (Fbyte_to_position): New function.
Richard M. Stallman <rms@gnu.org>
parents: 22199
diff changeset
1135 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1136 CHECK_NUMBER (bytepos);
23132
1c8e0e09aea1 (Fposition_bytes): If the arg POSITION is out of
Kenichi Handa <handa@m17n.org>
parents: 23063
diff changeset
1137 if (XINT (bytepos) < BEG_BYTE || XINT (bytepos) > Z_BYTE)
1c8e0e09aea1 (Fposition_bytes): If the arg POSITION is out of
Kenichi Handa <handa@m17n.org>
parents: 23063
diff changeset
1138 return Qnil;
22645
e5b201634497 (Fbyte_to_position): New function.
Richard M. Stallman <rms@gnu.org>
parents: 22199
diff changeset
1139 return make_number (BYTE_TO_CHAR (XINT (bytepos)));
e5b201634497 (Fbyte_to_position): New function.
Richard M. Stallman <rms@gnu.org>
parents: 22199
diff changeset
1140 }
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
1141
512
b7a1e4e4e7e6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1142 DEFUN ("following-char", Ffollowing_char, Sfollowing_char, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1143 doc: /* Return the character following point, as a number.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1144 At the end of the buffer or accessible region, return 0. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1145 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1146 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1147 Lisp_Object temp;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15910
diff changeset
1148 if (PT >= ZV)
9305
ac077e2a75f1 (Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents: 9265
diff changeset
1149 XSETFASTINT (temp, 0);
512
b7a1e4e4e7e6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1150 else
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1151 XSETFASTINT (temp, FETCH_CHAR (PT_BYTE));
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1152 return temp;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1153 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1154
512
b7a1e4e4e7e6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1155 DEFUN ("preceding-char", Fprevious_char, Sprevious_char, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1156 doc: /* Return the character preceding point, as a number.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1157 At the beginning of the buffer or accessible region, return 0. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1158 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160 Lisp_Object temp;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15910
diff changeset
1161 if (PT <= BEGV)
9305
ac077e2a75f1 (Fstring_to_char, Fpoint, Fbufsize, Fpoint_min, Fpoint_max, Ffollowing_char,
Karl Heuer <kwzh@gnu.org>
parents: 9265
diff changeset
1162 XSETFASTINT (temp, 0);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1163 else if (!NILP (current_buffer->enable_multibyte_characters))
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1164 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1165 int pos = PT_BYTE;
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1166 DEC_POS (pos);
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1167 XSETFASTINT (temp, FETCH_CHAR (pos));
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1168 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1169 else
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1170 XSETFASTINT (temp, FETCH_BYTE (PT_BYTE - 1));
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1171 return temp;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1172 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1173
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1174 DEFUN ("bobp", Fbobp, Sbobp, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1175 doc: /* Return t if point is at the beginning of the buffer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1176 If the buffer is narrowed, this means the beginning of the narrowed part. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1177 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1178 {
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15910
diff changeset
1179 if (PT == BEGV)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1180 return Qt;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1181 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1182 }
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 ("eobp", Feobp, Seobp, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1185 doc: /* Return t if point is at the end of the buffer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1186 If the buffer is narrowed, this means the end of the narrowed part. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1187 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1188 {
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15910
diff changeset
1189 if (PT == ZV)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1190 return Qt;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1191 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1192 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1193
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1194 DEFUN ("bolp", Fbolp, Sbolp, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1195 doc: /* Return t if point is at the beginning of a line. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1196 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1198 if (PT == BEGV || FETCH_BYTE (PT_BYTE - 1) == '\n')
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1199 return Qt;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1201 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1202
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 DEFUN ("eolp", Feolp, Seolp, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1204 doc: /* Return t if point is at the end of a line.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1205 `End of a line' includes point being at the end of the buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1206 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1208 if (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n')
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1209 return Qt;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1210 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1211 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1212
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1213 DEFUN ("char-after", Fchar_after, Schar_after, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1214 doc: /* Return character in current buffer at position POS.
53819
a3fe35a8b56b (Fchar_after, Fchar_before): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53687
diff changeset
1215 POS is an integer or a marker and defaults to point.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1216 If POS is out of range, the value is nil. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1217 (pos)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1218 Lisp_Object pos;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1219 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1220 register int pos_byte;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1221
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1222 if (NILP (pos))
22199
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1223 {
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1224 pos_byte = PT_BYTE;
23577
36cccf1ba0a9 (Fchar_after): Fix type clashes.
Andreas Schwab <schwab@suse.de>
parents: 23565
diff changeset
1225 XSETFASTINT (pos, PT);
22199
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1226 }
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1227
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1228 if (MARKERP (pos))
21200
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1229 {
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1230 pos_byte = marker_byte_position (pos);
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1231 if (pos_byte < BEGV_BYTE || pos_byte >= ZV_BYTE)
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1232 return Qnil;
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1233 }
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1234 else
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1235 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1236 CHECK_NUMBER_COERCE_MARKER (pos);
21521
354a7085f1d7 (Fchar_after, Fchar_before): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
1237 if (XINT (pos) < BEGV || XINT (pos) >= ZV)
21200
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1238 return Qnil;
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1239
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1240 pos_byte = CHAR_TO_BYTE (XINT (pos));
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1241 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1242
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1243 return make_number (FETCH_CHAR (pos_byte));
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1244 }
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1245
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1246 DEFUN ("char-before", Fchar_before, Schar_before, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1247 doc: /* Return character in current buffer preceding position POS.
53819
a3fe35a8b56b (Fchar_after, Fchar_before): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53687
diff changeset
1248 POS is an integer or a marker and defaults to point.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1249 If POS is out of range, the value is nil. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1250 (pos)
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1251 Lisp_Object pos;
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1252 {
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1253 register Lisp_Object val;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1254 register int pos_byte;
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1255
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1256 if (NILP (pos))
22199
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1257 {
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1258 pos_byte = PT_BYTE;
23577
36cccf1ba0a9 (Fchar_after): Fix type clashes.
Andreas Schwab <schwab@suse.de>
parents: 23565
diff changeset
1259 XSETFASTINT (pos, PT);
22199
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1260 }
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1261
edca9002c740 (Fchar_after): Make nil fully equivalent to (point) as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21914
diff changeset
1262 if (MARKERP (pos))
21200
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1263 {
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1264 pos_byte = marker_byte_position (pos);
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1265
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1266 if (pos_byte <= BEGV_BYTE || pos_byte > ZV_BYTE)
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1267 return Qnil;
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1268 }
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1269 else
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1270 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1271 CHECK_NUMBER_COERCE_MARKER (pos);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1272
21521
354a7085f1d7 (Fchar_after, Fchar_before): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
1273 if (XINT (pos) <= BEGV || XINT (pos) > ZV)
21200
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1274 return Qnil;
ea520c42a342 (Fchar_after, Fchar_before): Properly check arg type
Richard M. Stallman <rms@gnu.org>
parents: 21064
diff changeset
1275
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1276 pos_byte = CHAR_TO_BYTE (XINT (pos));
18252
9c4fb902b6eb (Fchar_after, Fchar_before): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 18240
diff changeset
1277 }
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1278
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1279 if (!NILP (current_buffer->enable_multibyte_characters))
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1280 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1281 DEC_POS (pos_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1282 XSETFASTINT (val, FETCH_CHAR (pos_byte));
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1283 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1284 else
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1285 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1286 pos_byte--;
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
1287 XSETFASTINT (val, FETCH_BYTE (pos_byte));
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1288 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1289 return val;
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
1290 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1291
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1292 DEFUN ("user-login-name", Fuser_login_name, Suser_login_name, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1293 doc: /* Return the name under which the user logged in, as a string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1294 This is based on the effective uid, not the real uid.
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
1295 Also, if the environment variables LOGNAME or USER are set,
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1296 that determines the value of this function.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1297
102631
f13c449487ad (Fuser_login_name): Support float arguments. Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 100951
diff changeset
1298 If optional argument UID is an integer or a float, return the login name
f13c449487ad (Fuser_login_name): Support float arguments. Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 100951
diff changeset
1299 of the user with that uid, or nil if there is no such user. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1300 (uid)
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1301 Lisp_Object uid;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1302 {
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1303 struct passwd *pw;
102631
f13c449487ad (Fuser_login_name): Support float arguments. Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 100951
diff changeset
1304 uid_t id;
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1305
9520
5187a4159d16 (Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents: 9305
diff changeset
1306 /* 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
1307 (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
1308 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
1309 if (INTEGERP (Vuser_login_name))
9520
5187a4159d16 (Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents: 9305
diff changeset
1310 init_editfns ();
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1311
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1312 if (NILP (uid))
12026
505a894d943e (syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents: 11912
diff changeset
1313 return Vuser_login_name;
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1314
102631
f13c449487ad (Fuser_login_name): Support float arguments. Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 100951
diff changeset
1315 id = (uid_t)XFLOATINT (uid);
71817
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1316 BLOCK_INPUT;
102631
f13c449487ad (Fuser_login_name): Support float arguments. Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 100951
diff changeset
1317 pw = (struct passwd *) getpwuid (id);
71817
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1318 UNBLOCK_INPUT;
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9520
diff changeset
1319 return (pw ? build_string (pw->pw_name) : Qnil);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1320 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1321
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1322 DEFUN ("user-real-login-name", Fuser_real_login_name, Suser_real_login_name,
40981
fee88c193206 (Fuser_real_login_name): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40699
diff changeset
1323 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1324 doc: /* Return the name of the user's real uid, as a string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1325 This ignores the environment variables LOGNAME and USER, so it differs from
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1326 `user-login-name' when running under `su'. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1327 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1328 {
9520
5187a4159d16 (Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents: 9305
diff changeset
1329 /* 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
1330 (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
1331 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
1332 if (INTEGERP (Vuser_login_name))
9520
5187a4159d16 (Fuser_login_name, Fuser_real_login_name):
Richard M. Stallman <rms@gnu.org>
parents: 9305
diff changeset
1333 init_editfns ();
12026
505a894d943e (syms_of_editfns): user-login-name renamed from user-name.
Karl Heuer <kwzh@gnu.org>
parents: 11912
diff changeset
1334 return Vuser_real_login_name;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1335 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1336
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1337 DEFUN ("user-uid", Fuser_uid, Suser_uid, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1338 doc: /* Return the effective uid of Emacs.
102662
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1339 Value is an integer or a float, depending on the value. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1340 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1341 {
75217
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1342 /* Assignment to EMACS_INT stops GCC whining about limited range of
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1343 data type. */
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1344 EMACS_INT euid = geteuid ();
102662
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1345
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1346 /* Make sure we don't produce a negative UID due to signed integer
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1347 overflow. */
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1348 if (euid < 0)
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1349 return make_float ((double)geteuid ());
75217
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1350 return make_fixnum_or_float (euid);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1351 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1352
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1353 DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1354 doc: /* Return the real uid of Emacs.
102662
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1355 Value is an integer or a float, depending on the value. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1356 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1357 {
75217
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1358 /* Assignment to EMACS_INT stops GCC whining about limited range of
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1359 data type. */
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1360 EMACS_INT uid = getuid ();
102662
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1361
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1362 /* Make sure we don't produce a negative UID due to signed integer
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1363 overflow. */
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1364 if (uid < 0)
aa16e7d76321 (Fuser_uid, Fuser_real_uid): If UID as EMACS_INT is negative, produce
Eli Zaretskii <eliz@gnu.org>
parents: 102631
diff changeset
1365 return make_float ((double)getuid ());
75217
9e5c071deb9f (Fuser_uid, Fuser_real_uid): Copy values returned by geteuid and getuid
Eli Zaretskii <eliz@gnu.org>
parents: 75181
diff changeset
1366 return make_fixnum_or_float (uid);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1367 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1368
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
1369 DEFUN ("user-full-name", Fuser_full_name, Suser_full_name, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1370 doc: /* Return the full name of the user logged in, as a string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1371 If the full name corresponding to Emacs's userid is not known,
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1372 return "unknown".
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1373
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1374 If optional argument UID is an integer or float, return the full name
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1375 of the user with that uid, or nil if there is no such user.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1376 If UID is a string, return the full name of the user with that login
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1377 name, or nil if there is no such user. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1378 (uid)
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
1379 Lisp_Object uid;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380 {
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
1381 struct passwd *pw;
18661
537522d5e6d8 (Fuser_full_name): Declare p, q and r as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents: 18613
diff changeset
1382 register unsigned char *p, *q;
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1383 Lisp_Object full;
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
1384
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
1385 if (NILP (uid))
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1386 return Vuser_full_name;
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1387 else if (NUMBERP (uid))
71817
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1388 {
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1389 BLOCK_INPUT;
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1390 pw = (struct passwd *) getpwuid ((uid_t) XFLOATINT (uid));
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1391 UNBLOCK_INPUT;
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1392 }
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1393 else if (STRINGP (uid))
71817
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1394 {
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1395 BLOCK_INPUT;
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1396 pw = (struct passwd *) getpwnam (SDATA (uid));
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1397 UNBLOCK_INPUT;
fb57c1830788 Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 71498
diff changeset
1398 }
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1399 else
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1400 error ("Invalid UID specification");
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
1401
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1402 if (!pw)
16683
6802dbd07a80 (Fuser_full_name): Return nil if the specified user doesn't exist.
Richard M. Stallman <rms@gnu.org>
parents: 16648
diff changeset
1403 return Qnil;
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1404
97655
287457e9bac1 (USER_FULL_NAME): Define to pw->pw_gecos if undefined.
Eli Zaretskii <eliz@gnu.org>
parents: 96718
diff changeset
1405 p = (unsigned char *) USER_FULL_NAME;
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1406 /* Chop off everything after the first comma. */
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1407 q = (unsigned char *) index (p, ',');
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1408 full = make_string (p, q ? q - p : strlen (p));
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1409
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1410 #ifdef AMPERSAND_FULL_NAME
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1411 p = SDATA (full);
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1412 q = (unsigned char *) index (p, '&');
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1413 /* Substitute the login name for the &, upcasing the first character. */
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1414 if (q)
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1415 {
18661
537522d5e6d8 (Fuser_full_name): Declare p, q and r as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents: 18613
diff changeset
1416 register unsigned char *r;
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1417 Lisp_Object login;
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1418
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1419 login = Fuser_login_name (make_number (pw->pw_uid));
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1420 r = (unsigned char *) alloca (strlen (p) + SCHARS (login) + 1);
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1421 bcopy (p, r, q - p);
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1422 r[q - p] = 0;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1423 strcat (r, SDATA (login));
16641
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1424 r[q - p] = UPCASE (r[q - p]);
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1425 strcat (r, q + 1);
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1426 full = build_string (r);
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1427 }
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1428 #endif /* AMPERSAND_FULL_NAME */
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1429
2103a88cc61f (Fuser_full_name): Accept a string (the login name) as
Richard M. Stallman <rms@gnu.org>
parents: 16639
diff changeset
1430 return full;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433 DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0,
72751
9128a4531448 (Fsystem_name): Mention "host" in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents: 72669
diff changeset
1434 doc: /* Return the host name of the machine you are running on, as a string. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1435 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1436 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 return Vsystem_name;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1438 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1439
7907
148ad20d6774 (init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents: 7862
diff changeset
1440 /* For the benefit of callers who don't want to include lisp.h */
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
1441
7907
148ad20d6774 (init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents: 7862
diff changeset
1442 char *
148ad20d6774 (init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents: 7862
diff changeset
1443 get_system_name ()
148ad20d6774 (init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents: 7862
diff changeset
1444 {
18756
751f531e5a20 (get_system_name): Don't crash if Vsystem_name does not contain a string.
Richard M. Stallman <rms@gnu.org>
parents: 18745
diff changeset
1445 if (STRINGP (Vsystem_name))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1446 return (char *) SDATA (Vsystem_name);
18756
751f531e5a20 (get_system_name): Don't crash if Vsystem_name does not contain a string.
Richard M. Stallman <rms@gnu.org>
parents: 18745
diff changeset
1447 else
751f531e5a20 (get_system_name): Don't crash if Vsystem_name does not contain a string.
Richard M. Stallman <rms@gnu.org>
parents: 18745
diff changeset
1448 return "";
7907
148ad20d6774 (init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents: 7862
diff changeset
1449 }
148ad20d6774 (init_editfns): Call init_system_name instead of get_system_name.
Karl Heuer <kwzh@gnu.org>
parents: 7862
diff changeset
1450
59658
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1451 char *
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1452 get_operating_system_release()
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1453 {
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1454 if (STRINGP (Voperating_system_release))
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1455 return (char *) SDATA (Voperating_system_release);
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1456 else
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1457 return "";
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1458 }
45074d913d23 * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 59644
diff changeset
1459
5373
a70b89d2d6bb (Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5242
diff changeset
1460 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1461 doc: /* Return the process ID of Emacs, as an integer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1462 ()
5373
a70b89d2d6bb (Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5242
diff changeset
1463 {
a70b89d2d6bb (Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5242
diff changeset
1464 return make_number (getpid ());
a70b89d2d6bb (Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5242
diff changeset
1465 }
a70b89d2d6bb (Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5242
diff changeset
1466
448
129e6320092c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 372
diff changeset
1467 DEFUN ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1468 doc: /* Return the current time, as the number of seconds since 1970-01-01 00:00:00.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1469 The time is returned as a list of three integers. The first has the
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1470 most significant 16 bits of the seconds, while the second has the
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1471 least significant 16 bits. The third integer gives the microsecond
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1472 count.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1473
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1474 The microsecond count is zero on systems that do not provide
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1475 resolution finer than a second. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1476 ()
448
129e6320092c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 372
diff changeset
1477 {
577
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 512
diff changeset
1478 EMACS_TIME t;
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 512
diff changeset
1479
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 512
diff changeset
1480 EMACS_GET_TIME (t);
72531
90bdf0a2ff4c (Fcurrent_time, Fget_internal_run_time): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72272
diff changeset
1481 return list3 (make_number ((EMACS_SECS (t) >> 16) & 0xffff),
90bdf0a2ff4c (Fcurrent_time, Fget_internal_run_time): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72272
diff changeset
1482 make_number ((EMACS_SECS (t) >> 0) & 0xffff),
90bdf0a2ff4c (Fcurrent_time, Fget_internal_run_time): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72272
diff changeset
1483 make_number (EMACS_USECS (t)));
448
129e6320092c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 372
diff changeset
1484 }
57987
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1485
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1486 DEFUN ("get-internal-run-time", Fget_internal_run_time, Sget_internal_run_time,
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1487 0, 0, 0,
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1488 doc: /* Return the current run time used by Emacs.
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1489 The time is returned as a list of three integers. The first has the
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1490 most significant 16 bits of the seconds, while the second has the
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1491 least significant 16 bits. The third integer gives the microsecond
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1492 count.
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1493
75387
41b2aae64f85 (Finsert_char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75217
diff changeset
1494 On systems that can't determine the run time, `get-internal-run-time'
41b2aae64f85 (Finsert_char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75217
diff changeset
1495 does the same thing as `current-time'. The microsecond count is zero
41b2aae64f85 (Finsert_char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75217
diff changeset
1496 on systems that do not provide resolution finer than a second. */)
57987
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1497 ()
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1498 {
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1499 #ifdef HAVE_GETRUSAGE
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1500 struct rusage usage;
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1501 int secs, usecs;
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1502
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1503 if (getrusage (RUSAGE_SELF, &usage) < 0)
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1504 /* This shouldn't happen. What action is appropriate? */
71975
6d29dff081c5 (region_limit, Fget_internal_run_time): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents: 71865
diff changeset
1505 xsignal0 (Qerror);
57987
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1506
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1507 /* Sum up user time and system time. */
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1508 secs = usage.ru_utime.tv_sec + usage.ru_stime.tv_sec;
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1509 usecs = usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1510 if (usecs >= 1000000)
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1511 {
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1512 usecs -= 1000000;
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1513 secs++;
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1514 }
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1515
72531
90bdf0a2ff4c (Fcurrent_time, Fget_internal_run_time): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72272
diff changeset
1516 return list3 (make_number ((secs >> 16) & 0xffff),
90bdf0a2ff4c (Fcurrent_time, Fget_internal_run_time): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72272
diff changeset
1517 make_number ((secs >> 0) & 0xffff),
90bdf0a2ff4c (Fcurrent_time, Fget_internal_run_time): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72272
diff changeset
1518 make_number (usecs));
81422
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
1519 #else /* ! HAVE_GETRUSAGE */
96348
ecd6143014da Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
Juanma Barranquero <lekktu@gmail.com>
parents: 95479
diff changeset
1520 #ifdef WINDOWSNT
81422
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
1521 return w32_get_internal_run_time ();
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
1522 #else /* ! WINDOWSNT */
57987
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1523 return Fcurrent_time ();
81422
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
1524 #endif /* WINDOWSNT */
9086f0548bdc (Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.
Jason Rumney <jasonr@gnu.org>
parents: 81286
diff changeset
1525 #endif /* HAVE_GETRUSAGE */
57987
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
1526 }
448
129e6320092c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 372
diff changeset
1527
129e6320092c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 372
diff changeset
1528
55193
1b09eb24ab02 (lisp_time_argument): Provide externally.
Eli Zaretskii <eliz@gnu.org>
parents: 54846
diff changeset
1529 int
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1530 lisp_time_argument (specified_time, result, usec)
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1531 Lisp_Object specified_time;
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1532 time_t *result;
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1533 int *usec;
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1534 {
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1535 if (NILP (specified_time))
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1536 {
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1537 if (usec)
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1538 {
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1539 EMACS_TIME t;
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1540
30503
fef49230e1aa (lisp_time_argument): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 30480
diff changeset
1541 EMACS_GET_TIME (t);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1542 *usec = EMACS_USECS (t);
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1543 *result = EMACS_SECS (t);
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1544 return 1;
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1545 }
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1546 else
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1547 return time (result) != -1;
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1548 }
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1549 else
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1550 {
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1551 Lisp_Object high, low;
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1552 high = Fcar (specified_time);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1553 CHECK_NUMBER (high);
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1554 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
1555 if (CONSP (low))
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1556 {
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1557 if (usec)
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1558 {
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1559 Lisp_Object usec_l = Fcdr (low);
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1560 if (CONSP (usec_l))
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1561 usec_l = Fcar (usec_l);
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1562 if (NILP (usec_l))
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1563 *usec = 0;
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1564 else
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1565 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1566 CHECK_NUMBER (usec_l);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1567 *usec = XINT (usec_l);
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1568 }
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1569 }
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1570 low = Fcar (low);
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1571 }
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1572 else if (usec)
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1573 *usec = 0;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1574 CHECK_NUMBER (low);
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1575 *result = (XINT (high) << 16) + (XINT (low) & 0xffff);
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1576 return *result >> 16 == XINT (high);
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1577 }
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1578 }
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1579
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1580 DEFUN ("float-time", Ffloat_time, Sfloat_time, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1581 doc: /* Return the current time, as a float number of seconds since the epoch.
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
1582 If SPECIFIED-TIME is given, it is the time to convert to float
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1583 instead of the current time. The argument should have the form
102724
5dfe0cbf0e1b (Ffloat_time): Doc fix (Bug#2768).
Chong Yidong <cyd@stupidchicken.com>
parents: 102662
diff changeset
1584 (HIGH LOW) or (HIGH LOW USEC). Thus, you can use times obtained from
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1585 `current-time' and from `file-attributes'. SPECIFIED-TIME can also
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1586 have the form (HIGH . LOW), but this is considered obsolete.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1587
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1588 WARNING: Since the result is floating point, it may not be exact.
106774
736322971285 editfns.c (Ffloat_time): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 106630
diff changeset
1589 If precise time stamps are required, use either `current-time',
736322971285 editfns.c (Ffloat_time): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 106630
diff changeset
1590 or (if you need time as a string) `format-time-string'. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1591 (specified_time)
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1592 Lisp_Object specified_time;
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1593 {
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1594 time_t sec;
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1595 int usec;
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1596
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1597 if (! lisp_time_argument (specified_time, &sec, &usec))
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1598 error ("Invalid time specification");
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1599
37046
a9b2639dd045 (Ffloat_time): Fix off-by-factor-of-10 bug in the
Gerd Moellmann <gerd@gnu.org>
parents: 36479
diff changeset
1600 return make_float ((sec * 1e6 + usec) / 1e6);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1601 }
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1602
23213
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1603 /* Write information into buffer S of size MAXSIZE, according to the
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1604 FORMAT of length FORMAT_LEN, using time information taken from *TP.
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1605 Default to Universal Time if UT is nonzero, local time otherwise.
23213
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1606 Return the number of bytes written, not including the terminating
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1607 '\0'. If S is NULL, nothing will be written anywhere; so to
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1608 determine how many bytes would be written, use NULL for S and
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1609 ((size_t) -1) for MAXSIZE.
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1610
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1611 This function behaves like emacs_strftimeu, except it allows null
23213
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1612 bytes in FORMAT. */
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1613 static size_t
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1614 emacs_memftimeu (s, maxsize, format, format_len, tp, ut)
23213
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1615 char *s;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1616 size_t maxsize;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1617 const char *format;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1618 size_t format_len;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1619 const struct tm *tp;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1620 int ut;
23213
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1621 {
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1622 size_t total = 0;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1623
23218
90e5d916ebd9 Add a comment to emacs_memftime, explaining why it needs to loop.
Paul Eggert <eggert@twinsun.com>
parents: 23213
diff changeset
1624 /* Loop through all the null-terminated strings in the format
90e5d916ebd9 Add a comment to emacs_memftime, explaining why it needs to loop.
Paul Eggert <eggert@twinsun.com>
parents: 23213
diff changeset
1625 argument. Normally there's just one null-terminated string, but
90e5d916ebd9 Add a comment to emacs_memftime, explaining why it needs to loop.
Paul Eggert <eggert@twinsun.com>
parents: 23213
diff changeset
1626 there can be arbitrarily many, concatenated together, if the
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1627 format contains '\0' bytes. emacs_strftimeu stops at the first
23218
90e5d916ebd9 Add a comment to emacs_memftime, explaining why it needs to loop.
Paul Eggert <eggert@twinsun.com>
parents: 23213
diff changeset
1628 '\0' byte so we must invoke it separately for each such string. */
23213
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1629 for (;;)
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1630 {
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1631 size_t len;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1632 size_t result;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1633
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1634 if (s)
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1635 s[0] = '\1';
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1636
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1637 result = emacs_strftimeu (s, maxsize, format, tp, ut);
23213
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1638
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1639 if (s)
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1640 {
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1641 if (result == 0 && s[0] != '\0')
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1642 return 0;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1643 s += result + 1;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1644 }
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1645
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1646 maxsize -= result + 1;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1647 total += result;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1648 len = strlen (format);
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1649 if (len == format_len)
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1650 return total;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1651 total++;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1652 format += len + 1;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1653 format_len -= len + 1;
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1654 }
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1655 }
3bfc1e9b0377 (emacs_memftime): New function.
Paul Eggert <eggert@twinsun.com>
parents: 23211
diff changeset
1656
17907
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1657 DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1658 doc: /* Use FORMAT-STRING to format the time TIME, or now if omitted.
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1659 TIME is specified as (HIGH LOW . IGNORED), as returned by
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1660 `current-time' or `file-attributes'. The obsolete form (HIGH . LOW)
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1661 is also still accepted.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1662 The third, optional, argument UNIVERSAL, if non-nil, means describe TIME
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1663 as Universal Time; nil means describe TIME in the local time zone.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1664 The value is a copy of FORMAT-STRING, but with certain constructs replaced
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1665 by text that describes the specified date and time in TIME:
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1666
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1667 %Y is the year, %y within the century, %C the century.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1668 %G is the year corresponding to the ISO week, %g within the century.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1669 %m is the numeric month.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1670 %b and %h are the locale's abbreviated month name, %B the full name.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1671 %d is the day of the month, zero-padded, %e is blank-padded.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1672 %u is the numeric day of week from 1 (Monday) to 7, %w from 0 (Sunday) to 6.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1673 %a is the locale's abbreviated name of the day of week, %A the full name.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1674 %U is the week number starting on Sunday, %W starting on Monday,
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1675 %V according to ISO 8601.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1676 %j is the day of the year.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1677
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1678 %H is the hour on a 24-hour clock, %I is on a 12-hour clock, %k is like %H
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1679 only blank-padded, %l is like %I blank-padded.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1680 %p is the locale's equivalent of either AM or PM.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1681 %M is the minute.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1682 %S is the second.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1683 %Z is the time zone name, %z is the numeric form.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1684 %s is the number of seconds since 1970-01-01 00:00:00 +0000.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1685
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1686 %c is the locale's date and time format.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1687 %x is the locale's "preferred" date format.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1688 %D is like "%m/%d/%y".
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1689
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1690 %R is like "%H:%M", %T is like "%H:%M:%S", %r is like "%I:%M:%S %p".
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1691 %X is the locale's "preferred" time format.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1692
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1693 Finally, %n is a newline, %t is a tab, %% is a literal %.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1694
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1695 Certain flags and modifiers are available with some format controls.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1696 The flags are `_', `-', `^' and `#'. For certain characters X,
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1697 %_X is like %X, but padded with blanks; %-X is like %X,
47763
da8405c812f2 (Fformat_time_string): Doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46921
diff changeset
1698 but without padding. %^X is like %X, but with all textual
da8405c812f2 (Fformat_time_string): Doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46921
diff changeset
1699 characters up-cased; %#X is like %X, but with letter-case of
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1700 all textual characters reversed.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1701 %NX (where N stands for an integer) is like %X,
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1702 but takes up at least N (a number) positions.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1703 The modifiers are `E' and `O'. For certain characters X,
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1704 %EX is a locale's alternative version of %X;
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1705 %OX is like %X, but uses the locale's number symbols.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1706
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1707 For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1708 (format_string, time, universal)
17907
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1709 Lisp_Object format_string, time, universal;
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1710 {
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1711 time_t value;
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1712 int size;
23198
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
1713 struct tm *tm;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1714 int ut = ! NILP (universal);
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1715
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1716 CHECK_STRING (format_string);
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1717
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1718 if (! lisp_time_argument (time, &value, NULL))
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1719 error ("Invalid time specification");
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1720
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1721 format_string = code_convert_string_norecord (format_string,
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1722 Vlocale_coding_system, 1);
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1723
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1724 /* This is probably enough. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1725 size = SBYTES (format_string) * 6 + 50;
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1726
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1727 BLOCK_INPUT;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1728 tm = ut ? gmtime (&value) : localtime (&value);
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1729 UNBLOCK_INPUT;
23198
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
1730 if (! tm)
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
1731 error ("Specified time is not representable");
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
1732
26526
b7438760079b * callproc.c (strerror): Remove decl.
Paul Eggert <eggert@twinsun.com>
parents: 26415
diff changeset
1733 synchronize_system_time_locale ();
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1734
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1735 while (1)
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1736 {
17907
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1737 char *buf = (char *) alloca (size + 1);
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1738 int result;
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1739
19032
84ae0a03a643 (Fformat_time_string): Don't hang if strftime produces
Richard M. Stallman <rms@gnu.org>
parents: 18937
diff changeset
1740 buf[0] = '\1';
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1741 BLOCK_INPUT;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1742 result = emacs_memftimeu (buf, size, SDATA (format_string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1743 SBYTES (format_string),
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1744 tm, ut);
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1745 UNBLOCK_INPUT;
19032
84ae0a03a643 (Fformat_time_string): Don't hang if strftime produces
Richard M. Stallman <rms@gnu.org>
parents: 18937
diff changeset
1746 if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0'))
72669
d8f99fba05ca (Fformat_time_string): Use make_unibyte_string to make
Kenichi Handa <handa@m17n.org>
parents: 72592
diff changeset
1747 return code_convert_string_norecord (make_unibyte_string (buf, result),
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1748 Vlocale_coding_system, 0);
17907
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1749
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1750 /* If buffer was too small, make it bigger and try again. */
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1751 BLOCK_INPUT;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1752 result = emacs_memftimeu (NULL, (size_t) -1,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1753 SDATA (format_string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1754 SBYTES (format_string),
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26058
diff changeset
1755 tm, ut);
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1756 UNBLOCK_INPUT;
17907
a1f8ff84f3f1 (Fformat_time_string): Doc update.
Richard M. Stallman <rms@gnu.org>
parents: 17829
diff changeset
1757 size = result + 1;
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1758 }
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1759 }
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
1760
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1761 DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1762 doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST ZONE).
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1763 The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED),
75387
41b2aae64f85 (Finsert_char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75217
diff changeset
1764 as from `current-time' and `file-attributes', or nil to use the
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1765 current time. The obsolete form (HIGH . LOW) is also still accepted.
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1766 The list has the following nine members: SEC is an integer between 0
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1767 and 60; SEC is 60 for a leap second, which only some operating systems
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1768 support. MINUTE is an integer between 0 and 59. HOUR is an integer
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1769 between 0 and 23. DAY is an integer between 1 and 31. MONTH is an
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1770 integer between 1 and 12. YEAR is an integer indicating the
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1771 four-digit year. DOW is the day of week, an integer between 0 and 6,
76509
0c2cf4467655 Fix typo.
Chong Yidong <cyd@stupidchicken.com>
parents: 76498
diff changeset
1772 where 0 is Sunday. DST is t if daylight saving time is in effect,
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1773 otherwise nil. ZONE is an integer indicating the number of seconds
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1774 east of Greenwich. (Note that Common Lisp has different meanings for
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1775 DOW and ZONE.) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1776 (specified_time)
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1777 Lisp_Object specified_time;
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1778 {
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1779 time_t time_spec;
9812
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1780 struct tm save_tm;
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1781 struct tm *decoded_time;
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1782 Lisp_Object list_args[9];
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1783
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1784 if (! lisp_time_argument (specified_time, &time_spec, NULL))
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1785 error ("Invalid time specification");
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1786
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1787 BLOCK_INPUT;
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1788 decoded_time = localtime (&time_spec);
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1789 UNBLOCK_INPUT;
23198
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
1790 if (! decoded_time)
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
1791 error ("Specified time is not representable");
9812
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1792 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
1793 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
1794 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
1795 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
1796 XSETFASTINT (list_args[4], decoded_time->tm_mon + 1);
69673
23a81b585dd1 Move explanations from ChangeLog to the source.
Eli Zaretskii <eliz@gnu.org>
parents: 69664
diff changeset
1797 /* On 64-bit machines an int is narrower than EMACS_INT, thus the
23a81b585dd1 Move explanations from ChangeLog to the source.
Eli Zaretskii <eliz@gnu.org>
parents: 69664
diff changeset
1798 cast below avoids overflow in int arithmetics. */
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
1799 XSETINT (list_args[5], TM_YEAR_BASE + (EMACS_INT) decoded_time->tm_year);
9812
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1800 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
1801 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
1802
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1803 /* 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
1804 save_tm = *decoded_time;
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1805 BLOCK_INPUT;
9812
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1806 decoded_time = gmtime (&time_spec);
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1807 UNBLOCK_INPUT;
9812
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1808 if (decoded_time == 0)
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1809 list_args[8] = Qnil;
bc352c8f079c (Fdecode_time): Fix Lisp_Object vs. integer problems.
Karl Heuer <kwzh@gnu.org>
parents: 9809
diff changeset
1810 else
16269
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1811 XSETINT (list_args[8], tm_diff (&save_tm, decoded_time));
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1812 return Flist (9, list_args);
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1813 }
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
1814
15180
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1815 DEFUN ("encode-time", Fencode_time, Sencode_time, 6, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1816 doc: /* Convert SECOND, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1817 This is the reverse operation of `decode-time', which see.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1818 ZONE defaults to the current time zone rule. This can
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1819 be a string or t (as from `set-time-zone-rule'), or it can be a list
40044
7a0668d72687 (text_property_stickiness): Non-rear-non-stickiness doesn't take
Miles Bader <miles@gnu.org>
parents: 40042
diff changeset
1820 \(as from `current-time-zone') or an integer (as from `decode-time')
76498
741577a048ed (Fdecode_time, Fencode_time): "daylight savings" -> "daylight saving"
Chong Yidong <cyd@stupidchicken.com>
parents: 75949
diff changeset
1821 applied without consideration for daylight saving time.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1822
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1823 You can pass more than 7 arguments; then the first six arguments
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1824 are used as SECOND through YEAR, and the *last* argument is used as ZONE.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1825 The intervening arguments are ignored.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1826 This feature lets (apply 'encode-time (decode-time ...)) work.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1827
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
1828 Out-of-range values for SECOND, MINUTE, HOUR, DAY, or MONTH are allowed;
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1829 for example, a DAY of 0 means the day preceding the given month.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1830 Year numbers less than 100 are treated just like other year numbers.
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
1831 If you want them to stand for years in this century, you must do that yourself.
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
1832
52211
a057bd074729 (Fencode_time): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51841
diff changeset
1833 Years before 1970 are not guaranteed to work. On some systems,
a057bd074729 (Fencode_time): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51841
diff changeset
1834 year values as low as 1901 do work.
a057bd074729 (Fencode_time): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51841
diff changeset
1835
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
1836 usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1837 (nargs, args)
15180
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1838 int nargs;
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1839 register Lisp_Object *args;
11402
66d935214d8e (Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents: 11263
diff changeset
1840 {
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1841 time_t time;
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1842 struct tm tm;
16874
0b914fcd97a1 Clean up parentheses.
Richard M. Stallman <rms@gnu.org>
parents: 16683
diff changeset
1843 Lisp_Object zone = (nargs > 6 ? args[nargs - 1] : Qnil);
11402
66d935214d8e (Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents: 11263
diff changeset
1844
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1845 CHECK_NUMBER (args[0]); /* second */
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1846 CHECK_NUMBER (args[1]); /* minute */
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1847 CHECK_NUMBER (args[2]); /* hour */
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1848 CHECK_NUMBER (args[3]); /* day */
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1849 CHECK_NUMBER (args[4]); /* month */
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
1850 CHECK_NUMBER (args[5]); /* year */
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1851
15180
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1852 tm.tm_sec = XINT (args[0]);
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1853 tm.tm_min = XINT (args[1]);
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1854 tm.tm_hour = XINT (args[2]);
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1855 tm.tm_mday = XINT (args[3]);
9a22c72359c1 (Fencode_time): Accept MANY args, so as to cope
Richard M. Stallman <rms@gnu.org>
parents: 15075
diff changeset
1856 tm.tm_mon = XINT (args[4]) - 1;
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
1857 tm.tm_year = XINT (args[5]) - TM_YEAR_BASE;
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1858 tm.tm_isdst = -1;
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1859
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1860 if (CONSP (zone))
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1861 zone = Fcar (zone);
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1862 if (NILP (zone))
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1863 {
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1864 BLOCK_INPUT;
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1865 time = mktime (&tm);
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1866 UNBLOCK_INPUT;
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1867 }
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1868 else
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1869 {
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1870 char tzbuf[100];
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1871 char *tzstring;
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1872 char **oldenv = environ, **newenv;
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1873
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18605
diff changeset
1874 if (EQ (zone, Qt))
15910
8cd4f2fd5525 (Fencode_time, Fset_time_zone_rule): Use UTC if the zone is t.
Erik Naggum <erik@naggum.no>
parents: 15841
diff changeset
1875 tzstring = "UTC0";
8cd4f2fd5525 (Fencode_time, Fset_time_zone_rule): Use UTC if the zone is t.
Erik Naggum <erik@naggum.no>
parents: 15841
diff changeset
1876 else if (STRINGP (zone))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1877 tzstring = (char *) SDATA (zone);
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1878 else if (INTEGERP (zone))
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1879 {
85253
3b0be4ab6109 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 82365
diff changeset
1880 int abszone = eabs (XINT (zone));
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1881 sprintf (tzbuf, "XXX%s%d:%02d:%02d", "-" + (XINT (zone) < 0),
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1882 abszone / (60*60), (abszone/60) % 60, abszone % 60);
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1883 tzstring = tzbuf;
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1884 }
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1885 else
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1886 error ("Invalid time zone specification");
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1887
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1888 /* Set TZ before calling mktime; merely adjusting mktime's returned
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1889 value doesn't suffice, since that would mishandle leap seconds. */
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1890 set_time_zone_rule (tzstring);
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1891
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1892 BLOCK_INPUT;
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1893 time = mktime (&tm);
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1894 UNBLOCK_INPUT;
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1895
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1896 /* Restore TZ to previous value. */
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1897 newenv = environ;
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1898 environ = oldenv;
16521
fe9cc0d392dd (Fencode_time): Use xfree, not free.
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
1899 xfree (newenv);
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1900 #ifdef LOCALTIME_CACHE
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1901 tzset ();
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1902 #endif
11468
772f49d1969d (Fencode_time): Rewrite by Naggum.
Richard M. Stallman <rms@gnu.org>
parents: 11451
diff changeset
1903 }
11402
66d935214d8e (Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents: 11263
diff changeset
1904
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1905 if (time == (time_t) -1)
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1906 error ("Specified time is not representable");
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1907
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
1908 return make_time (time);
11402
66d935214d8e (Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents: 11263
diff changeset
1909 }
66d935214d8e (Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents: 11263
diff changeset
1910
2154
69c58e548ca5 (Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents: 2049
diff changeset
1911 DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0,
106900
e3970f7c14d4 Doc fix for current-time-string and date-to-time (Bug#5408)
Chong Yidong <cyd@stupidchicken.com>
parents: 106813
diff changeset
1912 doc: /* Return the current local time, as a human-readable string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1913 Programs can use this function to decode a time,
69790
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1914 since the number of columns in each field is fixed
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1915 if the year is in the range 1000-9999.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1916 The format is `Sun Sep 16 01:03:52 1973'.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1917 However, see also the functions `decode-time' and `format-time-string'
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1918 which provide a much more powerful and general facility.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1919
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1920 If SPECIFIED-TIME is given, it is a time to format instead of the
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1921 current time. The argument should have the form (HIGH LOW . IGNORED).
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1922 Thus, you can use times obtained from `current-time' and from
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1923 `file-attributes'. SPECIFIED-TIME can also have the form (HIGH . LOW),
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1924 but this is considered obsolete. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1925 (specified_time)
2154
69c58e548ca5 (Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents: 2049
diff changeset
1926 Lisp_Object specified_time;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1927 {
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1928 time_t value;
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
1929 struct tm *tm;
2154
69c58e548ca5 (Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents: 2049
diff changeset
1930 register char *tem;
69c58e548ca5 (Fcurrent_time_string): Optional arg specifies time.
Richard M. Stallman <rms@gnu.org>
parents: 2049
diff changeset
1931
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
1932 if (! lisp_time_argument (specified_time, &value, NULL))
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
1933 error ("Invalid time specification");
69790
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1934
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1935 /* Convert to a string, checking for out-of-range time stamps.
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1936 Don't use 'ctime', as that might dump core if VALUE is out of
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1937 range. */
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1938 BLOCK_INPUT;
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
1939 tm = localtime (&value);
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1940 UNBLOCK_INPUT;
69790
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1941 if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year) && (tem = asctime (tm))))
69664
55e66496ae1a * editfns.c: (TM_YEAR_BASE): Move up.
Paul Eggert <eggert@twinsun.com>
parents: 68669
diff changeset
1942 error ("Specified time is not representable");
69790
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1943
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1944 /* Remove the trailing newline. */
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1945 tem[strlen (tem) - 1] = '\0';
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1946
1e68e7f3b824 * lib-src/b2m.c (main): Don't include <limits.h>.
Paul Eggert <eggert@twinsun.com>
parents: 69673
diff changeset
1947 return build_string (tem);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1948 }
962
3533821d6edc * editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 690
diff changeset
1949
16269
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1950 /* Yield A - B, measured in seconds.
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1951 This function is copied from the GNU C Library. */
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1952 static int
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1953 tm_diff (a, b)
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1954 struct tm *a, *b;
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1955 {
16269
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1956 /* Compute intervening leap days correctly even if year is negative.
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1957 Take care to avoid int overflow in leap day calculations,
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1958 but it's OK to assume that A and B are close to each other. */
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1959 int a4 = (a->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (a->tm_year & 3);
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1960 int b4 = (b->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (b->tm_year & 3);
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1961 int a100 = a4 / 25 - (a4 % 25 < 0);
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1962 int b100 = b4 / 25 - (b4 % 25 < 0);
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1963 int a400 = a100 >> 2;
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1964 int b400 = b100 >> 2;
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1965 int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1966 int years = a->tm_year - b->tm_year;
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1967 int days = (365 * years + intervening_leap_days
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1968 + (a->tm_yday - b->tm_yday));
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1969 return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
79e6c47054c5 (tm_diff): Renamed from difftm. Yield int, not long.
Paul Eggert <eggert@twinsun.com>
parents: 16134
diff changeset
1970 + (a->tm_min - b->tm_min))
5882
319a7fcb7609 (difftm): Simplify expression.
Karl Heuer <kwzh@gnu.org>
parents: 5373
diff changeset
1971 + (a->tm_sec - b->tm_sec));
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1972 }
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1973
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1974 DEFUN ("current-time-zone", Fcurrent_time_zone, Scurrent_time_zone, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1975 doc: /* Return the offset and name for the local time zone.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1976 This returns a list of the form (OFFSET NAME).
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1977 OFFSET is an integer number of seconds ahead of UTC (east of Greenwich).
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1978 A negative value means west of Greenwich.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1979 NAME is a string giving the name of the time zone.
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
1980 If SPECIFIED-TIME is given, the time zone offset is determined from it
56386
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1981 instead of using the current time. The argument should have the form
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1982 (HIGH LOW . IGNORED). Thus, you can use times obtained from
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1983 `current-time' and from `file-attributes'. SPECIFIED-TIME can also
4f00fbfe3c1e (Ffloat_time, Fformat_time_string, Fdecode_time)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56194
diff changeset
1984 have the form (HIGH . LOW), but this is considered obsolete.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1985
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1986 Some operating systems cannot provide all this information to Emacs;
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
1987 in this case, `current-time-zone' returns a list containing nil for
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1988 the data it can't find. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
1989 (specified_time)
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1990 Lisp_Object specified_time;
962
3533821d6edc * editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 690
diff changeset
1991 {
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1992 time_t value;
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
1993 struct tm *t;
23198
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
1994 struct tm gmt;
962
3533821d6edc * editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 690
diff changeset
1995
75096
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1996 if (!lisp_time_argument (specified_time, &value, NULL))
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1997 t = NULL;
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1998 else
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
1999 {
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2000 BLOCK_INPUT;
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2001 t = gmtime (&value);
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2002 if (t)
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2003 {
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2004 gmt = *t;
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2005 t = localtime (&value);
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2006 }
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2007 UNBLOCK_INPUT;
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2008 }
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2009
ca95b6ba52a9 (Fformat_time_string, Fdecode_time, Fencode_time)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73950
diff changeset
2010 if (t)
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2011 {
23198
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
2012 int offset = tm_diff (t, &gmt);
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
2013 char *s = 0;
dddce768cf7a (Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Paul Eggert <eggert@twinsun.com>
parents: 23197
diff changeset
2014 char buf[6];
81259
d2bd034ded27 (Fcurrent_time_zone): Remove hack for Japanese Windows.
Jason Rumney <jasonr@gnu.org>
parents: 77661
diff changeset
2015
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2016 #ifdef HAVE_TM_ZONE
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2017 if (t->tm_zone)
7506
9fa47d36798a (Fcurrent_time_zone): Add cast.
Richard M. Stallman <rms@gnu.org>
parents: 7485
diff changeset
2018 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
2019 #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
2020 #ifdef HAVE_TZNAME
dc9f7a107e28 (Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents: 2994
diff changeset
2021 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
2022 s = tzname[t->tm_isdst];
962
3533821d6edc * editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 690
diff changeset
2023 #endif
3522
dc9f7a107e28 (Fcurrent_time_zone): Add alternative for !HAVE_TM_ZONE.
Richard M. Stallman <rms@gnu.org>
parents: 2994
diff changeset
2024 #endif /* not HAVE_TM_ZONE */
36479
ac3ee681e8f9 (Fcurrent_time_zone) [HAVE_TM_ZONE || HAVE_TZNAME]:
Gerd Moellmann <gerd@gnu.org>
parents: 35998
diff changeset
2025
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2026 if (!s)
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2027 {
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2028 /* 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
2029 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
2030 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
2031 s = buf;
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2032 }
81259
d2bd034ded27 (Fcurrent_time_zone): Remove hack for Japanese Windows.
Jason Rumney <jasonr@gnu.org>
parents: 77661
diff changeset
2033
2921
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2034 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
2035 }
37503f466755 Some time-handling patches from Paul Eggert:
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2036 else
18745
192b3ebd108e (Fcurrent_time_zone): Convert Fmake_list argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents: 18661
diff changeset
2037 return Fmake_list (make_number (2), Qnil);
962
3533821d6edc * editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 690
diff changeset
2038 }
3533821d6edc * editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 690
diff changeset
2039
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2040 /* This holds the value of `environ' produced by the previous
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2041 call to Fset_time_zone_rule, or 0 if Fset_time_zone_rule
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2042 has never been called. */
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2043 static char **environbuf;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2044
92954
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2045 /* This holds the startup value of the TZ environment variable so it
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2046 can be restored if the user calls set-time-zone-rule with a nil
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2047 argument. */
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2048 static char *initial_tz;
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2049
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2050 DEFUN ("set-time-zone-rule", Fset_time_zone_rule, Sset_time_zone_rule, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2051 doc: /* Set the local time zone using TZ, a string specifying a time zone rule.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2052 If TZ is nil, use implementation-defined default time zone information.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2053 If TZ is t, use Universal Time. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2054 (tz)
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2055 Lisp_Object tz;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2056 {
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2057 char *tzstring;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2058
92954
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2059 /* When called for the first time, save the original TZ. */
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2060 if (!environbuf)
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2061 initial_tz = (char *) getenv ("TZ");
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2062
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2063 if (NILP (tz))
92954
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
2064 tzstring = initial_tz;
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18605
diff changeset
2065 else if (EQ (tz, Qt))
15910
8cd4f2fd5525 (Fencode_time, Fset_time_zone_rule): Use UTC if the zone is t.
Erik Naggum <erik@naggum.no>
parents: 15841
diff changeset
2066 tzstring = "UTC0";
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2067 else
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2068 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2069 CHECK_STRING (tz);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2070 tzstring = (char *) SDATA (tz);
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2071 }
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2072
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2073 set_time_zone_rule (tzstring);
95479
9588c3703f38 remove useless if-before-free tests
Jim Meyering <jim@meyering.net>
parents: 94963
diff changeset
2074 free (environbuf);
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2075 environbuf = environ;
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2076
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2077 return Qnil;
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2078 }
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2079
16918
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2080 #ifdef LOCALTIME_CACHE
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2081
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2082 /* These two values are known to load tz files in buggy implementations,
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2083 i.e. Solaris 1 executables running under either Solaris 1 or Solaris 2.
15841
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2084 Their values shouldn't matter in non-buggy implementations.
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
2085 We don't use string literals for these strings,
15841
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2086 since if a string in the environment is in readonly
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2087 storage, it runs afoul of bugs in SVR4 and Solaris 2.3.
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2088 See Sun bugs 1113095 and 1114114, ``Timezone routines
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2089 improperly modify environment''. */
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2090
16918
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2091 static char set_time_zone_rule_tz1[] = "TZ=GMT+0";
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2092 static char set_time_zone_rule_tz2[] = "TZ=GMT+1";
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2093
ab49512bcdff (set_time_zone_rule_tz1, set_time_zone_rule_tz2):
Paul Eggert <eggert@twinsun.com>
parents: 16874
diff changeset
2094 #endif
15841
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2095
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2096 /* Set the local time zone rule to TZSTRING.
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2097 This allocates memory into `environ', which it is the caller's
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2098 responsibility to free. */
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
2099
14201
ff372902386d (set_time_zone_rule): No longer static.
Richard M. Stallman <rms@gnu.org>
parents: 14126
diff changeset
2100 void
13025
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2101 set_time_zone_rule (tzstring)
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2102 char *tzstring;
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2103 {
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2104 int envptrs;
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2105 char **from, **to, **newenv;
1eab52043f10 (Fencode_time): Use mktime to do the real work;
Paul Eggert <eggert@twinsun.com>
parents: 13019
diff changeset
2106
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2107 /* Make the ENVIRON vector longer with room for TZSTRING. */
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2108 for (from = environ; *from; from++)
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2109 continue;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2110 envptrs = from - environ + 2;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2111 newenv = to = (char **) xmalloc (envptrs * sizeof (char *)
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2112 + (tzstring ? strlen (tzstring) + 4 : 0));
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2113
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2114 /* Add TZSTRING to the end of environ, as a value for TZ. */
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2115 if (tzstring)
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2116 {
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2117 char *t = (char *) (to + envptrs);
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2118 strcpy (t, "TZ=");
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2119 strcat (t, tzstring);
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2120 *to++ = t;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2121 }
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2122
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2123 /* Copy the old environ vector elements into NEWENV,
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2124 but don't copy the TZ variable.
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2125 So we have only one definition of TZ, which came from TZSTRING. */
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2126 for (from = environ; *from; from++)
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2127 if (strncmp (*from, "TZ=", 3) != 0)
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2128 *to++ = *from;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2129 *to = 0;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2130
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2131 environ = newenv;
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2132
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2133 /* If we do have a TZSTRING, NEWENV points to the vector slot where
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2134 the TZ variable is stored. If we do not have a TZSTRING,
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2135 TO points to the vector slot which has the terminating null. */
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2136
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2137 #ifdef LOCALTIME_CACHE
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2138 {
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2139 /* In SunOS 4.1.3_U1 and 4.1.4, if TZ has a value like
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2140 "US/Pacific" that loads a tz file, then changes to a value like
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2141 "XXX0" that does not load a tz file, and then changes back to
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2142 its original value, the last change is (incorrectly) ignored.
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2143 Also, if TZ changes twice in succession to values that do
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2144 not load a tz file, tzset can dump core (see Sun bug#1225179).
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2145 The following code works around these bugs. */
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2146
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2147 if (tzstring)
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2148 {
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2149 /* Temporarily set TZ to a value that loads a tz file
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2150 and that differs from tzstring. */
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2151 char *tz = *newenv;
15841
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2152 *newenv = (strcmp (tzstring, set_time_zone_rule_tz1 + 3) == 0
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2153 ? set_time_zone_rule_tz2 : set_time_zone_rule_tz1);
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2154 tzset ();
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2155 *newenv = tz;
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2156 }
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2157 else
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2158 {
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2159 /* The implied tzstring is unknown, so temporarily set TZ to
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2160 two different values that each load a tz file. */
15841
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2161 *to = set_time_zone_rule_tz1;
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2162 to[1] = 0;
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2163 tzset ();
15841
80a852988718 (set_time_zone_rule): Don't put a string literal
Richard M. Stallman <rms@gnu.org>
parents: 15779
diff changeset
2164 *to = set_time_zone_rule_tz2;
15334
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2165 tzset ();
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2166 *to = 0;
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2167 }
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2168
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2169 /* Now TZ has the desired value, and tzset can be invoked safely. */
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2170 }
07c1581d1cc5 (set_time_zone_rule):
Richard M. Stallman <rms@gnu.org>
parents: 15241
diff changeset
2171
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2172 tzset ();
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2173 #endif
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
2174 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2175
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2176 /* Insert NARGS Lisp objects in the array ARGS by calling INSERT_FUNC
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2177 (if a type of object is Lisp_Int) or INSERT_FROM_STRING_FUNC (if a
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2178 type of object is Lisp_String). INHERIT is passed to
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2179 INSERT_FROM_STRING_FUNC as the last argument. */
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2180
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
2181 static void
102759
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
2182 general_insert_function (void (*insert_func)
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
2183 (const unsigned char *, EMACS_INT),
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
2184 void (*insert_from_string_func)
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
2185 (Lisp_Object, EMACS_INT, EMACS_INT,
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
2186 EMACS_INT, EMACS_INT, int),
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102724
diff changeset
2187 int inherit, int nargs, Lisp_Object *args)
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2188 {
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2189 register int argnum;
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2190 register Lisp_Object val;
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2191
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2192 for (argnum = 0; argnum < nargs; argnum++)
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2193 {
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2194 val = args[argnum];
90800
37b19435acef (Fchar_to_string): Use CHARACTERP, not INTEGERP.
Kenichi Handa <handa@m17n.org>
parents: 90796
diff changeset
2195 if (CHARACTERP (val))
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2196 {
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2197 unsigned char str[MAX_MULTIBYTE_LENGTH];
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2198 int len;
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2199
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2200 if (!NILP (current_buffer->enable_multibyte_characters))
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2201 len = CHAR_STRING (XFASTINT (val), str);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2202 else
22929
6dda0a4b882f (general_insert_function): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 22895
diff changeset
2203 {
89209
3903a3ae19cb (general_insert_function): Check VAL by ASCII_CHAR_P,
Kenichi Handa <handa@m17n.org>
parents: 89034
diff changeset
2204 str[0] = (ASCII_CHAR_P (XINT (val))
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2205 ? XINT (val)
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2206 : multibyte_char_to_unibyte (XINT (val), Qnil));
22929
6dda0a4b882f (general_insert_function): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 22895
diff changeset
2207 len = 1;
6dda0a4b882f (general_insert_function): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 22895
diff changeset
2208 }
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2209 (*insert_func) (str, len);
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2210 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2211 else if (STRINGP (val))
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2212 {
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
2213 (*insert_from_string_func) (val, 0, 0,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2214 SCHARS (val),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2215 SBYTES (val),
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
2216 inherit);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2217 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2218 else
71832
e891eb992cb2 (general_insert_function): Remove loop around wrong_type_argument.
Kim F. Storm <storm@cua.dk>
parents: 71817
diff changeset
2219 wrong_type_argument (Qchar_or_string_p, val);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2220 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2221 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2222
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2223 void
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2224 insert1 (arg)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 Lisp_Object arg;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2226 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2227 Finsert (1, &arg);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2228 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2229
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
2230
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
2231 /* Callers passing one argument to Finsert need not gcpro the
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
2232 argument "array", since the only element of the array will
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
2233 not be used after calling insert or insert_from_string, so
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
2234 we don't care if it gets trashed. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
2235
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2236 DEFUN ("insert", Finsert, Sinsert, 0, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2237 doc: /* Insert the arguments, either strings or characters, at point.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2238 Point and before-insertion markers move forward to end up
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2239 after the inserted text.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2240 Any other markers at the point of insertion remain before the text.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2241
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2242 If the current buffer is multibyte, unibyte strings are converted
49293
41213ea7b9d6 (Finsert): Mention `string-make-multibyte' and
Kim F. Storm <storm@cua.dk>
parents: 49285
diff changeset
2243 to multibyte for insertion (see `string-make-multibyte').
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2244 If the current buffer is unibyte, multibyte strings are converted
49293
41213ea7b9d6 (Finsert): Mention `string-make-multibyte' and
Kim F. Storm <storm@cua.dk>
parents: 49285
diff changeset
2245 to unibyte for insertion (see `string-make-unibyte').
41213ea7b9d6 (Finsert): Mention `string-make-multibyte' and
Kim F. Storm <storm@cua.dk>
parents: 49285
diff changeset
2246
41213ea7b9d6 (Finsert): Mention `string-make-multibyte' and
Kim F. Storm <storm@cua.dk>
parents: 49285
diff changeset
2247 When operating on binary data, it may be necessary to preserve the
41213ea7b9d6 (Finsert): Mention `string-make-multibyte' and
Kim F. Storm <storm@cua.dk>
parents: 49285
diff changeset
2248 original bytes of a unibyte string when inserting it into a multibyte
41213ea7b9d6 (Finsert): Mention `string-make-multibyte' and
Kim F. Storm <storm@cua.dk>
parents: 49285
diff changeset
2249 buffer; to accomplish this, apply `string-as-multibyte' to the string
41213ea7b9d6 (Finsert): Mention `string-make-multibyte' and
Kim F. Storm <storm@cua.dk>
parents: 49285
diff changeset
2250 and insert the result.
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2251
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2252 usage: (insert &rest ARGS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2253 (nargs, args)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2254 int nargs;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2255 register Lisp_Object *args;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2256 {
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2257 general_insert_function (insert, insert_from_string, 0, nargs, args);
4714
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2258 return Qnil;
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2259 }
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2260
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2261 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
2262 0, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2263 doc: /* Insert the arguments at point, inheriting properties from adjoining text.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2264 Point and before-insertion markers move forward to end up
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2265 after the inserted text.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2266 Any other markers at the point of insertion remain before the text.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2267
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2268 If the current buffer is multibyte, unibyte strings are converted
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2269 to multibyte for insertion (see `unibyte-char-to-multibyte').
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2270 If the current buffer is unibyte, multibyte strings are converted
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2271 to unibyte for insertion.
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2272
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2273 usage: (insert-and-inherit &rest ARGS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2274 (nargs, args)
4714
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2275 int nargs;
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2276 register Lisp_Object *args;
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2277 {
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2278 general_insert_function (insert_and_inherit, insert_from_string, 1,
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2279 nargs, args);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2280 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2281 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2282
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2283 DEFUN ("insert-before-markers", Finsert_before_markers, Sinsert_before_markers, 0, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2284 doc: /* Insert strings or characters at point, relocating markers after the text.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2285 Point and markers move forward to end up after the inserted text.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2286
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2287 If the current buffer is multibyte, unibyte strings are converted
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2288 to multibyte for insertion (see `unibyte-char-to-multibyte').
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2289 If the current buffer is unibyte, multibyte strings are converted
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2290 to unibyte for insertion.
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2291
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2292 usage: (insert-before-markers &rest ARGS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2293 (nargs, args)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2294 int nargs;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2295 register Lisp_Object *args;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2296 {
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2297 general_insert_function (insert_before_markers,
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2298 insert_from_string_before_markers, 0,
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2299 nargs, args);
4714
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2300 return Qnil;
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2301 }
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2302
16485
9b919c5464a4 Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents: 16298
diff changeset
2303 DEFUN ("insert-before-markers-and-inherit", Finsert_and_inherit_before_markers,
9b919c5464a4 Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents: 16298
diff changeset
2304 Sinsert_and_inherit_before_markers, 0, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2305 doc: /* Insert text at point, relocating markers and inheriting properties.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2306 Point and markers move forward to end up after the inserted text.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2307
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2308 If the current buffer is multibyte, unibyte strings are converted
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2309 to multibyte for insertion (see `unibyte-char-to-multibyte').
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2310 If the current buffer is unibyte, multibyte strings are converted
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2311 to unibyte for insertion.
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2312
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
2313 usage: (insert-before-markers-and-inherit &rest ARGS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2314 (nargs, args)
4714
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2315 int nargs;
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2316 register Lisp_Object *args;
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2317 {
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2318 general_insert_function (insert_before_markers_and_inherit,
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2319 insert_from_string_before_markers, 1,
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2320 nargs, args);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2321 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2323
8646
0f05e3e89f87 (Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents: 8333
diff changeset
2324 DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0,
75387
41b2aae64f85 (Finsert_char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75217
diff changeset
2325 doc: /* Insert COUNT copies of CHARACTER.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2326 Point, and before-insertion markers, are relocated as in the function `insert'.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2327 The optional third arg INHERIT, if non-nil, says to inherit text properties
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2328 from adjoining text, if those properties are sticky. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2329 (character, count, inherit)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2330 Lisp_Object character, count, inherit;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2331 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2332 register unsigned char *string;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333 register int strlen;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2334 register int i, n;
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2335 int len;
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2336 unsigned char str[MAX_MULTIBYTE_LENGTH];
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2337
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2338 CHECK_NUMBER (character);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2339 CHECK_NUMBER (count);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2340
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2341 if (!NILP (current_buffer->enable_multibyte_characters))
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2342 len = CHAR_STRING (XFASTINT (character), str);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2343 else
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2344 str[0] = XFASTINT (character), len = 1;
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2345 n = XINT (count) * len;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2346 if (n <= 0)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2347 return Qnil;
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2348 strlen = min (n, 256 * len);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2349 string = (unsigned char *) alloca (strlen);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2350 for (i = 0; i < strlen; i++)
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2351 string[i] = str[i % len];
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2352 while (n >= strlen)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2353 {
18194
c291aa915b85 (Finsert_char): Check QUIT.
Richard M. Stallman <rms@gnu.org>
parents: 18106
diff changeset
2354 QUIT;
8646
0f05e3e89f87 (Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents: 8333
diff changeset
2355 if (!NILP (inherit))
0f05e3e89f87 (Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents: 8333
diff changeset
2356 insert_and_inherit (string, strlen);
0f05e3e89f87 (Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents: 8333
diff changeset
2357 else
0f05e3e89f87 (Finsert_char): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents: 8333
diff changeset
2358 insert (string, strlen);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2359 n -= strlen;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2360 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2361 if (n > 0)
10382
9738aad59697 (Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents: 10308
diff changeset
2362 {
9738aad59697 (Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents: 10308
diff changeset
2363 if (!NILP (inherit))
9738aad59697 (Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents: 10308
diff changeset
2364 insert_and_inherit (string, n);
9738aad59697 (Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents: 10308
diff changeset
2365 else
9738aad59697 (Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents: 10308
diff changeset
2366 insert (string, n);
9738aad59697 (Finsert_char): Check inherit flag for long strings too.
Karl Heuer <kwzh@gnu.org>
parents: 10308
diff changeset
2367 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2368 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2369 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2370
89034
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2371 DEFUN ("insert-byte", Finsert_byte, Sinsert_byte, 2, 3, 0,
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2372 doc: /* Insert COUNT (second arg) copies of BYTE (first arg).
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2373 Both arguments are required.
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2374 BYTE is a number of the range 0..255.
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2375
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2376 If BYTE is 128..255 and the current buffer is multibyte, the
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2377 corresponding eight-bit character is inserted.
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2378
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2379 Point, and before-insertion markers, are relocated as in the function `insert'.
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2380 The optional third arg INHERIT, if non-nil, says to inherit text properties
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2381 from adjoining text, if those properties are sticky. */)
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2382 (byte, count, inherit)
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2383 Lisp_Object byte, count, inherit;
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2384 {
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2385 CHECK_NUMBER (byte);
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2386 if (XINT (byte) < 0 || XINT (byte) > 255)
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2387 args_out_of_range_3 (byte, make_number (0), make_number (255));
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2388 if (XINT (byte) >= 128
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2389 && ! NILP (current_buffer->enable_multibyte_characters))
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2390 XSETFASTINT (byte, BYTE8_TO_CHAR (XINT (byte)));
89217
d0650cc0038f (Finsert_byte): Return a proper value.
Dave Love <fx@gnu.org>
parents: 89209
diff changeset
2391 return Finsert_char (byte, count, inherit);
89034
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2392 }
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
2393
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2394
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2395 /* Making strings from buffer contents. */
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2396
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2397 /* 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
2398 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
2399 has properties in the range specified, the resulting string will also
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2400 have them, if PROPS is nonzero.
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2401
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2402 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
2403 make_uninit_string, which can cause the buffer arena to be
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2404 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
2405 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
2406 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
2407 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
2408 buffer substrings. */
1285
d50533e23dff * editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents: 1254
diff changeset
2409
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2410 Lisp_Object
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2411 make_buffer_string (start, end, props)
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2412 int start, end;
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2413 int props;
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2414 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2415 int start_byte = CHAR_TO_BYTE (start);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2416 int end_byte = CHAR_TO_BYTE (end);
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2417
21235
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2418 return make_buffer_string_both (start, start_byte, end, end_byte, props);
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2419 }
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2420
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2421 /* Return a Lisp_String containing the text of the current buffer from
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2422 START / START_BYTE to END / END_BYTE.
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2423
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2424 If text properties are in use and the current buffer
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2425 has properties in the range specified, the resulting string will also
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2426 have them, if PROPS is nonzero.
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2427
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2428 We don't want to use plain old make_string here, because it calls
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2429 make_uninit_string, which can cause the buffer arena to be
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2430 compacted. make_string has no way of knowing that the data has
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2431 been moved, and thus copies the wrong data into the string. This
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2432 doesn't effect most of the other users of make_string, so it should
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2433 be left as is. But we should use this function when conjuring
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2434 buffer substrings. */
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2435
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2436 Lisp_Object
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2437 make_buffer_string_both (start, start_byte, end, end_byte, props)
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2438 int start, start_byte, end, end_byte;
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2439 int props;
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2440 {
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2441 Lisp_Object result, tem, tem1;
eba3d61855d0 (make_buffer_string_both): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21226
diff changeset
2442
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2443 if (start < GPT && GPT < end)
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2444 move_gap (start);
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2445
21257
205a5aa4aa2f (Fchar_to_string): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21245
diff changeset
2446 if (! NILP (current_buffer->enable_multibyte_characters))
205a5aa4aa2f (Fchar_to_string): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21245
diff changeset
2447 result = make_uninit_multibyte_string (end - start, end_byte - start_byte);
205a5aa4aa2f (Fchar_to_string): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21245
diff changeset
2448 else
205a5aa4aa2f (Fchar_to_string): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21245
diff changeset
2449 result = make_uninit_string (end - start);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2450 bcopy (BYTE_POS_ADDR (start_byte), SDATA (result),
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2451 end_byte - start_byte);
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2452
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2453 /* If desired, update and copy the text properties. */
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2454 if (props)
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2455 {
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2456 update_buffer_properties (start, end);
5130
ddee29e260d2 (make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents: 4943
diff changeset
2457
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2458 tem = Fnext_property_change (make_number (start), Qnil, make_number (end));
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2459 tem1 = Ftext_properties_at (make_number (start), Qnil);
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2460
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2461 if (XINT (tem) != end || !NILP (tem1))
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2462 copy_intervals_to_string (result, current_buffer, start,
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2463 end - start);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2464 }
1285
d50533e23dff * editfns.c (make_buffer_string): Call copy_intervals_to_string().
Joseph Arceneaux <jla@gnu.org>
parents: 1254
diff changeset
2465
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2466 return result;
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
2467 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2468
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2469 /* Call Vbuffer_access_fontify_functions for the range START ... END
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2470 in the current buffer, if necessary. */
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2471
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2472 static void
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2473 update_buffer_properties (start, end)
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2474 int start, end;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2475 {
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2476 /* If this buffer has some access functions,
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2477 call them, specifying the range of the buffer being accessed. */
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2478 if (!NILP (Vbuffer_access_fontify_functions))
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2479 {
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2480 Lisp_Object args[3];
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2481 Lisp_Object tem;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2482
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2483 args[0] = Qbuffer_access_fontify_functions;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2484 XSETINT (args[1], start);
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2485 XSETINT (args[2], end);
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2486
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2487 /* But don't call them if we can tell that the work
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2488 has already been done. */
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2489 if (!NILP (Vbuffer_access_fontified_property))
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2490 {
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2491 tem = Ftext_property_any (args[1], args[2],
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2492 Vbuffer_access_fontified_property,
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2493 Qnil, Qnil);
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2494 if (! NILP (tem))
14126
edc94b82c3b3 (update_buffer_properties): Delete superfluous &'s.
Karl Heuer <kwzh@gnu.org>
parents: 14071
diff changeset
2495 Frun_hook_with_args (3, args);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2496 }
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2497 else
14126
edc94b82c3b3 (update_buffer_properties): Delete superfluous &'s.
Karl Heuer <kwzh@gnu.org>
parents: 14071
diff changeset
2498 Frun_hook_with_args (3, args);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2499 }
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2500 }
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2501
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2502 DEFUN ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2503 doc: /* Return the contents of part of the current buffer as a string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2504 The two arguments START and END are character positions;
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2505 they can be in either order.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2506 The string returned is multibyte if the buffer is multibyte.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2507
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2508 This function copies the text properties of that part of the buffer
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2509 into the result string; if you don't want the text properties,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2510 use `buffer-substring-no-properties' instead. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2511 (start, end)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2512 Lisp_Object start, end;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2513 {
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2514 register int b, e;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2516 validate_region (&start, &end);
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2517 b = XINT (start);
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2518 e = XINT (end);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2519
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2520 return make_buffer_string (b, e, 1);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2521 }
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2522
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2523 DEFUN ("buffer-substring-no-properties", Fbuffer_substring_no_properties,
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2524 Sbuffer_substring_no_properties, 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2525 doc: /* Return the characters of part of the buffer, without the text properties.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2526 The two arguments START and END are character positions;
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2527 they can be in either order. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2528 (start, end)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2529 Lisp_Object start, end;
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2530 {
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2531 register int b, e;
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2532
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2533 validate_region (&start, &end);
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2534 b = XINT (start);
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2535 e = XINT (end);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2536
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2537 return make_buffer_string (b, e, 0);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2538 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2539
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2540 DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2541 doc: /* Return the contents of the current buffer as a string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2542 If narrowing is in effect, this function returns only the visible part
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2543 of the buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2544 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2545 {
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
2546 return make_buffer_string (BEGV, ZV, 1);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2547 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2548
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2549 DEFUN ("insert-buffer-substring", Finsert_buffer_substring, Sinsert_buffer_substring,
40981
fee88c193206 (Fuser_real_login_name): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40699
diff changeset
2550 1, 3, 0,
55424
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2551 doc: /* Insert before point a substring of the contents of BUFFER.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2552 BUFFER may be a buffer or a buffer name.
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
2553 Arguments START and END are character positions specifying the substring.
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
2554 They default to the values of (point-min) and (point-max) in BUFFER. */)
55424
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2555 (buffer, start, end)
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2556 Lisp_Object buffer, start, end;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2557 {
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2558 register int b, e, temp;
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2559 register struct buffer *bp, *obuf;
55424
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2560 Lisp_Object buf;
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2561
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2562 buf = Fget_buffer (buffer);
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2563 if (NILP (buf))
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2564 nsberror (buffer);
04990cada43d (Finsert_buffer_substring): Make argument names match their use in
Juanma Barranquero <lekktu@gmail.com>
parents: 55193
diff changeset
2565 bp = XBUFFER (buf);
16134
7558d82368f9 (Finsert_buffer_substring): Check for deleted buffer.
Karl Heuer <kwzh@gnu.org>
parents: 16097
diff changeset
2566 if (NILP (bp->name))
7558d82368f9 (Finsert_buffer_substring): Check for deleted buffer.
Karl Heuer <kwzh@gnu.org>
parents: 16097
diff changeset
2567 error ("Selecting deleted buffer");
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2568
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2569 if (NILP (start))
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2570 b = BUF_BEGV (bp);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2571 else
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2572 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2573 CHECK_NUMBER_COERCE_MARKER (start);
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2574 b = XINT (start);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2575 }
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2576 if (NILP (end))
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2577 e = BUF_ZV (bp);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2578 else
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2579 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2580 CHECK_NUMBER_COERCE_MARKER (end);
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2581 e = XINT (end);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2582 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2583
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2584 if (b > e)
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2585 temp = b, b = e, e = temp;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2586
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2587 if (!(BUF_BEGV (bp) <= b && e <= BUF_ZV (bp)))
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2588 args_out_of_range (start, end);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2589
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2590 obuf = current_buffer;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2591 set_buffer_internal_1 (bp);
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2592 update_buffer_properties (b, e);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2593 set_buffer_internal_1 (obuf);
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
2594
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
2595 insert_from_buffer (bp, b, e - b, 0);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2596 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2597 }
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2598
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2599 DEFUN ("compare-buffer-substrings", Fcompare_buffer_substrings, Scompare_buffer_substrings,
40981
fee88c193206 (Fuser_real_login_name): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40699
diff changeset
2600 6, 6, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2601 doc: /* Compare two substrings of two buffers; return result as number.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2602 the value is -N if first string is less after N-1 chars,
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2603 +N if first string is greater after N-1 chars, or 0 if strings match.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2604 Each substring is represented as three arguments: BUFFER, START and END.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2605 That makes six args in all, three for each substring.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2606
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2607 The value of `case-fold-search' in the current buffer
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2608 determines whether case is significant or ignored. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2609 (buffer1, start1, end1, buffer2, start2, end2)
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2610 Lisp_Object buffer1, start1, end1, buffer2, start2, end2;
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2611 {
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2612 register int begp1, endp1, begp2, endp2, temp;
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2613 register struct buffer *bp1, *bp2;
66367
a80af18dfc7e (Fcompare_buffer_substrings): Handle multibyte chars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65763
diff changeset
2614 register Lisp_Object trt
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2615 = (!NILP (current_buffer->case_fold_search)
66379
48a5d83a7c9d (Fcompare_buffer_substrings): Fix last change.
Kim F. Storm <storm@cua.dk>
parents: 66367
diff changeset
2616 ? current_buffer->case_canon_table : Qnil);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2617 int chars = 0;
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2618 int i1, i2, i1_byte, i2_byte;
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2619
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2620 /* Find the first buffer and its substring. */
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2621
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2622 if (NILP (buffer1))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2623 bp1 = current_buffer;
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2624 else
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2625 {
1854
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2626 Lisp_Object buf1;
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2627 buf1 = Fget_buffer (buffer1);
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2628 if (NILP (buf1))
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2629 nsberror (buffer1);
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2630 bp1 = XBUFFER (buf1);
16134
7558d82368f9 (Finsert_buffer_substring): Check for deleted buffer.
Karl Heuer <kwzh@gnu.org>
parents: 16097
diff changeset
2631 if (NILP (bp1->name))
7558d82368f9 (Finsert_buffer_substring): Check for deleted buffer.
Karl Heuer <kwzh@gnu.org>
parents: 16097
diff changeset
2632 error ("Selecting deleted buffer");
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2633 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2634
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2635 if (NILP (start1))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2636 begp1 = BUF_BEGV (bp1);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2637 else
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2638 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2639 CHECK_NUMBER_COERCE_MARKER (start1);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2640 begp1 = XINT (start1);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2641 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2642 if (NILP (end1))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2643 endp1 = BUF_ZV (bp1);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2644 else
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2645 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2646 CHECK_NUMBER_COERCE_MARKER (end1);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2647 endp1 = XINT (end1);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2648 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2649
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2650 if (begp1 > endp1)
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2651 temp = begp1, begp1 = endp1, endp1 = temp;
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2652
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2653 if (!(BUF_BEGV (bp1) <= begp1
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2654 && begp1 <= endp1
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2655 && endp1 <= BUF_ZV (bp1)))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2656 args_out_of_range (start1, end1);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2657
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2658 /* Likewise for second substring. */
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2659
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2660 if (NILP (buffer2))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2661 bp2 = current_buffer;
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2662 else
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2663 {
1854
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2664 Lisp_Object buf2;
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2665 buf2 = Fget_buffer (buffer2);
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2666 if (NILP (buf2))
5a18c36181fa (Finsert_buffer_substring): Proper error for non-ex buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1853
diff changeset
2667 nsberror (buffer2);
15015
8f8d48ab0a53 (Fcompare_buffer_substrings): Fix dumb bug handling buffer name as second arg.
Richard M. Stallman <rms@gnu.org>
parents: 15004
diff changeset
2668 bp2 = XBUFFER (buf2);
16134
7558d82368f9 (Finsert_buffer_substring): Check for deleted buffer.
Karl Heuer <kwzh@gnu.org>
parents: 16097
diff changeset
2669 if (NILP (bp2->name))
7558d82368f9 (Finsert_buffer_substring): Check for deleted buffer.
Karl Heuer <kwzh@gnu.org>
parents: 16097
diff changeset
2670 error ("Selecting deleted buffer");
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2671 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2672
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2673 if (NILP (start2))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2674 begp2 = BUF_BEGV (bp2);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2675 else
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2676 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2677 CHECK_NUMBER_COERCE_MARKER (start2);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2678 begp2 = XINT (start2);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2679 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2680 if (NILP (end2))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2681 endp2 = BUF_ZV (bp2);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2682 else
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2683 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2684 CHECK_NUMBER_COERCE_MARKER (end2);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2685 endp2 = XINT (end2);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2686 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2687
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2688 if (begp2 > endp2)
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2689 temp = begp2, begp2 = endp2, endp2 = temp;
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2690
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2691 if (!(BUF_BEGV (bp2) <= begp2
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2692 && begp2 <= endp2
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2693 && endp2 <= BUF_ZV (bp2)))
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2694 args_out_of_range (start2, end2);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2695
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2696 i1 = begp1;
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2697 i2 = begp2;
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2698 i1_byte = buf_charpos_to_bytepos (bp1, i1);
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2699 i2_byte = buf_charpos_to_bytepos (bp2, i2);
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2700
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2701 while (i1 < endp1 && i2 < endp2)
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2702 {
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2703 /* When we find a mismatch, we must compare the
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2704 characters, not just the bytes. */
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2705 int c1, c2;
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2706
42116
37b724c77b98 (Fcompare_buffer_substrings): Add QUIT to main loop.
Richard M. Stallman <rms@gnu.org>
parents: 41065
diff changeset
2707 QUIT;
37b724c77b98 (Fcompare_buffer_substrings): Add QUIT to main loop.
Richard M. Stallman <rms@gnu.org>
parents: 41065
diff changeset
2708
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2709 if (! NILP (bp1->enable_multibyte_characters))
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2710 {
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2711 c1 = BUF_FETCH_MULTIBYTE_CHAR (bp1, i1_byte);
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2712 BUF_INC_POS (bp1, i1_byte);
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2713 i1++;
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2714 }
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2715 else
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2716 {
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2717 c1 = BUF_FETCH_BYTE (bp1, i1);
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103194
diff changeset
2718 MAKE_CHAR_MULTIBYTE (c1);
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2719 i1++;
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2720 }
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2721
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2722 if (! NILP (bp2->enable_multibyte_characters))
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2723 {
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2724 c2 = BUF_FETCH_MULTIBYTE_CHAR (bp2, i2_byte);
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2725 BUF_INC_POS (bp2, i2_byte);
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2726 i2++;
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2727 }
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2728 else
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2729 {
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2730 c2 = BUF_FETCH_BYTE (bp2, i2);
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103194
diff changeset
2731 MAKE_CHAR_MULTIBYTE (c2);
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2732 i2++;
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2733 }
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2734
66367
a80af18dfc7e (Fcompare_buffer_substrings): Handle multibyte chars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65763
diff changeset
2735 if (!NILP (trt))
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2736 {
66367
a80af18dfc7e (Fcompare_buffer_substrings): Handle multibyte chars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65763
diff changeset
2737 c1 = CHAR_TABLE_TRANSLATE (trt, c1);
a80af18dfc7e (Fcompare_buffer_substrings): Handle multibyte chars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65763
diff changeset
2738 c2 = CHAR_TABLE_TRANSLATE (trt, c2);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2739 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2740 if (c1 < c2)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2741 return make_number (- 1 - chars);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2742 if (c1 > c2)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2743 return make_number (chars + 1);
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2744
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2745 chars++;
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2746 }
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2747
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2748 /* The strings match as far as they go.
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2749 If one is shorter, that one is less. */
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2750 if (chars < endp1 - begp1)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2751 return make_number (chars + 1);
21837
ea78758c282e (Fcompare_buffer_substrings): Rewrite to loop by chars.
Richard M. Stallman <rms@gnu.org>
parents: 21821
diff changeset
2752 else if (chars < endp2 - begp2)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2753 return make_number (- chars - 1);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2754
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2755 /* Same length too => they are equal. */
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2756 return make_number (0);
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
2757 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2758
10480
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2759 static Lisp_Object
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2760 subst_char_in_region_unwind (arg)
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2761 Lisp_Object arg;
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2762 {
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2763 return current_buffer->undo_list = arg;
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2764 }
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2765
12622
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2766 static Lisp_Object
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2767 subst_char_in_region_unwind_1 (arg)
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2768 Lisp_Object arg;
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2769 {
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2770 return current_buffer->filename = arg;
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2771 }
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2772
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2773 DEFUN ("subst-char-in-region", Fsubst_char_in_region,
40981
fee88c193206 (Fuser_real_login_name): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40699
diff changeset
2774 Ssubst_char_in_region, 4, 5, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2775 doc: /* From START to END, replace FROMCHAR with TOCHAR each time it occurs.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2776 If optional arg NOUNDO is non-nil, don't record this change for undo
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
2777 and don't mark the buffer as really changed.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2778 Both characters must have the same length of multi-byte form. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
2779 (start, end, fromchar, tochar, noundo)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2780 Lisp_Object start, end, fromchar, tochar, noundo;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2781 {
20834
95a80c1e06c3 (Fsubst_char_in_region): Handle character-base
Kenichi Handa <handa@m17n.org>
parents: 20826
diff changeset
2782 register int pos, pos_byte, stop, i, len, end_byte;
72272
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2783 /* Keep track of the first change in the buffer:
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2784 if 0 we haven't found it yet.
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2785 if < 0 we've found it and we've run the before-change-function.
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2786 if > 0 we've actually performed it and the value is its position. */
5130
ddee29e260d2 (make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents: 4943
diff changeset
2787 int changed = 0;
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2788 unsigned char fromstr[MAX_MULTIBYTE_LENGTH], tostr[MAX_MULTIBYTE_LENGTH];
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2789 unsigned char *p;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45398
diff changeset
2790 int count = SPECPDL_INDEX ();
25507
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2791 #define COMBINING_NO 0
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2792 #define COMBINING_BEFORE 1
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2793 #define COMBINING_AFTER 2
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2794 #define COMBINING_BOTH (COMBINING_BEFORE | COMBINING_AFTER)
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2795 int maybe_byte_combining = COMBINING_NO;
32420
40df6727225a (save_excursion_save): Additionally record the
Gerd Moellmann <gerd@gnu.org>
parents: 31774
diff changeset
2796 int last_changed = 0;
28358
7ae3851c0a19 (Fsubst_char_in_region): Don't use INC_POS in unibyte
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2797 int multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2798
72272
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2799 restart:
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2800
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2801 validate_region (&start, &end);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2802 CHECK_NUMBER (fromchar);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
2803 CHECK_NUMBER (tochar);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2804
28358
7ae3851c0a19 (Fsubst_char_in_region): Don't use INC_POS in unibyte
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2805 if (multibyte_p)
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2806 {
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2807 len = CHAR_STRING (XFASTINT (fromchar), fromstr);
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2808 if (CHAR_STRING (XFASTINT (tochar), tostr) != len)
63696
43b9742ef102 (Fsubst_char_in_region): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 62662
diff changeset
2809 error ("Characters in `subst-char-in-region' have different byte-lengths");
25507
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2810 if (!ASCII_BYTE_P (*tostr))
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2811 {
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2812 /* If *TOSTR is in the range 0x80..0x9F and TOCHAR is not a
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2813 complete multibyte character, it may be combined with the
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2814 after bytes. If it is in the range 0xA0..0xFF, it may be
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2815 combined with the before and after bytes. */
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2816 if (!CHAR_HEAD_P (*tostr))
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2817 maybe_byte_combining = COMBINING_BOTH;
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2818 else if (BYTES_BY_CHAR_HEAD (*tostr) > len)
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2819 maybe_byte_combining = COMBINING_AFTER;
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2820 }
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2821 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2822 else
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2823 {
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2824 len = 1;
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2825 fromstr[0] = XFASTINT (fromchar);
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2826 tostr[0] = XFASTINT (tochar);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2827 }
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2828
20834
95a80c1e06c3 (Fsubst_char_in_region): Handle character-base
Kenichi Handa <handa@m17n.org>
parents: 20826
diff changeset
2829 pos = XINT (start);
95a80c1e06c3 (Fsubst_char_in_region): Handle character-base
Kenichi Handa <handa@m17n.org>
parents: 20826
diff changeset
2830 pos_byte = CHAR_TO_BYTE (pos);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2831 stop = CHAR_TO_BYTE (XINT (end));
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2832 end_byte = stop;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2833
10480
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2834 /* 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
2835 That's faster than getting rid of things,
12622
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2836 and it prevents even the entry for a first change.
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2837 Also inhibit locking the file. */
72272
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2838 if (!changed && !NILP (noundo))
10480
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2839 {
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2840 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
2841 current_buffer->undo_list);
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2842 current_buffer->undo_list = Qt;
12622
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2843 /* Don't do file-locking. */
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2844 record_unwind_protect (subst_char_in_region_unwind_1,
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2845 current_buffer->filename);
205232bb7efe (Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.
Richard M. Stallman <rms@gnu.org>
parents: 12603
diff changeset
2846 current_buffer->filename = Qnil;
10480
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2847 }
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2848
20834
95a80c1e06c3 (Fsubst_char_in_region): Handle character-base
Kenichi Handa <handa@m17n.org>
parents: 20826
diff changeset
2849 if (pos_byte < GPT_BYTE)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2850 stop = min (stop, GPT_BYTE);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2851 while (1)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2852 {
23554
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2853 int pos_byte_next = pos_byte;
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2854
20834
95a80c1e06c3 (Fsubst_char_in_region): Handle character-base
Kenichi Handa <handa@m17n.org>
parents: 20826
diff changeset
2855 if (pos_byte >= stop)
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2856 {
20834
95a80c1e06c3 (Fsubst_char_in_region): Handle character-base
Kenichi Handa <handa@m17n.org>
parents: 20826
diff changeset
2857 if (pos_byte >= end_byte) break;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
2858 stop = end_byte;
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2859 }
20834
95a80c1e06c3 (Fsubst_char_in_region): Handle character-base
Kenichi Handa <handa@m17n.org>
parents: 20826
diff changeset
2860 p = BYTE_POS_ADDR (pos_byte);
28358
7ae3851c0a19 (Fsubst_char_in_region): Don't use INC_POS in unibyte
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2861 if (multibyte_p)
7ae3851c0a19 (Fsubst_char_in_region): Don't use INC_POS in unibyte
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2862 INC_POS (pos_byte_next);
7ae3851c0a19 (Fsubst_char_in_region): Don't use INC_POS in unibyte
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2863 else
7ae3851c0a19 (Fsubst_char_in_region): Don't use INC_POS in unibyte
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2864 ++pos_byte_next;
23554
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2865 if (pos_byte_next - pos_byte == len
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2866 && p[0] == fromstr[0]
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2867 && (len == 1
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2868 || (p[1] == fromstr[1]
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2869 && (len == 2 || (p[2] == fromstr[2]
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
2870 && (len == 3 || p[3] == fromstr[3]))))))
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2871 {
72272
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2872 if (changed < 0)
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2873 /* We've already seen this and run the before-change-function;
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2874 this time we only need to record the actual position. */
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2875 changed = pos;
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2876 else if (!changed)
5130
ddee29e260d2 (make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents: 4943
diff changeset
2877 {
72272
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2878 changed = -1;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72584
diff changeset
2879 modify_region (current_buffer, pos, XINT (end), 0);
5242
0e99ea9941e2 (Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents: 5130
diff changeset
2880
0e99ea9941e2 (Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents: 5130
diff changeset
2881 if (! NILP (noundo))
0e99ea9941e2 (Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents: 5130
diff changeset
2882 {
10308
90784ed0416f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9812
diff changeset
2883 if (MODIFF - 1 == SAVE_MODIFF)
90784ed0416f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9812
diff changeset
2884 SAVE_MODIFF++;
106813
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106780
diff changeset
2885 if (MODIFF - 1 == BUF_AUTOSAVE_MODIFF (current_buffer))
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106780
diff changeset
2886 BUF_AUTOSAVE_MODIFF (current_buffer)++;
5242
0e99ea9941e2 (Fmessage): Use message2.
Richard M. Stallman <rms@gnu.org>
parents: 5130
diff changeset
2887 }
72272
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2888
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2889 /* The before-change-function may have moved the gap
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2890 or even modified the buffer so we should start over. */
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2891 goto restart;
5130
ddee29e260d2 (make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents: 4943
diff changeset
2892 }
ddee29e260d2 (make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents: 4943
diff changeset
2893
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2894 /* Take care of the case where the new character
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
2895 combines with neighboring bytes. */
23554
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2896 if (maybe_byte_combining
25507
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2897 && (maybe_byte_combining == COMBINING_AFTER
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2898 ? (pos_byte_next < Z_BYTE
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2899 && ! CHAR_HEAD_P (FETCH_BYTE (pos_byte_next)))
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2900 : ((pos_byte_next < Z_BYTE
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2901 && ! CHAR_HEAD_P (FETCH_BYTE (pos_byte_next)))
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2902 || (pos_byte > BEG_BYTE
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2903 && ! ASCII_BYTE_P (FETCH_BYTE (pos_byte - 1))))))
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2904 {
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2905 Lisp_Object tem, string;
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2906
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2907 struct gcpro gcpro1;
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2908
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2909 tem = current_buffer->undo_list;
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2910 GCPRO1 (tem);
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2911
25507
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2912 /* Make a multibyte string containing this single character. */
b9b4581adf36 (Fsubst_char_in_region): Adjust the way to check byte-combining
Kenichi Handa <handa@m17n.org>
parents: 25346
diff changeset
2913 string = make_multibyte_string (tostr, 1, len);
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2914 /* replace_range is less efficient, because it moves the gap,
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2915 but it handles combining correctly. */
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2916 replace_range (pos, pos + 1, string,
23211
d7bd20e02b1d (Fsubst_char_in_region): Call replace_range with the
Kenichi Handa <handa@m17n.org>
parents: 23198
diff changeset
2917 0, 0, 1);
23554
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2918 pos_byte_next = CHAR_TO_BYTE (pos);
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2919 if (pos_byte_next > pos_byte)
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2920 /* Before combining happened. We should not increment
23565
077655e1e014 (Fsubst_char_in_region): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23554
diff changeset
2921 POS. So, to cancel the later increment of POS,
077655e1e014 (Fsubst_char_in_region): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23554
diff changeset
2922 decrease it now. */
077655e1e014 (Fsubst_char_in_region): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23554
diff changeset
2923 pos--;
23554
e06e84c477fa (Fsubst_char_in_region): Correctly handle the case
Kenichi Handa <handa@m17n.org>
parents: 23553
diff changeset
2924 else
23565
077655e1e014 (Fsubst_char_in_region): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23554
diff changeset
2925 INC_POS (pos_byte_next);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
2926
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2927 if (! NILP (noundo))
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2928 current_buffer->undo_list = tem;
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2929
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2930 UNGCPRO;
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2931 }
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2932 else
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2933 {
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2934 if (NILP (noundo))
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2935 record_change (pos, 1);
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2936 for (i = 0; i < len; i++) *p++ = tostr[i];
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
2937 }
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2938 last_changed = pos + 1;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2939 }
23565
077655e1e014 (Fsubst_char_in_region): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23554
diff changeset
2940 pos_byte = pos_byte_next;
077655e1e014 (Fsubst_char_in_region): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23554
diff changeset
2941 pos++;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2942 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2943
72272
f3b2e3e20e3b (Fsubst_char_in_region): Redo the setup work after running
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72194
diff changeset
2944 if (changed > 0)
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2945 {
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2946 signal_after_change (changed,
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2947 last_changed - changed, last_changed - changed);
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2948 update_compositions (changed, last_changed, CHECK_ALL);
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2949 }
5130
ddee29e260d2 (make_buffer_string): Don't copy intervals
Richard M. Stallman <rms@gnu.org>
parents: 4943
diff changeset
2950
10480
fbb254882b9f (subst_char_in_region_unwind): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10383
diff changeset
2951 unbind_to (count, Qnil);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2952 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2953 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2954
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2955
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108957
diff changeset
2956 static Lisp_Object check_translation (int, int, int, Lisp_Object);
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2957
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2958 /* Helper function for Ftranslate_region_internal.
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2959
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2960 Check if a character sequence at POS (POS_BYTE) matches an element
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2961 of VAL. VAL is a list (([FROM-CHAR ...] . TO) ...). If a matching
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2962 element is found, return it. Otherwise return Qnil. */
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2963
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2964 static Lisp_Object
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2965 check_translation (pos, pos_byte, end, val)
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2966 int pos, pos_byte, end;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2967 Lisp_Object val;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2968 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2969 int buf_size = 16, buf_used = 0;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2970 int *buf = alloca (sizeof (int) * buf_size);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2971
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2972 for (; CONSP (val); val = XCDR (val))
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2973 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2974 Lisp_Object elt;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2975 int len, i;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2976
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2977 elt = XCAR (val);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2978 if (! CONSP (elt))
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2979 continue;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2980 elt = XCAR (elt);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2981 if (! VECTORP (elt))
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2982 continue;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2983 len = ASIZE (elt);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2984 if (len <= end - pos)
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2985 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2986 for (i = 0; i < len; i++)
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2987 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2988 if (buf_used <= i)
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2989 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2990 unsigned char *p = BYTE_POS_ADDR (pos_byte);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2991 int len;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2992
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2993 if (buf_used == buf_size)
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2994 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2995 int *newbuf;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2996
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2997 buf_size += 16;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2998 newbuf = alloca (sizeof (int) * buf_size);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
2999 memcpy (newbuf, buf, sizeof (int) * buf_used);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3000 buf = newbuf;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3001 }
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
3002 buf[buf_used++] = STRING_CHAR_AND_LENGTH (p, len);
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3003 pos_byte += len;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3004 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3005 if (XINT (AREF (elt, i)) != buf[i])
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3006 break;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3007 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3008 if (i == len)
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3009 return XCAR (val);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3010 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3011 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3012 return Qnil;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3013 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3014
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3015
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3016 DEFUN ("translate-region-internal", Ftranslate_region_internal,
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3017 Stranslate_region_internal, 3, 3, 0,
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3018 doc: /* Internal use only.
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3019 From START to END, translate characters according to TABLE.
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3020 TABLE is a string or a char-table; the Nth character in it is the
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3021 mapping for the character with code N.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3022 It returns the number of characters changed. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3023 (start, end, table)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3024 Lisp_Object start;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3025 Lisp_Object end;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3026 register Lisp_Object table;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3027 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3028 register unsigned char *tt; /* Trans table. */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3029 register int nc; /* New character. */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3030 int cnt; /* Number of changes made. */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3031 int size; /* Size of translate table. */
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3032 int pos, pos_byte, end_pos;
26415
bda6a3a2bf96 (Ftranslate_region): Check the buffer multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 26389
diff changeset
3033 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3034 int string_multibyte;
89840
c49eea8699c8 (Ftranslate_region_internal): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89601
diff changeset
3035 Lisp_Object val;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3036
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3037 validate_region (&start, &end);
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3038 if (CHAR_TABLE_P (table))
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3039 {
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3040 if (! EQ (XCHAR_TABLE (table)->purpose, Qtranslation_table))
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3041 error ("Not a translation table");
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3042 size = MAX_CHAR;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3043 tt = NULL;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3044 }
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3045 else
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3046 {
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3047 CHECK_STRING (table);
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3048
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3049 if (! multibyte && (SCHARS (table) < SBYTES (table)))
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3050 table = string_make_unibyte (table);
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3051 string_multibyte = SCHARS (table) < SBYTES (table);
89840
c49eea8699c8 (Ftranslate_region_internal): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89601
diff changeset
3052 size = SBYTES (table);
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3053 tt = SDATA (table);
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3054 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3055
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3056 pos = XINT (start);
54214
a2f5ab3b6d1b (Ftranslate_region): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 54213
diff changeset
3057 pos_byte = CHAR_TO_BYTE (pos);
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
3058 end_pos = XINT (end);
90599
c358d0861b16 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90596 72592
diff changeset
3059 modify_region (current_buffer, pos, end_pos, 0);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3060
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3061 cnt = 0;
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3062 for (; pos < end_pos; )
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3063 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
3064 register unsigned char *p = BYTE_POS_ADDR (pos_byte);
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3065 unsigned char *str, buf[MAX_MULTIBYTE_LENGTH];
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3066 int len, str_len;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3067 int oc;
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3068 Lisp_Object val;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
3069
26415
bda6a3a2bf96 (Ftranslate_region): Check the buffer multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 26389
diff changeset
3070 if (multibyte)
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
3071 oc = STRING_CHAR_AND_LENGTH (p, len);
26415
bda6a3a2bf96 (Ftranslate_region): Check the buffer multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 26389
diff changeset
3072 else
bda6a3a2bf96 (Ftranslate_region): Check the buffer multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 26389
diff changeset
3073 oc = *p, len = 1;
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3074 if (oc < size)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3075 {
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3076 if (tt)
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3077 {
65455
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3078 /* Reload as signal_after_change in last iteration may GC. */
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3079 tt = SDATA (table);
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3080 if (string_multibyte)
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3081 {
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3082 str = tt + string_char_to_byte (table, oc);
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
3083 nc = STRING_CHAR_AND_LENGTH (str, str_len);
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3084 }
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3085 else
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3086 {
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3087 nc = tt[oc];
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3088 if (! ASCII_BYTE_P (nc) && multibyte)
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3089 {
90050
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3090 str_len = BYTE8_STRING (nc, buf);
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3091 str = buf;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3092 }
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3093 else
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3094 {
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3095 str_len = 1;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3096 str = tt + oc;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3097 }
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3098 }
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3099 }
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3100 else
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3101 {
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3102 int c;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3103
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3104 nc = oc;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3105 val = CHAR_TABLE_REF (table, oc);
90050
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3106 if (CHARACTERP (val)
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3107 && (c = XINT (val), CHAR_VALID_P (c, 0)))
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3108 {
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3109 nc = c;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3110 str_len = CHAR_STRING (nc, buf);
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3111 str = buf;
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3112 }
90050
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3113 else if (VECTORP (val) || (CONSP (val)))
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3114 {
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3115 /* VAL is [TO_CHAR ...] or (([FROM-CHAR ...] . TO) ...)
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3116 where TO is TO-CHAR or [TO-CHAR ...]. */
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3117 nc = -1;
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3118 }
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3119 }
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
3120
90050
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3121 if (nc != oc && nc >= 0)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3122 {
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3123 /* Simple one char to one char translation. */
54214
a2f5ab3b6d1b (Ftranslate_region): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 54213
diff changeset
3124 if (len != str_len)
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3125 {
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3126 Lisp_Object string;
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3127
54214
a2f5ab3b6d1b (Ftranslate_region): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 54213
diff changeset
3128 /* This is less efficient, because it moves the gap,
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3129 but it should handle multibyte characters correctly. */
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3130 string = make_multibyte_string (str, 1, str_len);
54214
a2f5ab3b6d1b (Ftranslate_region): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 54213
diff changeset
3131 replace_range (pos, pos + 1, string, 1, 0, 1);
a2f5ab3b6d1b (Ftranslate_region): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 54213
diff changeset
3132 len = str_len;
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3133 }
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3134 else
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3135 {
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3136 record_change (pos, 1);
54213
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3137 while (str_len-- > 0)
29d4d158e5eb (Ftranslate_region): Handle multibyte chars in the arg
Kenichi Handa <handa@m17n.org>
parents: 53819
diff changeset
3138 *p++ = *str++;
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3139 signal_after_change (pos, 1, 1);
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
3140 update_compositions (pos, pos + 1, CHECK_BORDER);
22895
9f800ebc6091 (Fsubst_char_in_region): Use replace_range in the case
Richard M. Stallman <rms@gnu.org>
parents: 22712
diff changeset
3141 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3142 ++cnt;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3143 }
90050
1df66cb75f66 (Ftranslate_region_internal): Don't convert unibyte
Kenichi Handa <handa@m17n.org>
parents: 90044
diff changeset
3144 else if (nc < 0)
89840
c49eea8699c8 (Ftranslate_region_internal): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89601
diff changeset
3145 {
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3146 Lisp_Object string;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3147
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3148 if (CONSP (val))
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3149 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3150 val = check_translation (pos, pos_byte, end_pos, val);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3151 if (NILP (val))
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3152 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3153 pos_byte += len;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3154 pos++;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3155 continue;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3156 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3157 /* VAL is ([FROM-CHAR ...] . TO). */
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3158 len = ASIZE (XCAR (val));
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3159 val = XCDR (val);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3160 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3161 else
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3162 len = 1;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3163
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3164 if (VECTORP (val))
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3165 {
103005
e99216139fa1 (Ftranslate_region_internal): Use Fconcat to make a
Kenichi Handa <handa@m17n.org>
parents: 102759
diff changeset
3166 string = Fconcat (1, &val);
89878
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3167 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3168 else
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3169 {
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3170 string = Fmake_string (make_number (1), val);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3171 }
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3172 replace_range (pos, pos + len, string, 1, 0, 1);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3173 pos_byte += SBYTES (string);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3174 pos += SCHARS (string);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3175 cnt += SCHARS (string);
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3176 end_pos += SCHARS (string) - len;
4d57da1bca65 Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89864
diff changeset
3177 continue;
89840
c49eea8699c8 (Ftranslate_region_internal): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89601
diff changeset
3178 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3179 }
54214
a2f5ab3b6d1b (Ftranslate_region): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 54213
diff changeset
3180 pos_byte += len;
23565
077655e1e014 (Fsubst_char_in_region): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23554
diff changeset
3181 pos++;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3182 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3183
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
3184 return make_number (cnt);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3185 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3186
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3187 DEFUN ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3188 doc: /* Delete the text between point and mark.
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
3189
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3190 When called from a program, expects two arguments,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3191 positions (integers or markers) specifying the stretch to be deleted. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3192 (start, end)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3193 Lisp_Object start, end;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3194 {
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3195 validate_region (&start, &end);
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3196 del_range (XINT (start), XINT (end));
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3197 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3198 }
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3199
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3200 DEFUN ("delete-and-extract-region", Fdelete_and_extract_region,
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3201 Sdelete_and_extract_region, 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3202 doc: /* Delete the text between START and END and return it. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3203 (start, end)
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3204 Lisp_Object start, end;
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3205 {
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3206 validate_region (&start, &end);
57606
6a526f57129e (Fdelete_and_extract_region): If region is empty, return null string.
Richard M. Stallman <rms@gnu.org>
parents: 57076
diff changeset
3207 if (XINT (start) == XINT (end))
81286
6194f2677500 (Fdelete_and_extract_region): Use empty_unibyte_string.
Juanma Barranquero <lekktu@gmail.com>
parents: 81259
diff changeset
3208 return empty_unibyte_string;
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3209 return del_range_1 (XINT (start), XINT (end), 1, 1);
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
3210 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3211
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3212 DEFUN ("widen", Fwiden, Swiden, 0, 0, "",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3213 doc: /* Remove restrictions (narrowing) from current buffer.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3214 This allows the buffer's full text to be seen and edited. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3215 ()
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3216 {
19207
be370e94fb42 (Fwiden, Fnarrow_to_region, save_restriction_restore):
Richard M. Stallman <rms@gnu.org>
parents: 19032
diff changeset
3217 if (BEG != BEGV || Z != ZV)
be370e94fb42 (Fwiden, Fnarrow_to_region, save_restriction_restore):
Richard M. Stallman <rms@gnu.org>
parents: 19032
diff changeset
3218 current_buffer->clip_changed = 1;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3219 BEGV = BEG;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
3220 BEGV_BYTE = BEG_BYTE;
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
3221 SET_BUF_ZV_BOTH (current_buffer, Z, Z_BYTE);
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
3222 /* Changing the buffer bounds invalidates any recorded current column. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
3223 invalidate_current_column ();
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3224 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3225 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3226
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3227 DEFUN ("narrow-to-region", Fnarrow_to_region, Snarrow_to_region, 2, 2, "r",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3228 doc: /* Restrict editing in this buffer to the current region.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3229 The rest of the text becomes temporarily invisible and untouchable
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3230 but is not deleted; if you save the buffer in a file, the invisible
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3231 text is included in the file. \\[widen] makes all visible again.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3232 See also `save-restriction'.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3233
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3234 When calling from a program, pass two arguments; positions (integers
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3235 or markers) bounding the text that should remain visible. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3236 (start, end)
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3237 register Lisp_Object start, end;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3238 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
3239 CHECK_NUMBER_COERCE_MARKER (start);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
3240 CHECK_NUMBER_COERCE_MARKER (end);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3241
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3242 if (XINT (start) > XINT (end))
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3243 {
10383
a7fe0fb11314 (Fnarrow_to_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 10382
diff changeset
3244 Lisp_Object tem;
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3245 tem = start; start = end; end = tem;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3246 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3247
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3248 if (!(BEG <= XINT (start) && XINT (start) <= XINT (end) && XINT (end) <= Z))
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3249 args_out_of_range (start, end);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3250
19207
be370e94fb42 (Fwiden, Fnarrow_to_region, save_restriction_restore):
Richard M. Stallman <rms@gnu.org>
parents: 19032
diff changeset
3251 if (BEGV != XFASTINT (start) || ZV != XFASTINT (end))
be370e94fb42 (Fwiden, Fnarrow_to_region, save_restriction_restore):
Richard M. Stallman <rms@gnu.org>
parents: 19032
diff changeset
3252 current_buffer->clip_changed = 1;
be370e94fb42 (Fwiden, Fnarrow_to_region, save_restriction_restore):
Richard M. Stallman <rms@gnu.org>
parents: 19032
diff changeset
3253
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
3254 SET_BUF_BEGV (current_buffer, XFASTINT (start));
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3255 SET_BUF_ZV (current_buffer, XFASTINT (end));
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15910
diff changeset
3256 if (PT < XFASTINT (start))
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3257 SET_PT (XFASTINT (start));
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15910
diff changeset
3258 if (PT > XFASTINT (end))
14071
59906ecd9b92 (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time, Finsert_char,
Erik Naggum <erik@naggum.no>
parents: 13878
diff changeset
3259 SET_PT (XFASTINT (end));
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
3260 /* Changing the buffer bounds invalidates any recorded current column. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 305
diff changeset
3261 invalidate_current_column ();
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3262 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3263 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3264
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3265 Lisp_Object
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3266 save_restriction_save ()
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3267 {
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3268 if (BEGV == BEG && ZV == Z)
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3269 /* The common case that the buffer isn't narrowed.
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3270 We return just the buffer object, which save_restriction_restore
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3271 recognizes as meaning `no restriction'. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3272 return Fcurrent_buffer ();
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3273 else
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3274 /* We have to save a restriction, so return a pair of markers, one
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3275 for the beginning and one for the end. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3276 {
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3277 Lisp_Object beg, end;
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3278
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3279 beg = buildmark (BEGV, BEGV_BYTE);
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3280 end = buildmark (ZV, ZV_BYTE);
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3281
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3282 /* END must move forward if text is inserted at its exact location. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3283 XMARKER(end)->insertion_type = 1;
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3284
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3285 return Fcons (beg, end);
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3286 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3287 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3288
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3289 Lisp_Object
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3290 save_restriction_restore (data)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3291 Lisp_Object data;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3292 {
105841
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3293 struct buffer *cur = NULL;
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3294 struct buffer *buf = (CONSP (data)
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3295 ? XMARKER (XCAR (data))->buffer
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3296 : XBUFFER (data));
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3297
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3298 if (buf && buf != current_buffer && !NILP (buf->pt_marker))
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3299 { /* If `buf' uses markers to keep track of PT, BEGV, and ZV (as
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3300 is the case if it is or has an indirect buffer), then make
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3301 sure it is current before we update BEGV, so
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3302 set_buffer_internal takes care of managing those markers. */
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3303 cur = current_buffer;
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3304 set_buffer_internal (buf);
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3305 }
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3306
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3307 if (CONSP (data))
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3308 /* A pair of marks bounding a saved restriction. */
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3309 {
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3310 struct Lisp_Marker *beg = XMARKER (XCAR (data));
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3311 struct Lisp_Marker *end = XMARKER (XCDR (data));
105841
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3312 eassert (buf == end->buffer);
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3313
46921
40c8bb63c063 (save_restriction_restore): Defend from unchained marker.
Richard M. Stallman <rms@gnu.org>
parents: 46639
diff changeset
3314 if (buf /* Verify marker still points to a buffer. */
40c8bb63c063 (save_restriction_restore): Defend from unchained marker.
Richard M. Stallman <rms@gnu.org>
parents: 46639
diff changeset
3315 && (beg->charpos != BUF_BEGV (buf) || end->charpos != BUF_ZV (buf)))
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3316 /* The restriction has changed from the saved one, so restore
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3317 the saved restriction. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3318 {
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3319 int pt = BUF_PT (buf);
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3320
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3321 SET_BUF_BEGV_BOTH (buf, beg->charpos, beg->bytepos);
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3322 SET_BUF_ZV_BOTH (buf, end->charpos, end->bytepos);
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3323
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3324 if (pt < beg->charpos || pt > end->charpos)
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3325 /* The point is outside the new visible range, move it inside. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3326 SET_BUF_PT_BOTH (buf,
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3327 clip_to_bounds (beg->charpos, pt, end->charpos),
46921
40c8bb63c063 (save_restriction_restore): Defend from unchained marker.
Richard M. Stallman <rms@gnu.org>
parents: 46639
diff changeset
3328 clip_to_bounds (beg->bytepos, BUF_PT_BYTE (buf),
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3329 end->bytepos));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49472
diff changeset
3330
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3331 buf->clip_changed = 1; /* Remember that the narrowing changed. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3332 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3333 }
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3334 else
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3335 /* A buffer, which means that there was no old restriction. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3336 {
46921
40c8bb63c063 (save_restriction_restore): Defend from unchained marker.
Richard M. Stallman <rms@gnu.org>
parents: 46639
diff changeset
3337 if (buf /* Verify marker still points to a buffer. */
40c8bb63c063 (save_restriction_restore): Defend from unchained marker.
Richard M. Stallman <rms@gnu.org>
parents: 46639
diff changeset
3338 && (BUF_BEGV (buf) != BUF_BEG (buf) || BUF_ZV (buf) != BUF_Z (buf)))
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3339 /* The buffer has been narrowed, get rid of the narrowing. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3340 {
46921
40c8bb63c063 (save_restriction_restore): Defend from unchained marker.
Richard M. Stallman <rms@gnu.org>
parents: 46639
diff changeset
3341 SET_BUF_BEGV_BOTH (buf, BUF_BEG (buf), BUF_BEG_BYTE (buf));
40c8bb63c063 (save_restriction_restore): Defend from unchained marker.
Richard M. Stallman <rms@gnu.org>
parents: 46639
diff changeset
3342 SET_BUF_ZV_BOTH (buf, BUF_Z (buf), BUF_Z_BYTE (buf));
30931
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3343
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3344 buf->clip_changed = 1; /* Remember that the narrowing changed. */
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3345 }
35428eaf59e3 (save_restriction_save): Rewrite to use markers.
Miles Bader <miles@gnu.org>
parents: 30677
diff changeset
3346 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3347
105841
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3348 if (cur)
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3349 set_buffer_internal (cur);
8f7be56920c0 (save_restriction_restore): Update the (pt/begv/vz)_markers
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
3350
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3351 return Qnil;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3352 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3353
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3354 DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3355 doc: /* Execute BODY, saving and restoring current buffer's restrictions.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3356 The buffer's restrictions make parts of the beginning and end invisible.
75387
41b2aae64f85 (Finsert_char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75217
diff changeset
3357 \(They are set up with `narrow-to-region' and eliminated with `widen'.)
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3358 This special form, `save-restriction', saves the current buffer's restrictions
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3359 when it is entered, and restores them when it is exited.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3360 So any `narrow-to-region' within BODY lasts only until the end of the form.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3361 The old restrictions settings are restored
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3362 even in case of abnormal exit (throw or error).
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3363
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3364 The value returned is the value of the last form in BODY.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3365
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3366 Note: if you are using both `save-excursion' and `save-restriction',
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3367 use `save-excursion' outermost:
40140
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
3368 (save-excursion (save-restriction ...))
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
3369
9bf80d5fff41 (Fsave_excursion, Fsave_current_buffer)
Miles Bader <miles@gnu.org>
parents: 40131
diff changeset
3370 usage: (save-restriction &rest BODY) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3371 (body)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3372 Lisp_Object body;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3373 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3374 register Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45398
diff changeset
3375 int count = SPECPDL_INDEX ();
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3376
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3377 record_unwind_protect (save_restriction_restore, save_restriction_save ());
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3378 val = Fprogn (body);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3379 return unbind_to (count, val);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3380 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3381
38059
0b34b024286d (Fmessage_box): If the frame is not under a window
Eli Zaretskii <eliz@gnu.org>
parents: 37864
diff changeset
3382 /* Buffer for the most recent text displayed by Fmessage_box. */
5884
d02095ea13a5 (Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents: 5882
diff changeset
3383 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
3384
d02095ea13a5 (Fmessage): Copy the text to be displayed into a malloc'd buffer.
Karl Heuer <kwzh@gnu.org>
parents: 5882
diff changeset
3385 /* 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
3386 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
3387
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3388 DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
73950
5229e2ae0b0e (Fmessage): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 72801
diff changeset
3389 doc: /* Display a message at the bottom of the screen.
57736
dd9868eeca9e (Fmessage): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57725
diff changeset
3390 The message also goes into the `*Messages*' buffer.
dd9868eeca9e (Fmessage): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57725
diff changeset
3391 \(In keyboard macros, that's all it does.)
73950
5229e2ae0b0e (Fmessage): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 72801
diff changeset
3392 Return the message.
57736
dd9868eeca9e (Fmessage): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57725
diff changeset
3393
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3394 The first argument is a format control string, and the rest are data
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3395 to be formatted under control of the string. See `format' for details.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3396
72801
861a71881b6a (Fmessage): Recommend using (message "%s" ...).
Kim F. Storm <storm@cua.dk>
parents: 72751
diff changeset
3397 Note: Use (message "%s" VALUE) to print the value of expressions and
861a71881b6a (Fmessage): Recommend using (message "%s" ...).
Kim F. Storm <storm@cua.dk>
parents: 72751
diff changeset
3398 variables to avoid accidentally interpreting `%' as format specifiers.
861a71881b6a (Fmessage): Recommend using (message "%s" ...).
Kim F. Storm <storm@cua.dk>
parents: 72751
diff changeset
3399
65455
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3400 If the first argument is nil or the empty string, the function clears
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3401 any existing message; this lets the minibuffer contents show. See
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3402 also `current-message'.
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3403
65739
83ce839858fb (Fmessage, Fmessage_box, Fmessage_or_box):
Juri Linkov <juri@jurta.org>
parents: 65659
diff changeset
3404 usage: (message FORMAT-STRING &rest ARGS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3405 (nargs, args)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3406 int nargs;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3407 Lisp_Object *args;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3408 {
46639
8587dd21917c (Fmessage): Treat "" like nil.
Richard M. Stallman <rms@gnu.org>
parents: 46464
diff changeset
3409 if (NILP (args[0])
8587dd21917c (Fmessage): Treat "" like nil.
Richard M. Stallman <rms@gnu.org>
parents: 46464
diff changeset
3410 || (STRINGP (args[0])
8587dd21917c (Fmessage): Treat "" like nil.
Richard M. Stallman <rms@gnu.org>
parents: 46464
diff changeset
3411 && SBYTES (args[0]) == 0))
1916
e21c1f3e37cb * editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents: 1854
diff changeset
3412 {
e21c1f3e37cb * editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents: 1854
diff changeset
3413 message (0);
59662
c140948a6044 (Fmessage): If arg is "", return "" (as before).
Richard M. Stallman <rms@gnu.org>
parents: 59658
diff changeset
3414 return args[0];
1916
e21c1f3e37cb * editfns.c (Fmessage): Don't forget to return a value when
Jim Blandy <jimb@redhat.com>
parents: 1854
diff changeset
3415 }
1426
67fd35416ba3 * * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents: 1285
diff changeset
3416 else
67fd35416ba3 * * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents: 1285
diff changeset
3417 {
67fd35416ba3 * * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents: 1285
diff changeset
3418 register Lisp_Object val;
48115
72f8d789f551 (Fmessage): Revert last change to properly handle %% format.
Andreas Schwab <schwab@suse.de>
parents: 48111
diff changeset
3419 val = Fformat (nargs, args);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3420 message3 (val, SBYTES (val), STRING_MULTIBYTE (val));
1426
67fd35416ba3 * * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents: 1285
diff changeset
3421 return val;
67fd35416ba3 * * editfns.c (Fmessage): With no arguments, clear any active
Jim Blandy <jimb@redhat.com>
parents: 1285
diff changeset
3422 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3423 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3424
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3425 DEFUN ("message-box", Fmessage_box, Smessage_box, 1, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3426 doc: /* Display a message, in a dialog box if possible.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3427 If a dialog box is not available, use the echo area.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3428 The first argument is a format control string, and the rest are data
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3429 to be formatted under control of the string. See `format' for details.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3430
65455
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3431 If the first argument is nil or the empty string, clear any existing
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3432 message; let the minibuffer contents show.
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3433
65739
83ce839858fb (Fmessage, Fmessage_box, Fmessage_or_box):
Juri Linkov <juri@jurta.org>
parents: 65659
diff changeset
3434 usage: (message-box FORMAT-STRING &rest ARGS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3435 (nargs, args)
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3436 int nargs;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3437 Lisp_Object *args;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3438 {
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3439 if (NILP (args[0]))
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3440 {
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3441 message (0);
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3442 return Qnil;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3443 }
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3444 else
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3445 {
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3446 register Lisp_Object val;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3447 val = Fformat (nargs, args);
13878
2a71500dfb93 (Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents: 13767
diff changeset
3448 #ifdef HAVE_MENUS
38059
0b34b024286d (Fmessage_box): If the frame is not under a window
Eli Zaretskii <eliz@gnu.org>
parents: 37864
diff changeset
3449 /* The MS-DOS frames support popup menus even though they are
0b34b024286d (Fmessage_box): If the frame is not under a window
Eli Zaretskii <eliz@gnu.org>
parents: 37864
diff changeset
3450 not FRAME_WINDOW_P. */
0b34b024286d (Fmessage_box): If the frame is not under a window
Eli Zaretskii <eliz@gnu.org>
parents: 37864
diff changeset
3451 if (FRAME_WINDOW_P (XFRAME (selected_frame))
0b34b024286d (Fmessage_box): If the frame is not under a window
Eli Zaretskii <eliz@gnu.org>
parents: 37864
diff changeset
3452 || FRAME_MSDOS_P (XFRAME (selected_frame)))
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3453 {
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3454 Lisp_Object pane, menu, obj;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3455 struct gcpro gcpro1;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3456 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
3457 GCPRO1 (pane);
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3458 menu = Fcons (val, pane);
62662
9733e98a93e4 (Fmessage_box): Use "Information" for frame title.
Nick Roberts <nickrob@snap.net.nz>
parents: 61700
diff changeset
3459 obj = Fx_popup_dialog (Qt, menu, Qt);
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3460 UNGCPRO;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3461 return val;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3462 }
38059
0b34b024286d (Fmessage_box): If the frame is not under a window
Eli Zaretskii <eliz@gnu.org>
parents: 37864
diff changeset
3463 #endif /* HAVE_MENUS */
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3464 /* 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
3465 if (! message_text)
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3466 {
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3467 message_text = (char *)xmalloc (80);
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3468 message_length = 80;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3469 }
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3470 if (SBYTES (val) > message_length)
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3471 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3472 message_length = SBYTES (val);
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3473 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
3474 }
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3475 bcopy (SDATA (val), message_text, SBYTES (val));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3476 message2 (message_text, SBYTES (val),
21358
e9f7d8708bae (Fmessage_box): Pass the missing third argument
Richard M. Stallman <rms@gnu.org>
parents: 21257
diff changeset
3477 STRING_MULTIBYTE (val));
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3478 return val;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3479 }
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3480 }
13878
2a71500dfb93 (Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents: 13767
diff changeset
3481 #ifdef HAVE_MENUS
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3482 extern Lisp_Object last_nonmenu_event;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3483 #endif
13878
2a71500dfb93 (Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents: 13767
diff changeset
3484
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3485 DEFUN ("message-or-box", Fmessage_or_box, Smessage_or_box, 1, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3486 doc: /* Display a message in a dialog box or in the echo area.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3487 If this command was invoked with the mouse, use a dialog box if
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3488 `use-dialog-box' is non-nil.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3489 Otherwise, use the echo area.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3490 The first argument is a format control string, and the rest are data
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3491 to be formatted under control of the string. See `format' for details.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3492
65455
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3493 If the first argument is nil or the empty string, clear any existing
51d3a3f03a8a (Ftranslate_region_internal): Reload `tt' after
Kim F. Storm <storm@cua.dk>
parents: 65324
diff changeset
3494 message; let the minibuffer contents show.
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3495
65739
83ce839858fb (Fmessage, Fmessage_box, Fmessage_or_box):
Juri Linkov <juri@jurta.org>
parents: 65659
diff changeset
3496 usage: (message-or-box FORMAT-STRING &rest ARGS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3497 (nargs, args)
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3498 int nargs;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3499 Lisp_Object *args;
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3500 {
13878
2a71500dfb93 (Fmessage_box, Fmessage_or_box):
Richard M. Stallman <rms@gnu.org>
parents: 13767
diff changeset
3501 #ifdef HAVE_MENUS
26699
ed4ab9d24450 (Fmessage_or_box): Use use_dialog_box.
Dave Love <fx@gnu.org>
parents: 26629
diff changeset
3502 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
28470
93996c44b23a * editfns.c (text_property_stickiness, Fmessage_or_box): Use NILP to test
Ken Raeburn <raeburn@raeburn.org>
parents: 28358
diff changeset
3503 && use_dialog_box)
8981
6e1a5ff3d795 (Fmessage_or_box): Use Fmessage_box with new name.
Richard M. Stallman <rms@gnu.org>
parents: 8975
diff changeset
3504 return Fmessage_box (nargs, args);
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3505 #endif
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3506 return Fmessage (nargs, args);
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3507 }
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
3508
18937
ddb91108a9d2 (Fcurrent_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18756
diff changeset
3509 DEFUN ("current-message", Fcurrent_message, Scurrent_message, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3510 doc: /* Return the string currently displayed in the echo area, or nil if none. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3511 ()
18937
ddb91108a9d2 (Fcurrent_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18756
diff changeset
3512 {
25346
15ec35852b48 Remove conditional compilation on NO_PROMPT_IN_BUFFER.
Gerd Moellmann <gerd@gnu.org>
parents: 25018
diff changeset
3513 return current_message ();
18937
ddb91108a9d2 (Fcurrent_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18756
diff changeset
3514 }
ddb91108a9d2 (Fcurrent_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18756
diff changeset
3515
25815
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3516
41062
07a4ff5f0909 (Fpropertize): Allow call with 1 arg.
Richard M. Stallman <rms@gnu.org>
parents: 40981
diff changeset
3517 DEFUN ("propertize", Fpropertize, Spropertize, 1, MANY, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3518 doc: /* Return a copy of STRING with text properties added.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3519 First argument is the string to copy.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3520 Remaining arguments form a sequence of PROPERTY VALUE pairs for text
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3521 properties to add to the result.
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3522 usage: (propertize STRING &rest PROPERTIES) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3523 (nargs, args)
25815
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3524 int nargs;
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3525 Lisp_Object *args;
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3526 {
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3527 Lisp_Object properties, string;
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3528 struct gcpro gcpro1, gcpro2;
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3529 int i;
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3530
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3531 /* Number of args must be odd. */
41062
07a4ff5f0909 (Fpropertize): Allow call with 1 arg.
Richard M. Stallman <rms@gnu.org>
parents: 40981
diff changeset
3532 if ((nargs & 1) == 0 || nargs < 1)
25815
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3533 error ("Wrong number of arguments");
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3534
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3535 properties = string = Qnil;
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3536 GCPRO2 (properties, string);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
3537
25815
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3538 /* First argument must be a string. */
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
3539 CHECK_STRING (args[0]);
25815
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3540 string = Fcopy_sequence (args[0]);
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3541
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3542 for (i = 1; i < nargs; i += 2)
65324
3c228c69b2e5 (Fpropertize): Don't insist that properties be symbols.
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
3543 properties = Fcons (args[i], Fcons (args[i + 1], properties));
25815
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3544
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3545 Fadd_text_properties (make_number (0),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3546 make_number (SCHARS (string)),
25815
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3547 properties, string);
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3548 RETURN_UNGCPRO (string);
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3549 }
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3550
768a5bb054df (Fproperties): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25782
diff changeset
3551
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3552 /* Number of bytes that STRING will occupy when put into the result.
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3553 MULTIBYTE is nonzero if the result should be multibyte. */
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3554
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3555 #define CONVERTED_BYTE_SIZE(MULTIBYTE, STRING) \
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3556 (((MULTIBYTE) && ! STRING_MULTIBYTE (STRING)) \
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3557 ? count_size_as_multibyte (SDATA (STRING), SBYTES (STRING)) \
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3558 : SBYTES (STRING))
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3559
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3560 DEFUN ("format", Fformat, Sformat, 1, MANY, 0,
65739
83ce839858fb (Fmessage, Fmessage_box, Fmessage_or_box):
Juri Linkov <juri@jurta.org>
parents: 65659
diff changeset
3561 doc: /* Format a string out of a format-string and arguments.
83ce839858fb (Fmessage, Fmessage_box, Fmessage_or_box):
Juri Linkov <juri@jurta.org>
parents: 65659
diff changeset
3562 The first argument is a format control string.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3563 The other arguments are substituted into it to make the result, a string.
92236
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3564
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3565 The format control string may contain %-sequences meaning to substitute
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3566 the next available argument:
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3567
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3568 %s means print a string argument. Actually, prints any object, with `princ'.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3569 %d means print as number in decimal (%o octal, %x hex).
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3570 %X is like %x, but uses upper case.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3571 %e means print a number in exponential notation.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3572 %f means print a number in decimal-point notation.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3573 %g means print a number in exponential notation
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3574 or decimal-point notation, whichever uses fewer characters.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3575 %c means print a number as a single character.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
3576 %S means print any object as an s-expression (using `prin1').
92236
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3577
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3578 The argument used for %d, %o, %x, %e, %f, %g or %c must be a number.
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3579 Use %% to put a single % into the output.
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3580
92236
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3581 A %-sequence may contain optional flag, width, and precision
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3582 specifiers, as follows:
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3583
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3584 %<flags><width><precision>character
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3585
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3586 where flags is [+ #-0]+, width is [0-9]+, and precision is .[0-9]+
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3587
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3588 The + flag character inserts a + before any positive number, while a
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3589 space inserts a space before any positive number; these flags only
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3590 affect %d, %e, %f, and %g sequences, and the + flag takes precedence.
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3591 The # flag means to use an alternate display form for %o, %x, %X, %e,
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3592 %f, and %g sequences. The - and 0 flags affect the width specifier,
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3593 as described below.
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3594
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3595 The width specifier supplies a lower limit for the length of the
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3596 printed representation. The padding, if any, normally goes on the
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3597 left, but it goes on the right if the - flag is present. The padding
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3598 character is normally a space, but it is 0 if the 0 flag is present.
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3599 The - flag takes precedence over the 0 flag.
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3600
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3601 For %e, %f, and %g sequences, the number after the "." in the
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3602 precision specifier says how many decimal places to show; if zero, the
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3603 decimal point itself is omitted. For %s and %S, the precision
996d2de63762 (Fformat): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 91327
diff changeset
3604 specifier truncates the string to the given width.
53687
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3605
40131
de086e415fa2 (Finsert, Finsert_and_inherit, Finsert_before_markers, Fmessage)
Miles Bader <miles@gnu.org>
parents: 40046
diff changeset
3606 usage: (format STRING &rest OBJECTS) */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
3607 (nargs, args)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3608 int nargs;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3609 register Lisp_Object *args;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3610 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3611 register int n; /* The number of the next arg to substitute */
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3612 register int total; /* An estimate of the final length */
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3613 char *buf, *p;
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3614 register unsigned char *format, *end, *format_start;
25782
8f59abd3a02b (init_editfns): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25662
diff changeset
3615 int nchars;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3616 /* Nonzero if the output should be a multibyte string,
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3617 which is true if any of the inputs is one. */
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3618 int multibyte = 0;
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3619 /* When we make a multibyte string, we must pay attention to the
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3620 byte combining problem, i.e., a byte may be combined with a
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3621 multibyte charcter of the previous string. This flag tells if we
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3622 must consider such a situation or not. */
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3623 int maybe_combine_byte;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3624 unsigned char *this_format;
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3625 /* Precision for each spec, or -1, a flag value meaning no precision
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3626 was given in that spec. Element 0, corresonding to the format
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3627 string itself, will not be used. Element NARGS, corresponding to
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3628 no argument, *will* be assigned to in the case that a `%' and `.'
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3629 occur after the final format specifier. */
54846
e8865bfda38b (Fformat): Fix allocation size of precision array.
Kim F. Storm <storm@cua.dk>
parents: 54655
diff changeset
3630 int *precision = (int *) (alloca((nargs + 1) * sizeof (int)));
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3631 int longest_format;
20804
14fa73136e64 (CONVERTED_BYTE_SIZE): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents: 20706
diff changeset
3632 Lisp_Object val;
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3633 int arg_intervals = 0;
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
3634 USE_SAFE_ALLOCA;
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3635
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3636 /* discarded[I] is 1 if byte I of the format
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3637 string was not copied into the output.
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3638 It is 2 if byte I was not the first byte of its character. */
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
3639 char *discarded = 0;
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3640
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3641 /* Each element records, for one argument,
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3642 the start and end bytepos in the output string,
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3643 and whether the argument is a string with intervals.
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3644 info[0] is unused. Unused elements have -1 for start. */
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
3645 struct info
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
3646 {
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3647 int start, end, intervals;
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
3648 } *info = 0;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3649
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3650 /* It should not be necessary to GCPRO ARGS, because
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3651 the caller in the interpreter should take care of that. */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3652
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3653 /* Try to determine whether the result should be multibyte.
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3654 This is not always right; sometimes the result needs to be multibyte
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3655 because of an object that we will pass through prin1,
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3656 and in that case, we won't know it here. */
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3657 for (n = 0; n < nargs; n++)
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3658 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3659 if (STRINGP (args[n]) && STRING_MULTIBYTE (args[n]))
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3660 multibyte = 1;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3661 /* Piggyback on this loop to initialize precision[N]. */
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3662 precision[n] = -1;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3663 }
56560
1a84eb100ef3 (Fformat): Allocated extra (dummy) element in info.
Kim F. Storm <storm@cua.dk>
parents: 56386
diff changeset
3664 precision[nargs] = -1;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3665
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40287
diff changeset
3666 CHECK_STRING (args[0]);
50430
4d74ea083bd2 (Fformat): Use a copy of FORMAT string so that we can
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
3667 /* We may have to change "%S" to "%s". */
4d74ea083bd2 (Fformat): Use a copy of FORMAT string so that we can
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
3668 args[0] = Fcopy_sequence (args[0]);
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3669
50746
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3670 /* GC should never happen here, so abort if it does. */
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3671 abort_on_gc++;
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3672
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3673 /* If we start out planning a unibyte result,
50746
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3674 then discover it has to be multibyte, we jump back to retry.
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3675 That can only happen from the first large while loop below. */
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3676 retry:
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3677
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3678 format = SDATA (args[0]);
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3679 format_start = format;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3680 end = format + SBYTES (args[0]);
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3681 longest_format = 0;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3682
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3683 /* Make room in result for all the non-%-codes in the control string. */
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
3684 total = 5 + CONVERTED_BYTE_SIZE (multibyte, args[0]) + 1;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3685
54846
e8865bfda38b (Fformat): Fix allocation size of precision array.
Kim F. Storm <storm@cua.dk>
parents: 54655
diff changeset
3686 /* Allocate the info and discarded tables. */
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3687 {
56560
1a84eb100ef3 (Fformat): Allocated extra (dummy) element in info.
Kim F. Storm <storm@cua.dk>
parents: 56386
diff changeset
3688 int nbytes = (nargs+1) * sizeof *info;
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3689 int i;
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
3690 if (!info)
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
3691 info = (struct info *) alloca (nbytes);
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3692 bzero (info, nbytes);
56560
1a84eb100ef3 (Fformat): Allocated extra (dummy) element in info.
Kim F. Storm <storm@cua.dk>
parents: 56386
diff changeset
3693 for (i = 0; i <= nargs; i++)
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3694 info[i].start = -1;
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
3695 if (!discarded)
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
3696 SAFE_ALLOCA (discarded, char *, SBYTES (args[0]));
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3697 bzero (discarded, SBYTES (args[0]));
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3698 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3699
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3700 /* Add to TOTAL enough space to hold the converted arguments. */
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3701
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3702 n = 0;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3703 while (format != end)
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3704 if (*format++ == '%')
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3705 {
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3706 int thissize = 0;
42484
717eee813b2c (Fformat): Update thissize from field_width
Richard M. Stallman <rms@gnu.org>
parents: 42116
diff changeset
3707 int actual_width = 0;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3708 unsigned char *this_format_start = format - 1;
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3709 int field_width = 0;
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3710
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3711 /* General format specifications look like
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3712
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3713 '%' [flags] [field-width] [precision] format
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3714
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3715 where
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3716
75949
d420b7899f20 (Fformat): Add support for '+' flag.
Andreas Schwab <schwab@suse.de>
parents: 75387
diff changeset
3717 flags ::= [-+ #0]+
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3718 field-width ::= [0-9]+
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3719 precision ::= '.' [0-9]*
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3720
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3721 If a field-width is specified, it specifies to which width
78501
1677cf1c2509 Replace `iff' in comments.
Glenn Morris <rgm@gnu.org>
parents: 78260
diff changeset
3722 the output should be padded with blanks, if the output
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3723 string is shorter than field-width.
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3724
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3725 If precision is specified, it specifies the number of
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3726 digits to print after the '.' for floats, or the max.
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3727 number of chars to print from a string. */
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3728
65659
71ea8ba70056 (Fformat): Explicitly test for end of format string and don't use `index'.
Richard M. Stallman <rms@gnu.org>
parents: 65608
diff changeset
3729 while (format != end
71ea8ba70056 (Fformat): Explicitly test for end of format string and don't use `index'.
Richard M. Stallman <rms@gnu.org>
parents: 65608
diff changeset
3730 && (*format == '-' || *format == '0' || *format == '#'
75949
d420b7899f20 (Fformat): Add support for '+' flag.
Andreas Schwab <schwab@suse.de>
parents: 75387
diff changeset
3731 || * format == ' ' || *format == '+'))
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3732 ++format;
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3733
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3734 if (*format >= '0' && *format <= '9')
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3735 {
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3736 for (field_width = 0; *format >= '0' && *format <= '9'; ++format)
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3737 field_width = 10 * field_width + *format - '0';
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3738 }
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3739
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3740 /* N is not incremented for another few lines below, so refer to
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3741 element N+1 (which might be precision[NARGS]). */
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3742 if (*format == '.')
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3743 {
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3744 ++format;
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3745 for (precision[n+1] = 0; *format >= '0' && *format <= '9'; ++format)
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3746 precision[n+1] = 10 * precision[n+1] + *format - '0';
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3747 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3748
79424
c83ab4ee6f0f Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 79422
diff changeset
3749 /* Extra +1 for 'l' that we may need to insert into the
c83ab4ee6f0f Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 79422
diff changeset
3750 format. */
c83ab4ee6f0f Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 79422
diff changeset
3751 if (format - this_format_start + 2 > longest_format)
c83ab4ee6f0f Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 79422
diff changeset
3752 longest_format = format - this_format_start + 2;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3753
23197
0d3baa5514b7 (Fformat): Detect incomplete format spec at string's end.
Karl Heuer <kwzh@gnu.org>
parents: 23166
diff changeset
3754 if (format == end)
0d3baa5514b7 (Fformat): Detect incomplete format spec at string's end.
Karl Heuer <kwzh@gnu.org>
parents: 23166
diff changeset
3755 error ("Format string ends in middle of format specifier");
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3756 if (*format == '%')
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3757 format++;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3758 else if (++n >= nargs)
12831
3917c5d131d3 (Fformat): Limit minlen to avoid stack overflow.
Richard M. Stallman <rms@gnu.org>
parents: 12623
diff changeset
3759 error ("Not enough arguments for format string");
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3760 else if (*format == 'S')
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3761 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3762 /* For `S', prin1 the argument and then treat like a string. */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3763 register Lisp_Object tem;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3764 tem = Fprin1_to_string (args[n], Qnil);
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3765 if (STRING_MULTIBYTE (tem) && ! multibyte)
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3766 {
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3767 multibyte = 1;
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3768 goto retry;
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3769 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3770 args[n] = tem;
50430
4d74ea083bd2 (Fformat): Use a copy of FORMAT string so that we can
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
3771 /* If we restart the loop, we should not come here again
4d74ea083bd2 (Fformat): Use a copy of FORMAT string so that we can
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
3772 because args[n] is now a string and calling
4d74ea083bd2 (Fformat): Use a copy of FORMAT string so that we can
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
3773 Fprin1_to_string on it produces superflous double
4d74ea083bd2 (Fformat): Use a copy of FORMAT string so that we can
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
3774 quotes. So, change "%S" to "%s" now. */
4d74ea083bd2 (Fformat): Use a copy of FORMAT string so that we can
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
3775 *format = 's';
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3776 goto string;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3777 }
9163
41fe5f636879 (lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents: 9154
diff changeset
3778 else if (SYMBOLP (args[n]))
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3779 {
46447
8e01c92219ab (Fstring_to_char): Don't use XSTRING/XSETSTRING to copy a lisp value.
Ken Raeburn <raeburn@raeburn.org>
parents: 46443
diff changeset
3780 args[n] = SYMBOL_NAME (args[n]);
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
3781 if (STRING_MULTIBYTE (args[n]) && ! multibyte)
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
3782 {
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
3783 multibyte = 1;
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
3784 goto retry;
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
3785 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3786 goto string;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3787 }
9163
41fe5f636879 (lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents: 9154
diff changeset
3788 else if (STRINGP (args[n]))
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3789 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3790 string:
6528
d0f6a386b7cb (Fformat): Validate number and type of arguments.
Karl Heuer <kwzh@gnu.org>
parents: 6206
diff changeset
3791 if (*format != 's' && *format != 'S')
23197
0d3baa5514b7 (Fformat): Detect incomplete format spec at string's end.
Karl Heuer <kwzh@gnu.org>
parents: 23166
diff changeset
3792 error ("Format specifier doesn't match argument type");
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3793 /* In the case (PRECISION[N] > 0), THISSIZE may not need
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3794 to be as large as is calculated here. Easy check for
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3795 the case PRECISION = 0. */
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3796 thissize = precision[n] ? CONVERTED_BYTE_SIZE (multibyte, args[n]) : 0;
107388
969a1a50d14c Fix bug in `format' (Bug#5710).
Chong Yidong <cyd@stupidchicken.com>
parents: 106900
diff changeset
3797 /* The precision also constrains how much of the argument
969a1a50d14c Fix bug in `format' (Bug#5710).
Chong Yidong <cyd@stupidchicken.com>
parents: 106900
diff changeset
3798 string will finally appear (Bug#5710). */
42484
717eee813b2c (Fformat): Update thissize from field_width
Richard M. Stallman <rms@gnu.org>
parents: 42116
diff changeset
3799 actual_width = lisp_string_width (args[n], -1, NULL, NULL);
107388
969a1a50d14c Fix bug in `format' (Bug#5710).
Chong Yidong <cyd@stupidchicken.com>
parents: 106900
diff changeset
3800 if (precision[n] != -1)
969a1a50d14c Fix bug in `format' (Bug#5710).
Chong Yidong <cyd@stupidchicken.com>
parents: 106900
diff changeset
3801 actual_width = min(actual_width,precision[n]);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3802 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3803 /* 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
3804 else if (INTEGERP (args[n]) && *format != 's')
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3805 {
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3522
diff changeset
3806 /* The following loop assumes the Lisp type indicates
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3807 the proper way to pass the argument.
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3808 So make sure we have a flonum if the argument should
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3809 be a double. */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3810 if (*format == 'e' || *format == 'f' || *format == 'g')
79428
576665ace786 *** empty log message ***
Andreas Schwab <schwab@suse.de>
parents: 79427
diff changeset
3811 args[n] = Ffloat (args[n]);
23326
df3f641c9ca1 (Fformat): Check format control characters.
Kenichi Handa <handa@m17n.org>
parents: 23292
diff changeset
3812 else
df3f641c9ca1 (Fformat): Check format control characters.
Kenichi Handa <handa@m17n.org>
parents: 23292
diff changeset
3813 if (*format != 'd' && *format != 'o' && *format != 'x'
24505
d6fcaeb4c03c (Fformat): Accept %i format.
Karl Heuer <kwzh@gnu.org>
parents: 24272
diff changeset
3814 && *format != 'i' && *format != 'X' && *format != 'c')
23326
df3f641c9ca1 (Fformat): Check format control characters.
Kenichi Handa <handa@m17n.org>
parents: 23292
diff changeset
3815 error ("Invalid format operation %%%c", *format);
df3f641c9ca1 (Fformat): Check format control characters.
Kenichi Handa <handa@m17n.org>
parents: 23292
diff changeset
3816
79427
cc15c80eebe7 Always take precision into account.
Andreas Schwab <schwab@suse.de>
parents: 79425
diff changeset
3817 thissize = 30 + (precision[n] > 0 ? precision[n] : 0);
49285
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3818 if (*format == 'c')
21064
90bdbe2754c8 (Fformat): Format multibyte characters by "%c"
Kenichi Handa <handa@m17n.org>
parents: 21052
diff changeset
3819 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89217
diff changeset
3820 if (! ASCII_CHAR_P (XINT (args[n]))
49472
3fd3c5521557 (Fformat): Add comment about the treatment of 0 as a multibyte
Kenichi Handa <handa@m17n.org>
parents: 49443
diff changeset
3821 /* Note: No one can remeber why we have to treat
3fd3c5521557 (Fformat): Add comment about the treatment of 0 as a multibyte
Kenichi Handa <handa@m17n.org>
parents: 49443
diff changeset
3822 the character 0 as a multibyte character here.
3fd3c5521557 (Fformat): Add comment about the treatment of 0 as a multibyte
Kenichi Handa <handa@m17n.org>
parents: 49443
diff changeset
3823 But, until it causes a real problem, let's
3fd3c5521557 (Fformat): Add comment about the treatment of 0 as a multibyte
Kenichi Handa <handa@m17n.org>
parents: 49443
diff changeset
3824 don't change it. */
49285
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3825 || XINT (args[n]) == 0)
21064
90bdbe2754c8 (Fformat): Format multibyte characters by "%c"
Kenichi Handa <handa@m17n.org>
parents: 21052
diff changeset
3826 {
49285
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3827 if (! multibyte)
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3828 {
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3829 multibyte = 1;
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3830 goto retry;
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3831 }
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3832 args[n] = Fchar_to_string (args[n]);
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3833 thissize = SBYTES (args[n]);
21064
90bdbe2754c8 (Fformat): Format multibyte characters by "%c"
Kenichi Handa <handa@m17n.org>
parents: 21052
diff changeset
3834 }
49285
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3835 else if (! ASCII_BYTE_P (XINT (args[n])) && multibyte)
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3836 {
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3837 args[n]
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3838 = Fchar_to_string (Funibyte_char_to_multibyte (args[n]));
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3839 thissize = SBYTES (args[n]);
7ec1335b6d36 (Fformat): Convert an unibyte char argument that is
Kenichi Handa <handa@m17n.org>
parents: 48908
diff changeset
3840 }
21064
90bdbe2754c8 (Fformat): Format multibyte characters by "%c"
Kenichi Handa <handa@m17n.org>
parents: 21052
diff changeset
3841 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3842 }
9163
41fe5f636879 (lisp_time_argument, Finsert, Finsert_and_inherit, Finsert_before_markers,
Karl Heuer <kwzh@gnu.org>
parents: 9154
diff changeset
3843 else if (FLOATP (args[n]) && *format != 's')
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3844 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3845 if (! (*format == 'e' || *format == 'f' || *format == 'g'))
48020
7ac7ca5ac550 (Fformat): Detect invalid format letters for floats.
Richard M. Stallman <rms@gnu.org>
parents: 47763
diff changeset
3846 {
7ac7ca5ac550 (Fformat): Detect invalid format letters for floats.
Richard M. Stallman <rms@gnu.org>
parents: 47763
diff changeset
3847 if (*format != 'd' && *format != 'o' && *format != 'x'
7ac7ca5ac550 (Fformat): Detect invalid format letters for floats.
Richard M. Stallman <rms@gnu.org>
parents: 47763
diff changeset
3848 && *format != 'i' && *format != 'X' && *format != 'c')
7ac7ca5ac550 (Fformat): Detect invalid format letters for floats.
Richard M. Stallman <rms@gnu.org>
parents: 47763
diff changeset
3849 error ("Invalid format operation %%%c", *format);
75181
ea255892b6fd (Fformat): Allow integer-format to work with floats of size
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75096
diff changeset
3850 /* This fails unnecessarily if args[n] is bigger than
ea255892b6fd (Fformat): Allow integer-format to work with floats of size
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75096
diff changeset
3851 most-positive-fixnum but smaller than MAXINT.
ea255892b6fd (Fformat): Allow integer-format to work with floats of size
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75096
diff changeset
3852 These cases are important because we sometimes use floats
ea255892b6fd (Fformat): Allow integer-format to work with floats of size
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75096
diff changeset
3853 to represent such integer values (typically such values
ea255892b6fd (Fformat): Allow integer-format to work with floats of size
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75096
diff changeset
3854 come from UIDs or PIDs). */
ea255892b6fd (Fformat): Allow integer-format to work with floats of size
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75096
diff changeset
3855 /* args[n] = Ftruncate (args[n], Qnil); */
48020
7ac7ca5ac550 (Fformat): Detect invalid format letters for floats.
Richard M. Stallman <rms@gnu.org>
parents: 47763
diff changeset
3856 }
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3857
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3858 /* Note that we're using sprintf to print floats,
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3859 so we have to take into account what that function
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
3860 prints. */
48782
b02bdb795a5c (Fformat): Use alloca, not _alloca.
Juanma Barranquero <lekktu@gmail.com>
parents: 48781
diff changeset
3861 /* Filter out flag value of -1. */
48908
d5680dc3113e (Fformat): Add parens.
Richard M. Stallman <rms@gnu.org>
parents: 48782
diff changeset
3862 thissize = (MAX_10_EXP + 100
d5680dc3113e (Fformat): Add parens.
Richard M. Stallman <rms@gnu.org>
parents: 48782
diff changeset
3863 + (precision[n] > 0 ? precision[n] : 0));
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3864 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3865 else
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3866 {
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3867 /* Anything but a string, convert to a string using princ. */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3868 register Lisp_Object tem;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3869 tem = Fprin1_to_string (args[n], Qt);
53541
41ceb9298a4e (Fformat): Fix '&' to '&&'.
Kenichi Handa <handa@m17n.org>
parents: 52451
diff changeset
3870 if (STRING_MULTIBYTE (tem) && ! multibyte)
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3871 {
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3872 multibyte = 1;
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3873 goto retry;
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3874 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3875 args[n] = tem;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3876 goto string;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3877 }
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
3878
42484
717eee813b2c (Fformat): Update thissize from field_width
Richard M. Stallman <rms@gnu.org>
parents: 42116
diff changeset
3879 thissize += max (0, field_width - actual_width);
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3880 total += thissize + 4;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3881 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3882
50746
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3883 abort_on_gc--;
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3884
20826
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3885 /* Now we can no longer jump to retry.
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3886 TOTAL and LONGEST_FORMAT are known for certain. */
cbaa9e50b013 (Fformat): If MULTIBYTE is changed to 1
Richard M. Stallman <rms@gnu.org>
parents: 20804
diff changeset
3887
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3888 this_format = (unsigned char *) alloca (longest_format + 1);
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3889
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3890 /* Allocate the space for the result.
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3891 Note that TOTAL is an overestimate. */
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
3892 SAFE_ALLOCA (buf, char *, total);
4019
0463aae99f4e * editfns.c (Fformat): Since floats occupy two elements in the
Jim Blandy <jimb@redhat.com>
parents: 3776
diff changeset
3893
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3894 p = buf;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3895 nchars = 0;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3896 n = 0;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3897
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3898 /* Scan the format and store result in BUF. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3899 format = SDATA (args[0]);
50746
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3900 format_start = format;
2a57a6e6b390 (Fformat): Set abort_on_gc during first scan of format.
Richard M. Stallman <rms@gnu.org>
parents: 50555
diff changeset
3901 end = format + SBYTES (args[0]);
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3902 maybe_combine_byte = 0;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3903 while (format != end)
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3904 {
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3905 if (*format == '%')
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3906 {
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3907 int minlen;
21225
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3908 int negative = 0;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3909 unsigned char *this_format_start = format;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3910
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3911 discarded[format - format_start] = 1;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3912 format++;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3913
75949
d420b7899f20 (Fformat): Add support for '+' flag.
Andreas Schwab <schwab@suse.de>
parents: 75387
diff changeset
3914 while (index("-+0# ", *format))
53687
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3915 {
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3916 if (*format == '-')
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3917 {
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3918 negative = 1;
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3919 }
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3920 discarded[format - format_start] = 1;
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3921 ++format;
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3922 }
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3923
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3924 minlen = atoi (format);
53687
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3925
4f06a8a0e7a6 For `format', make source and documentation match.
Jonathan Yavner <jyavner@member.fsf.org>
parents: 53541
diff changeset
3926 while ((*format >= '0' && *format <= '9') || *format == '.')
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3927 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3928 discarded[format - format_start] = 1;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3929 format++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3930 }
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3931
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3932 if (*format++ == '%')
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3933 {
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3934 *p++ = '%';
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3935 nchars++;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3936 continue;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3937 }
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3938
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3939 ++n;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3940
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3941 discarded[format - format_start - 1] = 1;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3942 info[n].start = nchars;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
3943
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3944 if (STRINGP (args[n]))
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
3945 {
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3946 /* handle case (precision[n] >= 0) */
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3947
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3948 int width, padding;
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3949 int nbytes, start, end;
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3950 int nchars_string;
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3951
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3952 /* lisp_string_width ignores a precision of 0, but GNU
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3953 libc functions print 0 characters when the precision
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3954 is 0. Imitate libc behavior here. Changing
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3955 lisp_string_width is the right thing, and will be
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3956 done, but meanwhile we work with it. */
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3957
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3958 if (precision[n] == 0)
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3959 width = nchars_string = nbytes = 0;
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3960 else if (precision[n] > 0)
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3961 width = lisp_string_width (args[n], precision[n], &nchars_string, &nbytes);
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3962 else
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3963 { /* no precision spec given for this argument */
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3964 width = lisp_string_width (args[n], -1, NULL, NULL);
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3965 nbytes = SBYTES (args[n]);
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3966 nchars_string = SCHARS (args[n]);
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3967 }
21225
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3968
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3969 /* If spec requires it, pad on right with spaces. */
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3970 padding = minlen - width;
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3971 if (! negative)
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3972 while (padding-- > 0)
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3973 {
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3974 *p++ = ' ';
35461
f0f0e9179ed6 (Fformat): Don't extend text properties from arguments
Gerd Moellmann <gerd@gnu.org>
parents: 35440
diff changeset
3975 ++nchars;
21225
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3976 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3977
66500
8392b2926dd8 (Fformat): Don't include string padding
Richard M. Stallman <rms@gnu.org>
parents: 66379
diff changeset
3978 info[n].start = start = nchars;
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3979 nchars += nchars_string;
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3980 end = nchars;
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3981
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3982 if (p > buf
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3983 && multibyte
22712
6f129ed55108 (Fformat): Replace explicit numeric constants with proper macros.
Kenichi Handa <handa@m17n.org>
parents: 22698
diff changeset
3984 && !ASCII_BYTE_P (*((unsigned char *) p - 1))
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3985 && STRING_MULTIBYTE (args[n])
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3986 && !CHAR_HEAD_P (SREF (args[n], 0)))
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
3987 maybe_combine_byte = 1;
48764
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3988
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3989 p += copy_text (SDATA (args[n]), p,
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3990 nbytes,
4a69081f2ff4 (Fformat): Handle precision in string conversion specifiers like libc
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48134
diff changeset
3991 STRING_MULTIBYTE (args[n]), multibyte);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3992
66500
8392b2926dd8 (Fformat): Don't include string padding
Richard M. Stallman <rms@gnu.org>
parents: 66379
diff changeset
3993 info[n].end = nchars;
8392b2926dd8 (Fformat): Don't include string padding
Richard M. Stallman <rms@gnu.org>
parents: 66379
diff changeset
3994
21225
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3995 if (negative)
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3996 while (padding-- > 0)
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3997 {
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3998 *p++ = ' ';
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
3999 nchars++;
47e189a470d2 (Fformat): Handle padding before or after, for %s etc.
Richard M. Stallman <rms@gnu.org>
parents: 21202
diff changeset
4000 }
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4001
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4002 /* If this argument has text properties, record where
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4003 in the result string it appears. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
4004 if (STRING_INTERVALS (args[n]))
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4005 info[n].intervals = arg_intervals = 1;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4006 }
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4007 else if (INTEGERP (args[n]) || FLOATP (args[n]))
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4008 {
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4009 int this_nchars;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4010
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4011 bcopy (this_format_start, this_format,
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4012 format - this_format_start);
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4013 this_format[format - this_format_start] = 0;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4014
79422
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4015 if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4016 sprintf (p, this_format, XFLOAT_DATA (args[n]));
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4017 else
72584
ad48859287a7 (Fformat): Don't sign-extend for %o or %x.
Richard M. Stallman <rms@gnu.org>
parents: 72531
diff changeset
4018 {
79472
daa9b2b4d89d (Fformat): Handle %c specially since it requires the
Andreas Schwab <schwab@suse.de>
parents: 79428
diff changeset
4019 if (sizeof (EMACS_INT) > sizeof (int)
daa9b2b4d89d (Fformat): Handle %c specially since it requires the
Andreas Schwab <schwab@suse.de>
parents: 79428
diff changeset
4020 && format[-1] != 'c')
79422
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4021 {
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4022 /* Insert 'l' before format spec. */
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4023 this_format[format - this_format_start]
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4024 = this_format[format - this_format_start - 1];
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4025 this_format[format - this_format_start - 1] = 'l';
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4026 this_format[format - this_format_start + 1] = 0;
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4027 }
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4028
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4029 if (INTEGERP (args[n]))
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4030 {
79472
daa9b2b4d89d (Fformat): Handle %c specially since it requires the
Andreas Schwab <schwab@suse.de>
parents: 79428
diff changeset
4031 if (format[-1] == 'c')
daa9b2b4d89d (Fformat): Handle %c specially since it requires the
Andreas Schwab <schwab@suse.de>
parents: 79428
diff changeset
4032 sprintf (p, this_format, (int) XINT (args[n]));
daa9b2b4d89d (Fformat): Handle %c specially since it requires the
Andreas Schwab <schwab@suse.de>
parents: 79428
diff changeset
4033 else if (format[-1] == 'd')
79422
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4034 sprintf (p, this_format, XINT (args[n]));
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4035 /* Don't sign-extend for octal or hex printing. */
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4036 else
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4037 sprintf (p, this_format, XUINT (args[n]));
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4038 }
79472
daa9b2b4d89d (Fformat): Handle %c specially since it requires the
Andreas Schwab <schwab@suse.de>
parents: 79428
diff changeset
4039 else if (format[-1] == 'c')
daa9b2b4d89d (Fformat): Handle %c specially since it requires the
Andreas Schwab <schwab@suse.de>
parents: 79428
diff changeset
4040 sprintf (p, this_format, (int) XFLOAT_DATA (args[n]));
79422
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4041 else if (format[-1] == 'd')
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4042 /* Maybe we should use "%1.0f" instead so it also works
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4043 for values larger than MAXINT. */
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4044 sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
72584
ad48859287a7 (Fformat): Don't sign-extend for %o or %x.
Richard M. Stallman <rms@gnu.org>
parents: 72531
diff changeset
4045 else
79422
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4046 /* Don't sign-extend for octal or hex printing. */
45618be84af9 (Fformat): Correctly format EMACS_INT values.
Andreas Schwab <schwab@suse.de>
parents: 78501
diff changeset
4047 sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
72584
ad48859287a7 (Fformat): Don't sign-extend for %o or %x.
Richard M. Stallman <rms@gnu.org>
parents: 72531
diff changeset
4048 }
12603
6d033c8501d4 (Fformat): Increment total for size of control string.
Richard M. Stallman <rms@gnu.org>
parents: 12602
diff changeset
4049
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4050 if (p > buf
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4051 && multibyte
22712
6f129ed55108 (Fformat): Replace explicit numeric constants with proper macros.
Kenichi Handa <handa@m17n.org>
parents: 22698
diff changeset
4052 && !ASCII_BYTE_P (*((unsigned char *) p - 1))
6f129ed55108 (Fformat): Replace explicit numeric constants with proper macros.
Kenichi Handa <handa@m17n.org>
parents: 22698
diff changeset
4053 && !CHAR_HEAD_P (*((unsigned char *) p)))
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4054 maybe_combine_byte = 1;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4055 this_nchars = strlen (p);
29008
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4056 if (multibyte)
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4057 p += str_to_multibyte (p, buf + total - 1 - p, this_nchars);
29008
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4058 else
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4059 p += this_nchars;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4060 nchars += this_nchars;
66500
8392b2926dd8 (Fformat): Don't include string padding
Richard M. Stallman <rms@gnu.org>
parents: 66379
diff changeset
4061 info[n].end = nchars;
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4062 }
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4063
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4064 }
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4065 else if (STRING_MULTIBYTE (args[0]))
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4066 {
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4067 /* Copy a whole multibyte character. */
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4068 if (p > buf
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4069 && multibyte
22712
6f129ed55108 (Fformat): Replace explicit numeric constants with proper macros.
Kenichi Handa <handa@m17n.org>
parents: 22698
diff changeset
4070 && !ASCII_BYTE_P (*((unsigned char *) p - 1))
6f129ed55108 (Fformat): Replace explicit numeric constants with proper macros.
Kenichi Handa <handa@m17n.org>
parents: 22698
diff changeset
4071 && !CHAR_HEAD_P (*format))
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4072 maybe_combine_byte = 1;
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4073 *p++ = *format++;
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4074 while (! CHAR_HEAD_P (*format))
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4075 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4076 discarded[format - format_start] = 2;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4077 *p++ = *format++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4078 }
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4079 nchars++;
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4080 }
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4081 else if (multibyte)
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4082 {
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4083 /* Convert a single-byte character to multibyte. */
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4084 int len = copy_text (format, p, 1, 0, 1);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4085
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4086 p += len;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4087 format++;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4088 nchars++;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4089 }
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4090 else
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4091 *p++ = *format++, nchars++;
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4092 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4093
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4094 if (p > buf + total)
34566
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
4095 abort ();
0370af7597d2 (Fformat): Prevent a buffer overrun when the format
Gerd Moellmann <gerd@gnu.org>
parents: 34165
diff changeset
4096
22698
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4097 if (maybe_combine_byte)
ea6ef56295b4 (Fformat): Pay attention to the byte combining problem.
Kenichi Handa <handa@m17n.org>
parents: 22669
diff changeset
4098 nchars = multibyte_chars_in_text (buf, p - buf);
21257
205a5aa4aa2f (Fchar_to_string): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21245
diff changeset
4099 val = make_specified_string (buf, nchars, p - buf, multibyte);
20804
14fa73136e64 (CONVERTED_BYTE_SIZE): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents: 20706
diff changeset
4100
20606
9331e7e88cf5 (Fformat): Do all the work directly--don't use doprnt.
Richard M. Stallman <rms@gnu.org>
parents: 20564
diff changeset
4101 /* If we allocated BUF with malloc, free it too. */
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
4102 SAFE_FREE ();
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4103
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4104 /* If the format string has text properties, or any of the string
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4105 arguments has text properties, set up text properties of the
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4106 result string. */
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
4107
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4108 if (STRING_INTERVALS (args[0]) || arg_intervals)
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4109 {
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4110 Lisp_Object len, new_len, props;
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4111 struct gcpro gcpro1;
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
4112
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4113 /* Add text properties from the format string. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
4114 len = make_number (SCHARS (args[0]));
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4115 props = text_property_list (args[0], make_number (0), len, Qnil);
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4116 GCPRO1 (props);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
4117
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4118 if (CONSP (props))
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4119 {
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4120 int bytepos = 0, position = 0, translated = 0, argn = 1;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4121 Lisp_Object list;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4122
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4123 /* Adjust the bounds of each text property
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4124 to the proper start and end in the output string. */
57076
d2baef38bbd7 (Fformat): Handle format strings with multiple text
Kim F. Storm <storm@cua.dk>
parents: 56560
diff changeset
4125
d2baef38bbd7 (Fformat): Handle format strings with multiple text
Kim F. Storm <storm@cua.dk>
parents: 56560
diff changeset
4126 /* Put the positions in PROPS in increasing order, so that
d2baef38bbd7 (Fformat): Handle format strings with multiple text
Kim F. Storm <storm@cua.dk>
parents: 56560
diff changeset
4127 we can do (effectively) one scan through the position
d2baef38bbd7 (Fformat): Handle format strings with multiple text
Kim F. Storm <storm@cua.dk>
parents: 56560
diff changeset
4128 space of the format string. */
d2baef38bbd7 (Fformat): Handle format strings with multiple text
Kim F. Storm <storm@cua.dk>
parents: 56560
diff changeset
4129 props = Fnreverse (props);
d2baef38bbd7 (Fformat): Handle format strings with multiple text
Kim F. Storm <storm@cua.dk>
parents: 56560
diff changeset
4130
d2baef38bbd7 (Fformat): Handle format strings with multiple text
Kim F. Storm <storm@cua.dk>
parents: 56560
diff changeset
4131 /* BYTEPOS is the byte position in the format string,
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4132 POSITION is the untranslated char position in it,
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4133 TRANSLATED is the translated char position in BUF,
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4134 and ARGN is the number of the next arg we will come to. */
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4135 for (list = props; CONSP (list); list = XCDR (list))
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4136 {
50555
37d227b879ad (Fformat): Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50499
diff changeset
4137 Lisp_Object item;
37d227b879ad (Fformat): Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50499
diff changeset
4138 int pos;
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4139
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4140 item = XCAR (list);
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4141
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4142 /* First adjust the property start position. */
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4143 pos = XINT (XCAR (item));
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4144
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4145 /* Advance BYTEPOS, POSITION, TRANSLATED and ARGN
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4146 up to this position. */
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4147 for (; position < pos; bytepos++)
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4148 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4149 if (! discarded[bytepos])
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4150 position++, translated++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4151 else if (discarded[bytepos] == 1)
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4152 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4153 position++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4154 if (translated == info[argn].start)
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4155 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4156 translated += info[argn].end - info[argn].start;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4157 argn++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4158 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4159 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4160 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4161
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4162 XSETCAR (item, make_number (translated));
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4163
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4164 /* Likewise adjust the property end position. */
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4165 pos = XINT (XCAR (XCDR (item)));
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4166
71865
47930f9fbcdf (Fformat): Fix calculation of text property positions
Kenichi Handa <handa@m17n.org>
parents: 71832
diff changeset
4167 for (; position < pos; bytepos++)
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4168 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4169 if (! discarded[bytepos])
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4170 position++, translated++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4171 else if (discarded[bytepos] == 1)
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4172 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4173 position++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4174 if (translated == info[argn].start)
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4175 {
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4176 translated += info[argn].end - info[argn].start;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4177 argn++;
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4178 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4179 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4180 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4181
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4182 XSETCAR (XCDR (item), make_number (translated));
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4183 }
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4184
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4185 add_text_properties_from_list (val, props, make_number (0));
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4186 }
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4187
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4188 /* Add text properties from arguments. */
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4189 if (arg_intervals)
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4190 for (n = 1; n < nargs; ++n)
50499
0abd4951c0fb (Fformat): Translate positions of text properties
Richard M. Stallman <rms@gnu.org>
parents: 50430
diff changeset
4191 if (info[n].intervals)
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4192 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
4193 len = make_number (SCHARS (args[n]));
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4194 new_len = make_number (info[n].end - info[n].start);
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4195 props = text_property_list (args[n], make_number (0), len, Qnil);
106780
85fd976607be Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents: 106774
diff changeset
4196 props = extend_property_ranges (props, new_len);
85fd976607be Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents: 106774
diff changeset
4197 /* If successive arguments have properties, be sure that
30023
ec25786e4705 (Fformat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 29008
diff changeset
4198 the value of `composition' property be the copy. */
ec25786e4705 (Fformat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 29008
diff changeset
4199 if (n > 1 && info[n - 1].end)
ec25786e4705 (Fformat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 29008
diff changeset
4200 make_composition_value_copy (props);
25018
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4201 add_text_properties_from_list (val, props,
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4202 make_number (info[n].start));
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4203 }
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4204
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4205 UNGCPRO;
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4206 }
890e8042db8f (Fmessage): Use message3.
Gerd Moellmann <gerd@gnu.org>
parents: 24847
diff changeset
4207
20804
14fa73136e64 (CONVERTED_BYTE_SIZE): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents: 20706
diff changeset
4208 return val;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4209 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4210
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4211 Lisp_Object
49443
f9f7612c767a (format2): New function, replaces format1
Richard M. Stallman <rms@gnu.org>
parents: 49293
diff changeset
4212 format2 (string1, arg0, arg1)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4213 char *string1;
49443
f9f7612c767a (format2): New function, replaces format1
Richard M. Stallman <rms@gnu.org>
parents: 49293
diff changeset
4214 Lisp_Object arg0, arg1;
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4215 {
49443
f9f7612c767a (format2): New function, replaces format1
Richard M. Stallman <rms@gnu.org>
parents: 49293
diff changeset
4216 Lisp_Object args[3];
f9f7612c767a (format2): New function, replaces format1
Richard M. Stallman <rms@gnu.org>
parents: 49293
diff changeset
4217 args[0] = build_string (string1);
f9f7612c767a (format2): New function, replaces format1
Richard M. Stallman <rms@gnu.org>
parents: 49293
diff changeset
4218 args[1] = arg0;
f9f7612c767a (format2): New function, replaces format1
Richard M. Stallman <rms@gnu.org>
parents: 49293
diff changeset
4219 args[2] = arg1;
f9f7612c767a (format2): New function, replaces format1
Richard M. Stallman <rms@gnu.org>
parents: 49293
diff changeset
4220 return Fformat (3, args);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4221 }
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4222
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4223 DEFUN ("char-equal", Fchar_equal, Schar_equal, 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4224 doc: /* Return t if two characters match, optionally ignoring case.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4225 Both arguments must be characters (i.e. integers).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4226 Case is ignored if `case-fold-search' is non-nil in the current buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4227 (c1, c2)
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4228 register Lisp_Object c1, c2;
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4229 {
20688
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4230 int i1, i2;
93038
a2c4bffe2b59 (Fchar_equal): Check they are valid characters.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92954
diff changeset
4231 /* Check they're chars, not just integers, otherwise we could get array
a2c4bffe2b59 (Fchar_equal): Check they are valid characters.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92954
diff changeset
4232 bounds violations in DOWNCASE. */
a2c4bffe2b59 (Fchar_equal): Check they are valid characters.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92954
diff changeset
4233 CHECK_CHARACTER (c1);
a2c4bffe2b59 (Fchar_equal): Check they are valid characters.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92954
diff changeset
4234 CHECK_CHARACTER (c2);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4235
20688
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4236 if (XINT (c1) == XINT (c2))
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4237 return Qt;
20688
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4238 if (NILP (current_buffer->case_fold_search))
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4239 return Qnil;
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4240
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4241 /* Do these in separate statements,
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4242 then compare the variables.
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4243 because of the way DOWNCASE uses temp variables. */
89025
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4244 i1 = XFASTINT (c1);
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4245 if (NILP (current_buffer->enable_multibyte_characters)
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4246 && ! ASCII_CHAR_P (i1))
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4247 {
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4248 MAKE_CHAR_MULTIBYTE (i1);
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4249 }
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4250 i2 = XFASTINT (c2);
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4251 if (NILP (current_buffer->enable_multibyte_characters)
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4252 && ! ASCII_CHAR_P (i2))
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4253 {
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4254 MAKE_CHAR_MULTIBYTE (i2);
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4255 }
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4256 i1 = DOWNCASE (i1);
1c45126c0974 (Fchar_equal): Fix for the unibyte case.
Kenichi Handa <handa@m17n.org>
parents: 89009
diff changeset
4257 i2 = DOWNCASE (i2);
20688
16c458803c32 (Fchar_equal): Fix case-conversion code.
Richard M. Stallman <rms@gnu.org>
parents: 20606
diff changeset
4258 return (i1 == i2 ? Qt : Qnil);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4259 }
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4260
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4261 /* 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
4262 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
4263 differ in size).
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4264
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4265 START1, END1 are the character positions of the first region.
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4266 START1_BYTE, END1_BYTE are the byte positions.
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4267 START2, END2 are the character positions of the second region.
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4268 START2_BYTE, END2_BYTE are the byte positions.
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4269
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4270 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
4271 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
4272 rest untouched. Most of this is copied from adjust_markers in insdel.c.
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
4273
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4274 It's the caller's job to ensure that START1 <= END1 <= START2 <= END2. */
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4275
31016
b26ac1565dd4 (find_field): Formatting changes.
Gerd Moellmann <gerd@gnu.org>
parents: 30931
diff changeset
4276 static void
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4277 transpose_markers (start1, end1, start2, end2,
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4278 start1_byte, end1_byte, start2_byte, end2_byte)
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4279 register int start1, end1, start2, end2;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4280 register int start1_byte, end1_byte, start2_byte, end2_byte;
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4281 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4282 register int amt1, amt1_byte, amt2, amt2_byte, diff, diff_byte, mpos;
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
4283 register struct Lisp_Marker *marker;
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4284
7862
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4285 /* 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
4286 if (PT < start1)
987ab382275c (Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents: 7506
diff changeset
4287 ;
987ab382275c (Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents: 7506
diff changeset
4288 else if (PT < end1)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4289 TEMP_SET_PT_BOTH (PT + (end2 - end1),
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4290 PT_BYTE + (end2_byte - end1_byte));
7519
987ab382275c (Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents: 7506
diff changeset
4291 else if (PT < start2)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4292 TEMP_SET_PT_BOTH (PT + (end2 - start2) - (end1 - start1),
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4293 (PT_BYTE + (end2_byte - start2_byte)
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4294 - (end1_byte - start1_byte)));
7519
987ab382275c (Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents: 7506
diff changeset
4295 else if (PT < end2)
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4296 TEMP_SET_PT_BOTH (PT - (start2 - start1),
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4297 PT_BYTE - (start2_byte - start1_byte));
7519
987ab382275c (Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents: 7506
diff changeset
4298
7862
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4299 /* 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
4300 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
4301 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
4302 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
4303 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
4304 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
4305 the dirty work to Fmarker_position, below. */
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4306
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4307 /* The difference between the region's lengths */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4308 diff = (end2 - start2) - (end1 - start1);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4309 diff_byte = (end2_byte - start2_byte) - (end1_byte - start1_byte);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
4310
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4311 /* For shifting each marker in a region by the length of the other
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4312 region plus the distance between the regions. */
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4313 amt1 = (end2 - start2) + (start2 - end1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4314 amt2 = (end1 - start1) + (start2 - end1);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4315 amt1_byte = (end2_byte - start2_byte) + (start2_byte - end1_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4316 amt2_byte = (end1_byte - start1_byte) + (start2_byte - end1_byte);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4317
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
4318 for (marker = BUF_MARKERS (current_buffer); marker; marker = marker->next)
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4319 {
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
4320 mpos = marker->bytepos;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4321 if (mpos >= start1_byte && mpos < end2_byte)
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4322 {
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4323 if (mpos < end1_byte)
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4324 mpos += amt1_byte;
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4325 else if (mpos < start2_byte)
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4326 mpos += diff_byte;
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4327 else
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4328 mpos -= amt2_byte;
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
4329 marker->bytepos = mpos;
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4330 }
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
4331 mpos = marker->charpos;
7862
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4332 if (mpos >= start1 && mpos < end2)
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4333 {
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4334 if (mpos < end1)
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4335 mpos += amt1;
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4336 else if (mpos < start2)
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4337 mpos += diff;
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4338 else
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4339 mpos -= amt2;
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4340 }
51670
beceb827c1ce (save_excursion_restore, transpose_markers): Update for new types.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51042
diff changeset
4341 marker->charpos = mpos;
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4342 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4343 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4344
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4345 DEFUN ("transpose-regions", Ftranspose_regions, Stranspose_regions, 4, 5, 0,
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
4346 doc: /* Transpose region STARTR1 to ENDR1 with STARTR2 to ENDR2.
103194
aed44175c8f2 * editfns.c (Ftranspose_regions): Doc fix (Bug#3248).
Chong Yidong <cyd@stupidchicken.com>
parents: 103005
diff changeset
4347 The regions should not be overlapping, because the size of the buffer is
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4348 never changed in a transposition.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4349
55972
db2480202623 (Fuser_login_name, Ffloat_time, Fencode_time, Fcurrent_time_string)
Juanma Barranquero <lekktu@gmail.com>
parents: 55424
diff changeset
4350 Optional fifth arg LEAVE-MARKERS, if non-nil, means don't update
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4351 any markers that happen to be located in the regions.
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4352
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4353 Transposing beyond buffer boundaries is an error. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4354 (startr1, endr1, startr2, endr2, leave_markers)
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4355 Lisp_Object startr1, endr1, startr2, endr2, leave_markers;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4356 {
81793
935816f951c9 (Ftranspose_regions): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81422
diff changeset
4357 register EMACS_INT start1, end1, start2, end2;
935816f951c9 (Ftranspose_regions): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81422
diff changeset
4358 EMACS_INT start1_byte, start2_byte, len1_byte, len2_byte;
935816f951c9 (Ftranspose_regions): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81422
diff changeset
4359 EMACS_INT 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
4360 unsigned char *start1_addr, *start2_addr, *temp;
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4361
77017
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4362 INTERVAL cur_intv, tmp_interval1, tmp_interval_mid, tmp_interval2, tmp_interval3;
76703
556faea8ff02 (Ftranspose_regions): Use set_text_properties_1 instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 76509
diff changeset
4363 Lisp_Object buf;
556faea8ff02 (Ftranspose_regions): Use set_text_properties_1 instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 76509
diff changeset
4364
556faea8ff02 (Ftranspose_regions): Use set_text_properties_1 instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 76509
diff changeset
4365 XSETBUFFER (buf, current_buffer);
10308
90784ed0416f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9812
diff changeset
4366 cur_intv = BUF_INTERVALS (current_buffer);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4367
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4368 validate_region (&startr1, &endr1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4369 validate_region (&startr2, &endr2);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4370
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4371 start1 = XFASTINT (startr1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4372 end1 = XFASTINT (endr1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4373 start2 = XFASTINT (startr2);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4374 end2 = XFASTINT (endr2);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4375 gap = GPT;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4376
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4377 /* Swap the regions if they're reversed. */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4378 if (start2 < end1)
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4379 {
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4380 register int glumph = start1;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4381 start1 = start2;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4382 start2 = glumph;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4383 glumph = end1;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4384 end1 = end2;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4385 end2 = glumph;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4386 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4387
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4388 len1 = end1 - start1;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4389 len2 = end2 - start2;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4390
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4391 if (start2 < end1)
21245
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4392 error ("Transposed regions overlap");
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4393 else if (start1 == end1 || start2 == end2)
21245
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4394 error ("Transposed region has length 0");
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4395
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4396 /* The possibilities are:
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4397 1. Adjacent (contiguous) regions, or separate but equal regions
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4398 (no, really equal, in this case!), or
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4399 2. Separate regions of unequal size.
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
4400
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4401 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
4402 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
4403 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
4404 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
4405
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4406 /* 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
4407 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
4408 around it if necessary. This would be extremely efficient,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4409 especially considering that people are likely to do
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4410 transpositions near where they are working interactively, which
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4411 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
4412 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
4413 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
4414 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
4415 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
4416 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
4417
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4418 /* 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
4419 we will operate on. */
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4420 if (start1 < gap && gap < end2)
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4421 {
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4422 if (gap - start1 < end2 - gap)
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4423 move_gap (start1);
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4424 else
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4425 move_gap (end2);
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4426 }
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4427
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4428 start1_byte = CHAR_TO_BYTE (start1);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4429 start2_byte = CHAR_TO_BYTE (start2);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4430 len1_byte = CHAR_TO_BYTE (end1) - start1_byte;
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4431 len2_byte = CHAR_TO_BYTE (end2) - start2_byte;
21245
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4432
29008
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4433 #ifdef BYTE_COMBINING_DEBUG
21245
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4434 if (end1 == start2)
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4435 {
29008
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4436 if (count_combining_before (BYTE_POS_ADDR (start2_byte),
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4437 len2_byte, start1, start1_byte)
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4438 || count_combining_before (BYTE_POS_ADDR (start1_byte),
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4439 len1_byte, end2, start2_byte + len2_byte)
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4440 || count_combining_after (BYTE_POS_ADDR (start1_byte),
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4441 len1_byte, end2, start2_byte + len2_byte))
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4442 abort ();
21245
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4443 }
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4444 else
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4445 {
29008
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4446 if (count_combining_before (BYTE_POS_ADDR (start2_byte),
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4447 len2_byte, start1, start1_byte)
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4448 || count_combining_before (BYTE_POS_ADDR (start1_byte),
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4449 len1_byte, start2, start2_byte)
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4450 || count_combining_after (BYTE_POS_ADDR (start2_byte),
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4451 len2_byte, end1, start1_byte + len1_byte)
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4452 || count_combining_after (BYTE_POS_ADDR (start1_byte),
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4453 len1_byte, end2, start2_byte + len2_byte))
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4454 abort ();
21245
6cde55b7c9de Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21235
diff changeset
4455 }
29008
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4456 #endif
939760ef7379 (Fformat): Be sure to convert 8-bit characters to
Kenichi Handa <handa@m17n.org>
parents: 28545
diff changeset
4457
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4458 /* 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
4459 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
4460 allocation... interesting. Later, don't fool with it now. */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4461
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4462 /* Working without memmove, for portability (sigh), so must be
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4463 careful of overlapping subsections of the array... */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4464
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4465 if (end1 == start2) /* adjacent regions */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4466 {
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72584
diff changeset
4467 modify_region (current_buffer, start1, end2, 0);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4468 record_change (start1, len1 + len2);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4469
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4470 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4471 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
76703
556faea8ff02 (Ftranspose_regions): Use set_text_properties_1 instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 76509
diff changeset
4472 /* Don't use Fset_text_properties: that can cause GC, which can
556faea8ff02 (Ftranspose_regions): Use set_text_properties_1 instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 76509
diff changeset
4473 clobber objects stored in the tmp_intervals. */
77017
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4474 tmp_interval3 = validate_interval_range (buf, &startr1, &endr2, 0);
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4475 if (!NULL_INTERVAL_P (tmp_interval3))
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4476 set_text_properties_1 (startr1, endr2, Qnil, buf, tmp_interval3);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4477
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4478 /* First region smaller than second. */
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4479 if (len1_byte < len2_byte)
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4480 {
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4481 USE_SAFE_ALLOCA;
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4482
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4483 SAFE_ALLOCA (temp, unsigned char *, len2_byte);
7862
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4484
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4485 /* 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
4486 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
4487 have moved the buffer around during the xmalloc. */
23166
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4488 start1_addr = BYTE_POS_ADDR (start1_byte);
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4489 start2_addr = BYTE_POS_ADDR (start2_byte);
7862
0b6f46029ea2 (transpose_markers): Allow for gap at start of region.
Karl Heuer <kwzh@gnu.org>
parents: 7710
diff changeset
4490
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4491 bcopy (start2_addr, temp, len2_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4492 bcopy (start1_addr, start1_addr + len2_byte, len1_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4493 bcopy (temp, start1_addr, len2_byte);
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
4494 SAFE_FREE ();
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4495 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4496 else
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4497 /* First region not smaller than second. */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4498 {
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4499 USE_SAFE_ALLOCA;
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4500
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4501 SAFE_ALLOCA (temp, unsigned char *, len1_byte);
23166
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4502 start1_addr = BYTE_POS_ADDR (start1_byte);
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4503 start2_addr = BYTE_POS_ADDR (start2_byte);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4504 bcopy (start1_addr, temp, len1_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4505 bcopy (start2_addr, start1_addr, len2_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4506 bcopy (temp, start1_addr + len2_byte, len1_byte);
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
4507 SAFE_FREE ();
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4508 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4509 graft_intervals_into_buffer (tmp_interval1, start1 + len2,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4510 len1, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4511 graft_intervals_into_buffer (tmp_interval2, start1,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4512 len2, current_buffer, 0);
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
4513 update_compositions (start1, start1 + len2, CHECK_BORDER);
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
4514 update_compositions (start1 + len2, end2, CHECK_TAIL);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4515 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4516 /* Non-adjacent regions, because end1 != start2, bleagh... */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4517 else
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4518 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4519 len_mid = start2_byte - (start1_byte + len1_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4520
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4521 if (len1_byte == len2_byte)
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4522 /* Regions are same size, though, how nice. */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4523 {
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4524 USE_SAFE_ALLOCA;
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4525
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72584
diff changeset
4526 modify_region (current_buffer, start1, end1, 0);
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72584
diff changeset
4527 modify_region (current_buffer, start2, end2, 0);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4528 record_change (start1, len1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4529 record_change (start2, len2);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4530 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4531 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
77017
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4532
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4533 tmp_interval3 = validate_interval_range (buf, &startr1, &endr1, 0);
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4534 if (!NULL_INTERVAL_P (tmp_interval3))
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4535 set_text_properties_1 (startr1, endr1, Qnil, buf, tmp_interval3);
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4536
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4537 tmp_interval3 = validate_interval_range (buf, &startr2, &endr2, 0);
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4538 if (!NULL_INTERVAL_P (tmp_interval3))
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4539 set_text_properties_1 (startr2, endr2, Qnil, buf, tmp_interval3);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4540
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4541 SAFE_ALLOCA (temp, unsigned char *, len1_byte);
23166
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4542 start1_addr = BYTE_POS_ADDR (start1_byte);
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4543 start2_addr = BYTE_POS_ADDR (start2_byte);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4544 bcopy (start1_addr, temp, len1_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4545 bcopy (start2_addr, start1_addr, len2_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4546 bcopy (temp, start2_addr, len1_byte);
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
4547 SAFE_FREE ();
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4548
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4549 graft_intervals_into_buffer (tmp_interval1, start2,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4550 len1, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4551 graft_intervals_into_buffer (tmp_interval2, start1,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4552 len2, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4553 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4554
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4555 else if (len1_byte < len2_byte) /* Second region larger than first */
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4556 /* 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
4557 {
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4558 USE_SAFE_ALLOCA;
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4559
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72584
diff changeset
4560 modify_region (current_buffer, start1, end2, 0);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4561 record_change (start1, (end2 - start1));
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4562 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4563 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
4564 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
77017
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4565
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4566 tmp_interval3 = validate_interval_range (buf, &startr1, &endr2, 0);
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4567 if (!NULL_INTERVAL_P (tmp_interval3))
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4568 set_text_properties_1 (startr1, endr2, Qnil, buf, tmp_interval3);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4569
7250
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4570 /* holds region 2 */
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4571 SAFE_ALLOCA (temp, unsigned char *, len2_byte);
23166
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4572 start1_addr = BYTE_POS_ADDR (start1_byte);
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4573 start2_addr = BYTE_POS_ADDR (start2_byte);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4574 bcopy (start2_addr, temp, len2_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4575 bcopy (start1_addr, start1_addr + len_mid + len2_byte, len1_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4576 safe_bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4577 bcopy (temp, start1_addr, len2_byte);
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
4578 SAFE_FREE ();
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4579
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4580 graft_intervals_into_buffer (tmp_interval1, end2 - len1,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4581 len1, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4582 graft_intervals_into_buffer (tmp_interval_mid, start1 + len2,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4583 len_mid, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4584 graft_intervals_into_buffer (tmp_interval2, start1,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4585 len2, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4586 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4587 else
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4588 /* Second region smaller than first. */
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4589 {
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4590 USE_SAFE_ALLOCA;
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4591
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4592 record_change (start1, (end2 - start1));
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72584
diff changeset
4593 modify_region (current_buffer, start1, end2, 0);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4594
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4595 tmp_interval1 = copy_intervals (cur_intv, start1, len1);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4596 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
4597 tmp_interval2 = copy_intervals (cur_intv, start2, len2);
77017
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4598
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4599 tmp_interval3 = validate_interval_range (buf, &startr1, &endr2, 0);
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4600 if (!NULL_INTERVAL_P (tmp_interval3))
484daf850d1e (Ftranspose_regions): Validate interval before setting text
Chong Yidong <cyd@stupidchicken.com>
parents: 76709
diff changeset
4601 set_text_properties_1 (startr1, endr2, Qnil, buf, tmp_interval3);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4602
7250
67bb3bb1b62d (Ftranspose_regions): Take addresses only after move gap.
Richard M. Stallman <rms@gnu.org>
parents: 7207
diff changeset
4603 /* holds region 1 */
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4604 SAFE_ALLOCA (temp, unsigned char *, len1_byte);
23166
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4605 start1_addr = BYTE_POS_ADDR (start1_byte);
6072f28afec9 (Ftranspose_regions): Use BYTE_POS_ADDR to get an
Kenichi Handa <handa@m17n.org>
parents: 23132
diff changeset
4606 start2_addr = BYTE_POS_ADDR (start2_byte);
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4607 bcopy (start1_addr, temp, len1_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4608 bcopy (start2_addr, start1_addr, len2_byte);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4609 bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4610 bcopy (temp, start1_addr + len2_byte + len_mid, len1_byte);
57725
c0675c413aa3 (Fformat): Allocate discarded table with SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 57644
diff changeset
4611 SAFE_FREE ();
56194
e1f0d4beb4ba (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 55972
diff changeset
4612
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4613 graft_intervals_into_buffer (tmp_interval1, end2 - len1,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4614 len1, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4615 graft_intervals_into_buffer (tmp_interval_mid, start1 + len2,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4616 len_mid, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4617 graft_intervals_into_buffer (tmp_interval2, start1,
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4618 len2, current_buffer, 0);
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4619 }
26853
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
4620
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
4621 update_compositions (start1, start1 + len2, CHECK_BORDER);
bf700e4957ec (Fchar_to_string): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
4622 update_compositions (end2 - len1, end2, CHECK_BORDER);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4623 }
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4624
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4625 /* When doing multiple transpositions, it might be nice
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4626 to optimize this. Perhaps the markers in any one buffer
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4627 should be organized in some sorted data tree. */
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4628 if (NILP (leave_markers))
7519
987ab382275c (Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents: 7506
diff changeset
4629 {
20558
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4630 transpose_markers (start1, end1, start2, end2,
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4631 start1_byte, start1_byte + len1_byte,
d19346dc4453 (Fgoto_char): When arg is a marker, copy char and byte
Richard M. Stallman <rms@gnu.org>
parents: 20338
diff changeset
4632 start2_byte, start2_byte + len2_byte);
54555
b136a4512609 * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents: 54242
diff changeset
4633 fix_start_end_in_overlays (start1, end2);
7519
987ab382275c (Ftranspose_regions): Fix overlays after moving markers.
Karl Heuer <kwzh@gnu.org>
parents: 7506
diff changeset
4634 }
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4635
77661
6634ebb68050 (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77017
diff changeset
4636 signal_after_change (start1, end2 - start1, end2 - start1);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4637 return Qnil;
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4638 }
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4639
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4640
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4641 void
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4642 syms_of_editfns ()
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4643 {
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4644 environbuf = 0;
92954
f0f1c359cd43 (initial_tz): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92236
diff changeset
4645 initial_tz = 0;
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4646
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4647 Qbuffer_access_fontify_functions
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105841
diff changeset
4648 = intern_c_string ("buffer-access-fontify-functions");
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4649 staticpro (&Qbuffer_access_fontify_functions);
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4650
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4651 DEFVAR_LISP ("inhibit-field-text-motion", &Vinhibit_field_text_motion,
43862
7263004fcb03 (syms_of_editfns): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 43042
diff changeset
4652 doc: /* Non-nil means text motion commands don't notice fields. */);
27077
19a664c654ab (Vinhibit_field_text_motion): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 26853
diff changeset
4653 Vinhibit_field_text_motion = Qnil;
19a664c654ab (Vinhibit_field_text_motion): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 26853
diff changeset
4654
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4655 DEFVAR_LISP ("buffer-access-fontify-functions",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4656 &Vbuffer_access_fontify_functions,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4657 doc: /* List of functions called by `buffer-substring' to fontify if necessary.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4658 Each function is called with two arguments which specify the range
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4659 of the buffer being accessed. */);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4660 Vbuffer_access_fontify_functions = Qnil;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4661
14440
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4662 {
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4663 Lisp_Object obuf;
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4664 extern Lisp_Object Vprin1_to_string_buffer;
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4665 obuf = Fcurrent_buffer ();
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4666 /* Do this here, because init_buffer_once is too early--it won't work. */
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4667 Fset_buffer (Vprin1_to_string_buffer);
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4668 /* Make sure buffer-access-fontify-functions is nil in this buffer. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105841
diff changeset
4669 Fset (Fmake_local_variable (intern_c_string ("buffer-access-fontify-functions")),
14440
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4670 Qnil);
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4671 Fset_buffer (obuf);
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4672 }
e99b3302c154 (syms_of_editfns): Make buffer-access-fontify-functions
Richard M. Stallman <rms@gnu.org>
parents: 14391
diff changeset
4673
14220
74d7745bcaa4 sp correction
Simon Marshall <simon@gnu.org>
parents: 14201
diff changeset
4674 DEFVAR_LISP ("buffer-access-fontified-property",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4675 &Vbuffer_access_fontified_property,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4676 doc: /* Property which (if non-nil) indicates text has been fontified.
39966
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4677 `buffer-substring' need not call the `buffer-access-fontify-functions'
1c2d486200f3 Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39962
diff changeset
4678 functions if all the text being accessed has this property. */);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4679 Vbuffer_access_fontified_property = Qnil;
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4680
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4681 DEFVAR_LISP ("system-name", &Vsystem_name,
72751
9128a4531448 (Fsystem_name): Mention "host" in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents: 72669
diff changeset
4682 doc: /* The host name of the machine Emacs is running on. */);
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4683
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4684 DEFVAR_LISP ("user-full-name", &Vuser_full_name,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4685 doc: /* The full name of the user logged in. */);
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4686
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4687 DEFVAR_LISP ("user-login-name", &Vuser_login_name,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4688 doc: /* The user's name, taken from environment variables if possible. */);
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4689
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4690 DEFVAR_LISP ("user-real-login-name", &Vuser_real_login_name,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39966
diff changeset
4691 doc: /* The user's name, based upon the real uid only. */);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4692
59644
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
4693 DEFVAR_LISP ("operating-system-release", &Voperating_system_release,
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
4694 doc: /* The release of the operating system Emacs is running on. */);
d8d85276ffed * editfns.c (Voperating_system_release): Added.
Steven Tamm <steventamm@mac.com>
parents: 58029
diff changeset
4695
25833
65cab65c4a28 (Fpropertize): Renamed from Fproperties.
Gerd Moellmann <gerd@gnu.org>
parents: 25815
diff changeset
4696 defsubr (&Spropertize);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4697 defsubr (&Schar_equal);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4698 defsubr (&Sgoto_char);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4699 defsubr (&Sstring_to_char);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4700 defsubr (&Schar_to_string);
108663
a224d29f3386 * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107388
diff changeset
4701 defsubr (&Sbyte_to_string);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4702 defsubr (&Sbuffer_substring);
13767
862fff660446 (Fset_time_zone_rule): Move static var environbuf
Karl Heuer <kwzh@gnu.org>
parents: 13618
diff changeset
4703 defsubr (&Sbuffer_substring_no_properties);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4704 defsubr (&Sbuffer_string);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4705
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4706 defsubr (&Spoint_marker);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4707 defsubr (&Smark_marker);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4708 defsubr (&Spoint);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4709 defsubr (&Sregion_beginning);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4710 defsubr (&Sregion_end);
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4711
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
4712 staticpro (&Qfield);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105841
diff changeset
4713 Qfield = intern_c_string ("field");
30439
c084f49c2a7f (find_field): Honor special `boundary' fields.
Miles Bader <miles@gnu.org>
parents: 30244
diff changeset
4714 staticpro (&Qboundary);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105841
diff changeset
4715 Qboundary = intern_c_string ("boundary");
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
4716 defsubr (&Sfield_beginning);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
4717 defsubr (&Sfield_end);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
4718 defsubr (&Sfield_string);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
4719 defsubr (&Sfield_string_no_properties);
26347
7fd9f4ecdd29 (Fdelete_field): Renamed from Ferase_field.
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
4720 defsubr (&Sdelete_field);
26058
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
4721 defsubr (&Sconstrain_to_field);
c11f0832a7c5 (Fconstrain_to_field): Make sure we don't violate the
Gerd Moellmann <gerd@gnu.org>
parents: 25833
diff changeset
4722
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4723 defsubr (&Sline_beginning_position);
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4724 defsubr (&Sline_end_position);
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4725
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4726 /* defsubr (&Smark); */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4727 /* defsubr (&Sset_mark); */
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4728 defsubr (&Ssave_excursion);
16298
17304eb73f97 (Fsave_current_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16269
diff changeset
4729 defsubr (&Ssave_current_buffer);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4730
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4731 defsubr (&Sbufsize);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4732 defsubr (&Spoint_max);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4733 defsubr (&Spoint_min);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4734 defsubr (&Spoint_min_marker);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4735 defsubr (&Spoint_max_marker);
21821
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
4736 defsubr (&Sgap_position);
9e82920b194d (Fgap_position, Fgap_size): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 21717
diff changeset
4737 defsubr (&Sgap_size);
20861
9f9937a74050 (Fformat): Handle a symbol of which name contains
Richard M. Stallman <rms@gnu.org>
parents: 20834
diff changeset
4738 defsubr (&Sposition_bytes);
22645
e5b201634497 (Fbyte_to_position): New function.
Richard M. Stallman <rms@gnu.org>
parents: 22199
diff changeset
4739 defsubr (&Sbyte_to_position);
16639
b6ba5d371c1c (Fline_beginning_position, Fline_end_position): New fns.
Richard M. Stallman <rms@gnu.org>
parents: 16526
diff changeset
4740
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4741 defsubr (&Sbobp);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4742 defsubr (&Seobp);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4743 defsubr (&Sbolp);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4744 defsubr (&Seolp);
512
b7a1e4e4e7e6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
4745 defsubr (&Sfollowing_char);
b7a1e4e4e7e6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
4746 defsubr (&Sprevious_char);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4747 defsubr (&Schar_after);
17031
c612a2cdd83b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16918
diff changeset
4748 defsubr (&Schar_before);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4749 defsubr (&Sinsert);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4750 defsubr (&Sinsert_before_markers);
4714
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
4751 defsubr (&Sinsert_and_inherit);
350231e38e68 (Finsert_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
4752 defsubr (&Sinsert_and_inherit_before_markers);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4753 defsubr (&Sinsert_char);
89034
63f566c131d7 (Finsert_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 89025
diff changeset
4754 defsubr (&Sinsert_byte);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4755
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4756 defsubr (&Suser_login_name);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4757 defsubr (&Suser_real_login_name);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4758 defsubr (&Suser_uid);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4759 defsubr (&Suser_real_uid);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4760 defsubr (&Suser_full_name);
5373
a70b89d2d6bb (Femacs_pid): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5242
diff changeset
4761 defsubr (&Semacs_pid);
448
129e6320092c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 372
diff changeset
4762 defsubr (&Scurrent_time);
57987
db8c9a3a77cd (Fget_internal_run_time): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 57736
diff changeset
4763 defsubr (&Sget_internal_run_time);
9154
b4739bcefc44 (Fformat_time_string): Mostly rewritten, to handle
Richard M. Stallman <rms@gnu.org>
parents: 8981
diff changeset
4764 defsubr (&Sformat_time_string);
30480
5ef94127f946 new function: float-time
Sam Steingold <sds@gnu.org>
parents: 30439
diff changeset
4765 defsubr (&Sfloat_time);
9801
7003b5184aec (init_editfns): Get the username from the environment
Richard M. Stallman <rms@gnu.org>
parents: 9657
diff changeset
4766 defsubr (&Sdecode_time);
11402
66d935214d8e (Fencode_time): Use XINT to examine `zone'.
Richard M. Stallman <rms@gnu.org>
parents: 11263
diff changeset
4767 defsubr (&Sencode_time);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4768 defsubr (&Scurrent_time_string);
962
3533821d6edc * editfns.c (Fcurrent_time_zone): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 690
diff changeset
4769 defsubr (&Scurrent_time_zone);
13019
5381e2022370 (Fset_time_zone_rule): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13013
diff changeset
4770 defsubr (&Sset_time_zone_rule);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4771 defsubr (&Ssystem_name);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4772 defsubr (&Smessage);
8975
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
4773 defsubr (&Smessage_box);
e8a4c71251cb (Fmessage_box): Renamed from Fbox_message.
Richard M. Stallman <rms@gnu.org>
parents: 8824
diff changeset
4774 defsubr (&Smessage_or_box);
18937
ddb91108a9d2 (Fcurrent_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18756
diff changeset
4775 defsubr (&Scurrent_message);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4776 defsubr (&Sformat);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4777
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4778 defsubr (&Sinsert_buffer_substring);
1853
8866e36c0ed5 (Fcompare_buffer_substrings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 1748
diff changeset
4779 defsubr (&Scompare_buffer_substrings);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4780 defsubr (&Ssubst_char_in_region);
57644
c0f2bdd90b5d (Ftranslate_region_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 57606
diff changeset
4781 defsubr (&Stranslate_region_internal);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4782 defsubr (&Sdelete_region);
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26699
diff changeset
4783 defsubr (&Sdelete_and_extract_region);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4784 defsubr (&Swiden);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4785 defsubr (&Snarrow_to_region);
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4786 defsubr (&Ssave_restriction);
7207
c83b161fe62c (Ftranspose_regions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6878
diff changeset
4787 defsubr (&Stranspose_regions);
305
75f54c84f733 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4788 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52211
diff changeset
4789
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52211
diff changeset
4790 /* arch-tag: fc3827d8-6f60-4067-b11e-c3218031b018
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52211
diff changeset
4791 (do not change this comment) */