Mercurial > emacs
annotate src/data.c @ 83342:9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
* src/termhooks.h (struct device): Rename to `struct device'.
Rename member `next_display' to `next_device'.
Rename member `delete_display_hook' to `delete_device_hook'.
(FRAME_DISPLAY): Rename to FRAME_DEVICE.
(DISPLAY_ACTIVE_P): Rename to DEVICE_ACTIVE_P.
(DISPLAY_TERMINAL_CODING): Rename to DEVICE_TERMINAL_CODING.
(DISPLAY_KEYBOARD_CODING): Rename to DEVICE_KEYBOARD_CODING.
* src/frame.h (stuct frame): Rename `display' member to `device'.
* src/xterm.h (x_display_info): Rename member `frame_display' to `device'.
* src/termchar.h (struct tty_display_info): Rename `display' member to `device'.
* src/keyboard.c (push_display_kboard): Rename to push_device_kboard.
* lisp/frame.el (make-frame): Rename frame parameter `display-id' to `device'.
* src/frame.c (Fmake_terminal_frame): Ditto.
* src/xfns.c (Fx_create_frame): Ditto.
* src/term.c (display_list): Rename to device_list.
* src/term.c (initial_display): Rename to initial_device.
* src/term.c (next_display_id): Rename to next_device_id.
* src/term.c (get_display): Rename to get_device.
* src/term.c (get_tty_display): Rename to get_tty_device.
* src/term.c (get_named_tty_display): Rename to get_named_tty.
* src/term.c (init_initial_display): Rename to init_initial_device.
* src/term.c (delete_initial_display): Rename to delete_initial_device.
* src/term.c (create_display): Rename to create_device.
* src/term.c (delete_display): Rename to delete_device.
* src/xfns.c (check_x_display_info): Document that the function allows
display ids as well.
* src/xterm.c (x_delete_frame_display): Rename to x_delete_device.
* src/xterm.c (x_create_frame_display): Rename to x_create_device.
* src/coding.c: Update.
* src/dispextern.h: Update.
* src/data.c: Update.
* src/dispnew.c: Update.
* src/frame.c: Update.
* src/frame.h: Update.
* src/keyboard.c: Update.
* src/keyboard.h: Update.
* src/lisp.h: Update.
* src/sysdep.c: Update.
* src/term.c: Update.
* src/xdisp.c: Update.
* src/xselect.c: Update.
* src/xterm.c: Update.
* src/prefix-args.c: Include stdlib.h for exit.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-382
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 11 Jul 2005 00:05:55 +0000 |
| parents | 6c13700d1c13 |
| children | 532e0a9335a9 |
| rev | line source |
|---|---|
| 298 | 1 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
2 Copyright (C) 1985,86,88,93,94,95,97,98,99, 2000, 2001, 03, 2004 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
3 Free Software Foundation, Inc. |
| 298 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
| 7 GNU Emacs is free software; you can redistribute it and/or modify | |
| 8 it under the terms of the GNU General Public License as published by | |
| 12244 | 9 the Free Software Foundation; either version 2, or (at your option) |
| 298 | 10 any later version. |
| 11 | |
| 12 GNU Emacs is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with GNU Emacs; see the file COPYING. If not, write to | |
| 64084 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 20 Boston, MA 02110-1301, USA. */ | |
| 298 | 21 |
| 22 | |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25780
diff
changeset
|
23 #include <config.h> |
| 298 | 24 #include <signal.h> |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
25 #include <stdio.h> |
| 298 | 26 #include "lisp.h" |
| 336 | 27 #include "puresize.h" |
| 17027 | 28 #include "charset.h" |
| 298 | 29 #include "buffer.h" |
| 11341 | 30 #include "keyboard.h" |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
31 #include "frame.h" |
| 552 | 32 #include "syssignal.h" |
| 348 | 33 |
|
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2647
diff
changeset
|
34 #ifdef STDC_HEADERS |
|
20122
923e1f635ace
No need to include <float.h> before "lisp.h",
Paul Eggert <eggert@twinsun.com>
parents:
20055
diff
changeset
|
35 #include <float.h> |
|
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2647
diff
changeset
|
36 #endif |
|
4860
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
37 |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
38 /* If IEEE_FLOATING_POINT isn't defined, default it from FLT_*. */ |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
39 #ifndef IEEE_FLOATING_POINT |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
40 #if (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \ |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
41 && FLT_MIN_EXP == -125 && FLT_MAX_EXP == 128) |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
42 #define IEEE_FLOATING_POINT 1 |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
43 #else |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
44 #define IEEE_FLOATING_POINT 0 |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
45 #endif |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
46 #endif |
|
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
47 |
|
4860
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
48 /* Work around a problem that happens because math.h on hpux 7 |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
49 defines two static variables--which, in Emacs, are not really static, |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
50 because `static' is defined as nothing. The problem is that they are |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
51 here, in floatfns.c, and in lread.c. |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
52 These macros prevent the name conflict. */ |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
53 #if defined (HPUX) && !defined (HPUX8) |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
54 #define _MAXLDBL data_c_maxldbl |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
55 #define _NMAXLDBL data_c_nmaxldbl |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
56 #endif |
|
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
57 |
| 298 | 58 #include <math.h> |
| 59 | |
|
4780
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
60 #if !defined (atof) |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
61 extern double atof (); |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
62 #endif /* !atof */ |
|
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
63 |
| 298 | 64 Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; |
| 65 Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; | |
| 66 Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; | |
| 648 | 67 Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
68 Lisp_Object Qcyclic_variable_indirection, Qcircular_list; |
| 298 | 69 Lisp_Object Qsetting_constant, Qinvalid_read_syntax; |
| 70 Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; | |
| 4036 | 71 Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; |
| 298 | 72 Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
73 Lisp_Object Qtext_read_only; |
| 53110 | 74 |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
75 Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; |
| 298 | 76 Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; |
| 77 Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; | |
| 26931 | 78 Lisp_Object Qbuffer_or_string_p, Qkeywordp; |
| 298 | 79 Lisp_Object Qboundp, Qfboundp; |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
80 Lisp_Object Qchar_table_p, Qvector_or_char_table_p; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
81 |
| 298 | 82 Lisp_Object Qcdr; |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
83 Lisp_Object Qad_advice_info, Qad_activate_internal; |
| 298 | 84 |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
85 Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error; |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
86 Lisp_Object Qoverflow_error, Qunderflow_error; |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
87 |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
88 Lisp_Object Qfloatp; |
| 298 | 89 Lisp_Object Qnumberp, Qnumber_or_marker_p; |
| 90 | |
| 53110 | 91 Lisp_Object Qinteger; |
| 92 static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; | |
| 17027 | 93 static Lisp_Object Qfloat, Qwindow_configuration, Qwindow; |
| 94 Lisp_Object Qprocess; | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
95 static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; |
| 26185 | 96 static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
97 static Lisp_Object Qsubrp, Qmany, Qunevalled; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
98 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
99 static Lisp_Object swap_in_symval_forwarding P_ ((Lisp_Object, Lisp_Object)); |
|
17830
3cf4a044aaad
Declare set_internal as Lisp_Object in advance to avoid
Kenichi Handa <handa@m17n.org>
parents:
17780
diff
changeset
|
100 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
101 Lisp_Object Vmost_positive_fixnum, Vmost_negative_fixnum; |
|
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
39575
diff
changeset
|
102 |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
103 |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
104 void |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
105 circular_list_error (list) |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
106 Lisp_Object list; |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
107 { |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
108 Fsignal (Qcircular_list, list); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
109 } |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
110 |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
111 |
| 298 | 112 Lisp_Object |
| 113 wrong_type_argument (predicate, value) | |
| 114 register Lisp_Object predicate, value; | |
| 115 { | |
| 116 register Lisp_Object tem; | |
| 117 do | |
| 118 { | |
|
10245
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
119 /* If VALUE is not even a valid Lisp object, abort here |
|
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
120 where we can get a backtrace showing where it came from. */ |
|
10248
8b95a9a6d466
(wrong_type_argument): Use Lisp_Type_Limit.
Richard M. Stallman <rms@gnu.org>
parents:
10245
diff
changeset
|
121 if ((unsigned int) XGCTYPE (value) >= Lisp_Type_Limit) |
|
10245
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
122 abort (); |
|
f0637b2f1671
(wrong_type_argument): Abort if VALUE is invalid Lisp object.
Richard M. Stallman <rms@gnu.org>
parents:
9966
diff
changeset
|
123 |
| 298 | 124 value = Fsignal (Qwrong_type_argument, Fcons (predicate, Fcons (value, Qnil))); |
| 125 tem = call1 (predicate, value); | |
| 126 } | |
| 490 | 127 while (NILP (tem)); |
| 298 | 128 return value; |
| 129 } | |
| 130 | |
| 21514 | 131 void |
| 298 | 132 pure_write_error () |
| 133 { | |
| 134 error ("Attempt to modify read-only object"); | |
| 135 } | |
| 136 | |
| 137 void | |
| 138 args_out_of_range (a1, a2) | |
| 139 Lisp_Object a1, a2; | |
| 140 { | |
| 141 while (1) | |
| 142 Fsignal (Qargs_out_of_range, Fcons (a1, Fcons (a2, Qnil))); | |
| 143 } | |
| 144 | |
| 145 void | |
| 146 args_out_of_range_3 (a1, a2, a3) | |
| 147 Lisp_Object a1, a2, a3; | |
| 148 { | |
| 149 while (1) | |
| 150 Fsignal (Qargs_out_of_range, Fcons (a1, Fcons (a2, Fcons (a3, Qnil)))); | |
| 151 } | |
| 152 | |
| 153 /* On some machines, XINT needs a temporary location. | |
| 154 Here it is, in case it is needed. */ | |
| 155 | |
| 156 int sign_extend_temp; | |
| 157 | |
| 158 /* On a few machines, XINT can only be done by calling this. */ | |
| 159 | |
| 160 int | |
| 161 sign_extend_lisp_int (num) | |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
162 EMACS_INT num; |
| 298 | 163 { |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
164 if (num & (((EMACS_INT) 1) << (VALBITS - 1))) |
|
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
165 return num | (((EMACS_INT) (-1)) << VALBITS); |
| 298 | 166 else |
|
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
167 return num & ((((EMACS_INT) 1) << VALBITS) - 1); |
| 298 | 168 } |
| 169 | |
| 170 /* Data type predicates */ | |
| 171 | |
| 172 DEFUN ("eq", Feq, Seq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
173 doc: /* Return t if the two args are the same Lisp object. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
174 (obj1, obj2) |
| 298 | 175 Lisp_Object obj1, obj2; |
| 176 { | |
| 177 if (EQ (obj1, obj2)) | |
| 178 return Qt; | |
| 179 return Qnil; | |
| 180 } | |
| 181 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
182 DEFUN ("null", Fnull, Snull, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
183 doc: /* Return t if OBJECT is nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
184 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
185 Lisp_Object object; |
| 298 | 186 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
187 if (NILP (object)) |
| 298 | 188 return Qt; |
| 189 return Qnil; | |
| 190 } | |
| 191 | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
192 DEFUN ("type-of", Ftype_of, Stype_of, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
193 doc: /* Return a symbol representing the type of OBJECT. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
194 The symbol returned names the object's basic type; |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
195 for example, (type-of 1) returns `integer'. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
196 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
197 Lisp_Object object; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
198 { |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
199 switch (XGCTYPE (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
200 { |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
201 case Lisp_Int: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
202 return Qinteger; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
203 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
204 case Lisp_Symbol: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
205 return Qsymbol; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
206 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
207 case Lisp_String: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
208 return Qstring; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
209 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
210 case Lisp_Cons: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
211 return Qcons; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
212 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
213 case Lisp_Misc: |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
214 switch (XMISCTYPE (object)) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
215 { |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
216 case Lisp_Misc_Marker: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
217 return Qmarker; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
218 case Lisp_Misc_Overlay: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
219 return Qoverlay; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
220 case Lisp_Misc_Float: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
221 return Qfloat; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
222 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
223 abort (); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
224 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
225 case Lisp_Vectorlike: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
226 if (GC_WINDOW_CONFIGURATIONP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
227 return Qwindow_configuration; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
228 if (GC_PROCESSP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
229 return Qprocess; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
230 if (GC_WINDOWP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
231 return Qwindow; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
232 if (GC_SUBRP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
233 return Qsubr; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
234 if (GC_COMPILEDP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
235 return Qcompiled_function; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
236 if (GC_BUFFERP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
237 return Qbuffer; |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
238 if (GC_CHAR_TABLE_P (object)) |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
239 return Qchar_table; |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
240 if (GC_BOOL_VECTOR_P (object)) |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
241 return Qbool_vector; |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
242 if (GC_FRAMEP (object)) |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
243 return Qframe; |
| 26185 | 244 if (GC_HASH_TABLE_P (object)) |
| 245 return Qhash_table; | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
246 return Qvector; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
247 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
248 case Lisp_Float: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
249 return Qfloat; |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
250 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
251 default: |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
252 abort (); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
253 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
254 } |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
255 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
256 DEFUN ("consp", Fconsp, Sconsp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
257 doc: /* Return t if OBJECT is a cons cell. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
258 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
259 Lisp_Object object; |
| 298 | 260 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
261 if (CONSP (object)) |
| 298 | 262 return Qt; |
| 263 return Qnil; | |
| 264 } | |
| 265 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
266 DEFUN ("atom", Fatom, Satom, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
267 doc: /* Return t if OBJECT is not a cons cell. This includes nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
268 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
269 Lisp_Object object; |
| 298 | 270 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
271 if (CONSP (object)) |
| 298 | 272 return Qnil; |
| 273 return Qt; | |
| 274 } | |
| 275 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
276 DEFUN ("listp", Flistp, Slistp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
277 doc: /* Return t if OBJECT is a list. This includes nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
278 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
279 Lisp_Object object; |
| 298 | 280 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
281 if (CONSP (object) || NILP (object)) |
| 298 | 282 return Qt; |
| 283 return Qnil; | |
| 284 } | |
| 285 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
286 DEFUN ("nlistp", Fnlistp, Snlistp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
287 doc: /* Return t if OBJECT is not a list. Lists include nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
288 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
289 Lisp_Object object; |
| 298 | 290 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
291 if (CONSP (object) || NILP (object)) |
| 298 | 292 return Qnil; |
| 293 return Qt; | |
| 294 } | |
| 295 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
296 DEFUN ("symbolp", Fsymbolp, Ssymbolp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
297 doc: /* Return t if OBJECT is a symbol. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
298 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
299 Lisp_Object object; |
| 298 | 300 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
301 if (SYMBOLP (object)) |
| 298 | 302 return Qt; |
| 303 return Qnil; | |
| 304 } | |
| 305 | |
| 26931 | 306 /* Define this in C to avoid unnecessarily consing up the symbol |
| 307 name. */ | |
| 308 DEFUN ("keywordp", Fkeywordp, Skeywordp, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
309 doc: /* Return t if OBJECT is a keyword. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
310 This means that it is a symbol with a print name beginning with `:' |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
311 interned in the initial obarray. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
312 (object) |
| 26931 | 313 Lisp_Object object; |
| 314 { | |
| 315 if (SYMBOLP (object) | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
316 && SREF (SYMBOL_NAME (object), 0) == ':' |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
317 && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object)) |
| 26931 | 318 return Qt; |
| 319 return Qnil; | |
| 320 } | |
| 321 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
322 DEFUN ("vectorp", Fvectorp, Svectorp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
323 doc: /* Return t if OBJECT is a vector. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
324 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
325 Lisp_Object object; |
| 298 | 326 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
327 if (VECTORP (object)) |
| 298 | 328 return Qt; |
| 329 return Qnil; | |
| 330 } | |
| 331 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
332 DEFUN ("stringp", Fstringp, Sstringp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
333 doc: /* Return t if OBJECT is a string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
334 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
335 Lisp_Object object; |
| 298 | 336 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
337 if (STRINGP (object)) |
| 298 | 338 return Qt; |
| 339 return Qnil; | |
| 340 } | |
| 341 | |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
342 DEFUN ("multibyte-string-p", Fmultibyte_string_p, Smultibyte_string_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
343 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
344 doc: /* Return t if OBJECT is a multibyte string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
345 (object) |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
346 Lisp_Object object; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
347 { |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
348 if (STRINGP (object) && STRING_MULTIBYTE (object)) |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
349 return Qt; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
350 return Qnil; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
351 } |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
352 |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
353 DEFUN ("char-table-p", Fchar_table_p, Schar_table_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
354 doc: /* Return t if OBJECT is a char-table. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
355 (object) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
356 Lisp_Object object; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
357 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
358 if (CHAR_TABLE_P (object)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
359 return Qt; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
360 return Qnil; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
361 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
362 |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
363 DEFUN ("vector-or-char-table-p", Fvector_or_char_table_p, |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
364 Svector_or_char_table_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
365 doc: /* Return t if OBJECT is a char-table or vector. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
366 (object) |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
367 Lisp_Object object; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
368 { |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
369 if (VECTORP (object) || CHAR_TABLE_P (object)) |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
370 return Qt; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
371 return Qnil; |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
372 } |
|
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
373 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
374 DEFUN ("bool-vector-p", Fbool_vector_p, Sbool_vector_p, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
375 doc: /* Return t if OBJECT is a bool-vector. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
376 (object) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
377 Lisp_Object object; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
378 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
379 if (BOOL_VECTOR_P (object)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
380 return Qt; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
381 return Qnil; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
382 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
383 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
384 DEFUN ("arrayp", Farrayp, Sarrayp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
385 doc: /* Return t if OBJECT is an array (string or vector). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
386 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
387 Lisp_Object object; |
| 298 | 388 { |
|
18045
a2029aaffb4f
(Farrayp): Accept bool-vectors and char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
18011
diff
changeset
|
389 if (VECTORP (object) || STRINGP (object) |
|
a2029aaffb4f
(Farrayp): Accept bool-vectors and char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
18011
diff
changeset
|
390 || CHAR_TABLE_P (object) || BOOL_VECTOR_P (object)) |
| 298 | 391 return Qt; |
| 392 return Qnil; | |
| 393 } | |
| 394 | |
| 395 DEFUN ("sequencep", Fsequencep, Ssequencep, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
396 doc: /* Return t if OBJECT is a sequence (list or array). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
397 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
398 register Lisp_Object object; |
| 298 | 399 { |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
400 if (CONSP (object) || NILP (object) || VECTORP (object) || STRINGP (object) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
401 || CHAR_TABLE_P (object) || BOOL_VECTOR_P (object)) |
| 298 | 402 return Qt; |
| 403 return Qnil; | |
| 404 } | |
| 405 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
406 DEFUN ("bufferp", Fbufferp, Sbufferp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
407 doc: /* Return t if OBJECT is an editor buffer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
408 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
409 Lisp_Object object; |
| 298 | 410 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
411 if (BUFFERP (object)) |
| 298 | 412 return Qt; |
| 413 return Qnil; | |
| 414 } | |
| 415 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
416 DEFUN ("markerp", Fmarkerp, Smarkerp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
417 doc: /* Return t if OBJECT is a marker (editor pointer). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
418 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
419 Lisp_Object object; |
| 298 | 420 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
421 if (MARKERP (object)) |
| 298 | 422 return Qt; |
| 423 return Qnil; | |
| 424 } | |
| 425 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
426 DEFUN ("subrp", Fsubrp, Ssubrp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
427 doc: /* Return t if OBJECT is a built-in function. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
428 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
429 Lisp_Object object; |
| 298 | 430 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
431 if (SUBRP (object)) |
| 298 | 432 return Qt; |
| 433 return Qnil; | |
| 434 } | |
| 435 | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
436 DEFUN ("byte-code-function-p", Fbyte_code_function_p, Sbyte_code_function_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
437 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
438 doc: /* Return t if OBJECT is a byte-compiled function object. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
439 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
440 Lisp_Object object; |
| 298 | 441 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
442 if (COMPILEDP (object)) |
| 298 | 443 return Qt; |
| 444 return Qnil; | |
| 445 } | |
| 446 | |
|
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
447 DEFUN ("char-or-string-p", Fchar_or_string_p, Schar_or_string_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
448 doc: /* Return t if OBJECT is a character (an integer) or a string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
449 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
450 register Lisp_Object object; |
| 298 | 451 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
452 if (INTEGERP (object) || STRINGP (object)) |
| 298 | 453 return Qt; |
| 454 return Qnil; | |
| 455 } | |
| 456 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
457 DEFUN ("integerp", Fintegerp, Sintegerp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
458 doc: /* Return t if OBJECT is an integer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
459 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
460 Lisp_Object object; |
| 298 | 461 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
462 if (INTEGERP (object)) |
| 298 | 463 return Qt; |
| 464 return Qnil; | |
| 465 } | |
| 466 | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
467 DEFUN ("integer-or-marker-p", Finteger_or_marker_p, Sinteger_or_marker_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
468 doc: /* Return t if OBJECT is an integer or a marker (editor pointer). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
469 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
470 register Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
471 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
472 if (MARKERP (object) || INTEGERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
473 return Qt; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
474 return Qnil; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
475 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
476 |
|
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
477 DEFUN ("natnump", Fnatnump, Snatnump, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
478 doc: /* Return t if OBJECT is a nonnegative integer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
479 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
480 Lisp_Object object; |
| 298 | 481 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
482 if (NATNUMP (object)) |
| 298 | 483 return Qt; |
| 484 return Qnil; | |
| 485 } | |
| 486 | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
487 DEFUN ("numberp", Fnumberp, Snumberp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
488 doc: /* Return t if OBJECT is a number (floating point or integer). */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
489 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
490 Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
491 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
492 if (NUMBERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
493 return Qt; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
494 else |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
495 return Qnil; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
496 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
497 |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
498 DEFUN ("number-or-marker-p", Fnumber_or_marker_p, |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
499 Snumber_or_marker_p, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
500 doc: /* Return t if OBJECT is a number or a marker. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
501 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
502 Lisp_Object object; |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
503 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
504 if (NUMBERP (object) || MARKERP (object)) |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
505 return Qt; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
506 return Qnil; |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
507 } |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
508 |
| 298 | 509 DEFUN ("floatp", Ffloatp, Sfloatp, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
510 doc: /* Return t if OBJECT is a floating point number. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
511 (object) |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
512 Lisp_Object object; |
| 298 | 513 { |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
514 if (FLOATP (object)) |
| 298 | 515 return Qt; |
| 516 return Qnil; | |
| 517 } | |
|
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
518 |
| 298 | 519 |
| 520 /* Extract and set components of lists */ | |
| 521 | |
| 522 DEFUN ("car", Fcar, Scar, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
523 doc: /* Return the car of LIST. If arg is nil, return nil. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
524 Error if arg is not nil and not a cons cell. See also `car-safe'. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
525 (list) |
| 298 | 526 register Lisp_Object list; |
| 527 { | |
| 528 while (1) | |
| 529 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
530 if (CONSP (list)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
531 return XCAR (list); |
| 298 | 532 else if (EQ (list, Qnil)) |
| 533 return Qnil; | |
| 534 else | |
| 535 list = wrong_type_argument (Qlistp, list); | |
| 536 } | |
| 537 } | |
| 538 | |
| 539 DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
540 doc: /* Return the car of OBJECT if it is a cons cell, or else nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
541 (object) |
| 298 | 542 Lisp_Object object; |
| 543 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
544 if (CONSP (object)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
545 return XCAR (object); |
| 298 | 546 else |
| 547 return Qnil; | |
| 548 } | |
| 549 | |
| 550 DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
551 doc: /* Return the cdr of LIST. If arg is nil, return nil. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
552 Error if arg is not nil and not a cons cell. See also `cdr-safe'. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
553 (list) |
| 298 | 554 register Lisp_Object list; |
| 555 { | |
| 556 while (1) | |
| 557 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
558 if (CONSP (list)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
559 return XCDR (list); |
| 298 | 560 else if (EQ (list, Qnil)) |
| 561 return Qnil; | |
| 562 else | |
| 563 list = wrong_type_argument (Qlistp, list); | |
| 564 } | |
| 565 } | |
| 566 | |
| 567 DEFUN ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
568 doc: /* Return the cdr of OBJECT if it is a cons cell, or else nil. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
569 (object) |
| 298 | 570 Lisp_Object object; |
| 571 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
572 if (CONSP (object)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
573 return XCDR (object); |
| 298 | 574 else |
| 575 return Qnil; | |
| 576 } | |
| 577 | |
| 578 DEFUN ("setcar", Fsetcar, Ssetcar, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
579 doc: /* Set the car of CELL to be NEWCAR. Returns NEWCAR. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
580 (cell, newcar) |
| 298 | 581 register Lisp_Object cell, newcar; |
| 582 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
583 if (!CONSP (cell)) |
| 298 | 584 cell = wrong_type_argument (Qconsp, cell); |
| 585 | |
| 586 CHECK_IMPURE (cell); | |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
587 XSETCAR (cell, newcar); |
| 298 | 588 return newcar; |
| 589 } | |
| 590 | |
| 591 DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
592 doc: /* Set the cdr of CELL to be NEWCDR. Returns NEWCDR. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
593 (cell, newcdr) |
| 298 | 594 register Lisp_Object cell, newcdr; |
| 595 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
596 if (!CONSP (cell)) |
| 298 | 597 cell = wrong_type_argument (Qconsp, cell); |
| 598 | |
| 599 CHECK_IMPURE (cell); | |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
600 XSETCDR (cell, newcdr); |
| 298 | 601 return newcdr; |
| 602 } | |
| 603 | |
| 604 /* Extract and set components of symbols */ | |
| 605 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
606 DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
607 doc: /* Return t if SYMBOL's value is not void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
608 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
609 register Lisp_Object symbol; |
| 298 | 610 { |
| 611 Lisp_Object valcontents; | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
612 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
613 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
614 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 615 |
| 9889 | 616 if (BUFFER_LOCAL_VALUEP (valcontents) |
| 617 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
618 valcontents = swap_in_symval_forwarding (symbol, valcontents); |
| 298 | 619 |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
620 return (EQ (valcontents, Qunbound) ? Qnil : Qt); |
| 298 | 621 } |
| 622 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
623 DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
624 doc: /* Return t if SYMBOL's function definition is not void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
625 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
626 register Lisp_Object symbol; |
| 298 | 627 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
628 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
629 return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt); |
| 298 | 630 } |
| 631 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
632 DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
633 doc: /* Make SYMBOL's value be void. |
|
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
634 Return SYMBOL. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
635 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
636 register Lisp_Object symbol; |
| 298 | 637 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
638 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
639 if (XSYMBOL (symbol)->constant) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
640 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
641 Fset (symbol, Qunbound); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
642 return symbol; |
| 298 | 643 } |
| 644 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
645 DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
646 doc: /* Make SYMBOL's function definition be void. |
|
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
647 Return SYMBOL. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
648 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
649 register Lisp_Object symbol; |
| 298 | 650 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
651 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
652 if (NILP (symbol) || EQ (symbol, Qt)) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
653 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
654 XSYMBOL (symbol)->function = Qunbound; |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
655 return symbol; |
| 298 | 656 } |
| 657 | |
| 658 DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
659 doc: /* Return SYMBOL's function definition. Error if that is void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
660 (symbol) |
| 648 | 661 register Lisp_Object symbol; |
| 298 | 662 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
663 CHECK_SYMBOL (symbol); |
| 648 | 664 if (EQ (XSYMBOL (symbol)->function, Qunbound)) |
| 665 return Fsignal (Qvoid_function, Fcons (symbol, Qnil)); | |
| 666 return XSYMBOL (symbol)->function; | |
| 298 | 667 } |
| 668 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
669 DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
670 doc: /* Return SYMBOL's property list. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
671 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
672 register Lisp_Object symbol; |
| 298 | 673 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
674 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
675 return XSYMBOL (symbol)->plist; |
| 298 | 676 } |
| 677 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
678 DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
679 doc: /* Return SYMBOL's name, a string. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
680 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
681 register Lisp_Object symbol; |
| 298 | 682 { |
| 683 register Lisp_Object name; | |
| 684 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
685 CHECK_SYMBOL (symbol); |
|
45397
bc5d63652a0a
* data.c (Fkeywordp, Fsymbol_name, store_symval_forwarding)
Ken Raeburn <raeburn@raeburn.org>
parents:
42274
diff
changeset
|
686 name = SYMBOL_NAME (symbol); |
| 298 | 687 return name; |
| 688 } | |
| 689 | |
| 690 DEFUN ("fset", Ffset, Sfset, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
691 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
692 (symbol, definition) |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
693 register Lisp_Object symbol, definition; |
| 298 | 694 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
695 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
696 if (NILP (symbol) || EQ (symbol, Qt)) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
697 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
698 if (!NILP (Vautoload_queue) && !EQ (XSYMBOL (symbol)->function, Qunbound)) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
699 Vautoload_queue = Fcons (Fcons (symbol, XSYMBOL (symbol)->function), |
| 298 | 700 Vautoload_queue); |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
701 XSYMBOL (symbol)->function = definition; |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
702 /* Handle automatic advice activation */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
703 if (CONSP (XSYMBOL (symbol)->plist) && !NILP (Fget (symbol, Qad_advice_info))) |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
704 { |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
705 call2 (Qad_activate_internal, symbol, Qnil); |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
706 definition = XSYMBOL (symbol)->function; |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
707 } |
|
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
708 return definition; |
| 298 | 709 } |
| 710 | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
711 extern Lisp_Object Qfunction_documentation; |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
712 |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
713 DEFUN ("defalias", Fdefalias, Sdefalias, 2, 3, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
714 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. |
| 46521 | 715 Associates the function with the current load file, if any. |
| 716 The optional third argument DOCSTRING specifies the documentation string | |
| 717 for SYMBOL; if it is omitted or nil, SYMBOL uses the documentation string | |
| 718 determined by DEFINITION. */) | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
719 (symbol, definition, docstring) |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
720 register Lisp_Object symbol, definition, docstring; |
|
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
721 { |
|
48723
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
722 if (CONSP (XSYMBOL (symbol)->function) |
|
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
723 && EQ (XCAR (XSYMBOL (symbol)->function), Qautoload)) |
|
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
724 LOADHIST_ATTACH (Fcons (Qt, symbol)); |
|
25132
07b44154638f
(Fdefalias): Call Ffset instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
23602
diff
changeset
|
725 definition = Ffset (symbol, definition); |
|
59110
5feed0f86f52
(Fdefalias): Use (defun . FN_NAME) in LOADHIST_ATTACH.
Richard M. Stallman <rms@gnu.org>
parents:
58986
diff
changeset
|
726 LOADHIST_ATTACH (Fcons (Qdefun, symbol)); |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
727 if (!NILP (docstring)) |
|
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
728 Fput (symbol, Qfunction_documentation, docstring); |
|
16756
71113ba79b1b
(Fdefalias): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16754
diff
changeset
|
729 return definition; |
|
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
730 } |
|
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
731 |
| 298 | 732 DEFUN ("setplist", Fsetplist, Ssetplist, 2, 2, 0, |
| 52938 | 733 doc: /* Set SYMBOL's property list to NEWPLIST, and return NEWPLIST. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
734 (symbol, newplist) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
735 register Lisp_Object symbol, newplist; |
| 298 | 736 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
737 CHECK_SYMBOL (symbol); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
738 XSYMBOL (symbol)->plist = newplist; |
| 298 | 739 return newplist; |
| 740 } | |
| 648 | 741 |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
742 DEFUN ("subr-arity", Fsubr_arity, Ssubr_arity, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
743 doc: /* Return minimum and maximum number of args allowed for SUBR. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
744 SUBR must be a built-in function. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
745 The returned value is a pair (MIN . MAX). MIN is the minimum number |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
746 of args. MAX is the maximum number or the symbol `many', for a |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
747 function with `&rest' args, or `unevalled' for a special form. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
748 (subr) |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
749 Lisp_Object subr; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
750 { |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
751 short minargs, maxargs; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
752 if (!SUBRP (subr)) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
753 wrong_type_argument (Qsubrp, subr); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
754 minargs = XSUBR (subr)->min_args; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
755 maxargs = XSUBR (subr)->max_args; |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
756 if (maxargs == MANY) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
757 return Fcons (make_number (minargs), Qmany); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
758 else if (maxargs == UNEVALLED) |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
759 return Fcons (make_number (minargs), Qunevalled); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
760 else |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
761 return Fcons (make_number (minargs), make_number (maxargs)); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
762 } |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
763 |
|
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
764 DEFUN ("subr-name", Fsubr_name, Ssubr_name, 1, 1, 0, |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
765 doc: /* Return name of subroutine SUBR. |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
766 SUBR must be a built-in function. */) |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
767 (subr) |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
768 Lisp_Object subr; |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
769 { |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
770 const char *name; |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
771 if (!SUBRP (subr)) |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
772 wrong_type_argument (Qsubrp, subr); |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
773 name = XSUBR (subr)->symbol_name; |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
774 return make_string (name, strlen (name)); |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
775 } |
|
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
776 |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
777 DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
778 doc: /* Return the interactive form of CMD or nil if none. |
|
56590
f48e32fbfc6c
(Finteractive_form): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56193
diff
changeset
|
779 If CMD is not a command, the return value is nil. |
|
f48e32fbfc6c
(Finteractive_form): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56193
diff
changeset
|
780 Value, if non-nil, is a list \(interactive SPEC). */) |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
781 (cmd) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
782 Lisp_Object cmd; |
|
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
783 { |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
784 Lisp_Object fun = indirect_function (cmd); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
785 |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
786 if (SUBRP (fun)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
787 { |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
788 if (XSUBR (fun)->prompt) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
789 return list2 (Qinteractive, build_string (XSUBR (fun)->prompt)); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
790 } |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
791 else if (COMPILEDP (fun)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
792 { |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
793 if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) > COMPILED_INTERACTIVE) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
794 return list2 (Qinteractive, AREF (fun, COMPILED_INTERACTIVE)); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
795 } |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
796 else if (CONSP (fun)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
797 { |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
798 Lisp_Object funcar = XCAR (fun); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
799 if (EQ (funcar, Qlambda)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
800 return Fassq (Qinteractive, Fcdr (XCDR (fun))); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
801 else if (EQ (funcar, Qautoload)) |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
802 { |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
803 struct gcpro gcpro1; |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
804 GCPRO1 (cmd); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
805 do_autoload (fun, cmd); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
806 UNGCPRO; |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
807 return Finteractive_form (cmd); |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
808 } |
|
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
809 } |
|
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
810 return Qnil; |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
811 } |
|
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
812 |
| 298 | 813 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
814 /*********************************************************************** |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
815 Getting and Setting Values of Symbols |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
816 ***********************************************************************/ |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
817 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
818 /* Return the symbol holding SYMBOL's value. Signal |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
819 `cyclic-variable-indirection' if SYMBOL's chain of variable |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
820 indirections contains a loop. */ |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
821 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
822 Lisp_Object |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
823 indirect_variable (symbol) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
824 Lisp_Object symbol; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
825 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
826 Lisp_Object tortoise, hare; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
827 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
828 hare = tortoise = symbol; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
829 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
830 while (XSYMBOL (hare)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
831 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
832 hare = XSYMBOL (hare)->value; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
833 if (!XSYMBOL (hare)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
834 break; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
835 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
836 hare = XSYMBOL (hare)->value; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
837 tortoise = XSYMBOL (tortoise)->value; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
838 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
839 if (EQ (hare, tortoise)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
840 Fsignal (Qcyclic_variable_indirection, Fcons (symbol, Qnil)); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
841 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
842 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
843 return hare; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
844 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
845 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
846 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
847 DEFUN ("indirect-variable", Findirect_variable, Sindirect_variable, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
848 doc: /* Return the variable at the end of OBJECT's variable chain. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
849 If OBJECT is a symbol, follow all variable indirections and return the final |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
850 variable. If OBJECT is not a symbol, just return it. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
851 Signal a cyclic-variable-indirection error if there is a loop in the |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
852 variable chain of symbols. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
853 (object) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
854 Lisp_Object object; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
855 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
856 if (SYMBOLP (object)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
857 object = indirect_variable (object); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
858 return object; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
859 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
860 |
| 298 | 861 |
| 862 /* Given the raw contents of a symbol value cell, | |
| 863 return the Lisp value of the symbol. | |
| 864 This does not handle buffer-local variables; use | |
| 865 swap_in_symval_forwarding for that. */ | |
| 866 | |
| 867 Lisp_Object | |
| 868 do_symval_forwarding (valcontents) | |
| 869 register Lisp_Object valcontents; | |
| 870 { | |
| 871 register Lisp_Object val; | |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
872 int offset; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
873 if (MISCP (valcontents)) |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
874 switch (XMISCTYPE (valcontents)) |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
875 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
876 case Lisp_Misc_Intfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
877 XSETINT (val, *XINTFWD (valcontents)->intvar); |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
878 return val; |
| 298 | 879 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
880 case Lisp_Misc_Boolfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
881 return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil); |
| 298 | 882 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
883 case Lisp_Misc_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
884 return *XOBJFWD (valcontents)->objvar; |
| 298 | 885 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
886 case Lisp_Misc_Buffer_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
887 offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 888 return PER_BUFFER_VALUE (current_buffer, offset); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
889 |
|
11019
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
890 case Lisp_Misc_Kboard_Objfwd: |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
891 offset = XKBOARD_OBJFWD (valcontents)->offset; |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
892 return *(Lisp_Object *)(offset + (char *)current_kboard); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
893 } |
| 298 | 894 return valcontents; |
| 895 } | |
| 896 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
897 /* Store NEWVAL into SYMBOL, where VALCONTENTS is found in the value cell |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
898 of SYMBOL. If SYMBOL is buffer-local, VALCONTENTS should be the |
| 298 | 899 buffer-independent contents of the value cell: forwarded just one |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
900 step past the buffer-localness. |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
901 |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
902 BUF non-zero means set the value in buffer BUF instead of the |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
903 current buffer. This only plays a role for per-buffer variables. */ |
| 298 | 904 |
| 905 void | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
906 store_symval_forwarding (symbol, valcontents, newval, buf) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
907 Lisp_Object symbol; |
| 298 | 908 register Lisp_Object valcontents, newval; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
909 struct buffer *buf; |
| 298 | 910 { |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
911 switch (SWITCH_ENUM_CAST (XTYPE (valcontents))) |
| 298 | 912 { |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
913 case Lisp_Misc: |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
914 switch (XMISCTYPE (valcontents)) |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
915 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
916 case Lisp_Misc_Intfwd: |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
917 CHECK_NUMBER (newval); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
918 *XINTFWD (valcontents)->intvar = XINT (newval); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
919 if (*XINTFWD (valcontents)->intvar != XINT (newval)) |
|
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
920 error ("Value out of range for variable `%s'", |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
921 SDATA (SYMBOL_NAME (symbol))); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
922 break; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
923 |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
924 case Lisp_Misc_Boolfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
925 *XBOOLFWD (valcontents)->boolvar = NILP (newval) ? 0 : 1; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
926 break; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
927 |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
928 case Lisp_Misc_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
929 *XOBJFWD (valcontents)->objvar = newval; |
|
53365
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
930 |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
931 /* If this variable is a default for something stored |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
932 in the buffer itself, such as default-fill-column, |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
933 find the buffers that don't have local values for it |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
934 and update them. */ |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
935 if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
936 && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1)) |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
937 { |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
938 int offset = ((char *) XOBJFWD (valcontents)->objvar |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
939 - (char *) &buffer_defaults); |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
940 int idx = PER_BUFFER_IDX (offset); |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
941 |
|
58086
4de4892b2b6c
(store_symval_forwarding): Remove unused variables.
Kim F. Storm <storm@cua.dk>
parents:
57726
diff
changeset
|
942 Lisp_Object tail; |
|
53365
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
943 |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
944 if (idx <= 0) |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
945 break; |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
946 |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
947 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
948 { |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
949 Lisp_Object buf; |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
950 struct buffer *b; |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
951 |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
952 buf = Fcdr (XCAR (tail)); |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
953 if (!BUFFERP (buf)) continue; |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
954 b = XBUFFER (buf); |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
955 |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
956 if (! PER_BUFFER_VALUE_P (b, idx)) |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
957 PER_BUFFER_VALUE (b, offset) = newval; |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
958 } |
|
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
959 } |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
960 break; |
| 298 | 961 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
962 case Lisp_Misc_Buffer_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
963 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
964 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
965 Lisp_Object type; |
| 298 | 966 |
|
50314
247bd25de9e9
(store_symval_forwarding): Re-instate part of the code
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50305
diff
changeset
|
967 type = PER_BUFFER_TYPE (offset); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
968 if (! NILP (type) && ! NILP (newval) |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
969 && XTYPE (newval) != XINT (type)) |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
970 buffer_slot_type_mismatch (offset); |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
971 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
972 if (buf == NULL) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
973 buf = current_buffer; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
974 PER_BUFFER_VALUE (buf, offset) = newval; |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
975 } |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
976 break; |
|
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
977 |
|
11019
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
978 case Lisp_Misc_Kboard_Objfwd: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
979 { |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
980 char *base = (char *) current_kboard; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
981 char *p = base + XKBOARD_OBJFWD (valcontents)->offset; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
982 *(Lisp_Object *) p = newval; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
983 } |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
984 break; |
|
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
985 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
986 default: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
987 goto def; |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
988 } |
| 298 | 989 break; |
| 990 | |
| 991 default: | |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
992 def: |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
993 valcontents = SYMBOL_VALUE (symbol); |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
994 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
995 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
996 XBUFFER_LOCAL_VALUE (valcontents)->realvalue = newval; |
| 298 | 997 else |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
998 SET_SYMBOL_VALUE (symbol, newval); |
| 298 | 999 } |
| 1000 } | |
| 1001 | |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1002 /* Set up SYMBOL to refer to its global binding. |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1003 This makes it safe to alter the status of other bindings. */ |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1004 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1005 void |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1006 swap_in_global_binding (symbol) |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1007 Lisp_Object symbol; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1008 { |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1009 Lisp_Object valcontents, cdr; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1010 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1011 valcontents = SYMBOL_VALUE (symbol); |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1012 if (!BUFFER_LOCAL_VALUEP (valcontents) |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1013 && !SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1014 abort (); |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1015 cdr = XBUFFER_LOCAL_VALUE (valcontents)->cdr; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1016 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1017 /* Unload the previously loaded binding. */ |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1018 Fsetcdr (XCAR (cdr), |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1019 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue)); |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1020 |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1021 /* Select the global binding in the symbol. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1022 XSETCAR (cdr, cdr); |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1023 store_symval_forwarding (symbol, valcontents, XCDR (cdr), NULL); |
|
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1024 |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1025 /* Indicate that the global binding is set up now. */ |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1026 XBUFFER_LOCAL_VALUE (valcontents)->frame = Qnil; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1027 XBUFFER_LOCAL_VALUE (valcontents)->buffer = Qnil; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1028 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1029 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1030 } |
|
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
1031 |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1032 /* Set up the buffer-local symbol SYMBOL for validity in the current buffer. |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1033 VALCONTENTS is the contents of its value cell, |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1034 which points to a struct Lisp_Buffer_Local_Value. |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1035 |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1036 Return the value forwarded one step past the buffer-local stage. |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1037 This could be another forwarding pointer. */ |
| 298 | 1038 |
| 1039 static Lisp_Object | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1040 swap_in_symval_forwarding (symbol, valcontents) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1041 Lisp_Object symbol, valcontents; |
| 298 | 1042 { |
| 1043 register Lisp_Object tem1; | |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1044 |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1045 tem1 = XBUFFER_LOCAL_VALUE (valcontents)->buffer; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1046 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1047 if (NILP (tem1) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1048 || current_buffer != XBUFFER (tem1) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1049 || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1050 && ! EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame))) |
| 298 | 1051 { |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1052 if (XSYMBOL (symbol)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1053 symbol = indirect_variable (symbol); |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1054 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1055 /* Unload the previously loaded binding. */ |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1056 tem1 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1057 Fsetcdr (tem1, |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1058 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue)); |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1059 /* Choose the new binding. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1060 tem1 = assq_no_quit (symbol, current_buffer->local_var_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1061 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1062 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
| 490 | 1063 if (NILP (tem1)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1064 { |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1065 if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame) |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1066 tem1 = assq_no_quit (symbol, XFRAME (selected_frame)->param_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1067 if (! NILP (tem1)) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1068 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1069 else |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1070 tem1 = XBUFFER_LOCAL_VALUE (valcontents)->cdr; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1071 } |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1072 else |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1073 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1074 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1075 /* Load the new binding. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1076 XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, tem1); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1077 XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, current_buffer); |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1078 XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1079 store_symval_forwarding (symbol, |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1080 XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1081 Fcdr (tem1), NULL); |
| 298 | 1082 } |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1083 return XBUFFER_LOCAL_VALUE (valcontents)->realvalue; |
| 298 | 1084 } |
| 1085 | |
| 514 | 1086 /* Find the value of a symbol, returning Qunbound if it's not bound. |
| 1087 This is helpful for code which just wants to get a variable's value | |
| 14036 | 1088 if it has one, without signaling an error. |
| 514 | 1089 Note that it must not be possible to quit |
| 1090 within this function. Great care is required for this. */ | |
| 298 | 1091 |
| 514 | 1092 Lisp_Object |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1093 find_symbol_value (symbol) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1094 Lisp_Object symbol; |
| 298 | 1095 { |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
1096 register Lisp_Object valcontents; |
| 298 | 1097 register Lisp_Object val; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1098 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1099 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1100 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 1101 |
| 9889 | 1102 if (BUFFER_LOCAL_VALUEP (valcontents) |
| 1103 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) | |
|
34964
f8c7b5b9fd2f
(find_symbol_value): Remove extra 3rd argument in the
Eli Zaretskii <eliz@gnu.org>
parents:
31829
diff
changeset
|
1104 valcontents = swap_in_symval_forwarding (symbol, valcontents); |
|
9878
8a68b5794c91
(Fboundp, find_symbol_value): Use type test macros instead of checking XTYPE
Karl Heuer <kwzh@gnu.org>
parents:
9465
diff
changeset
|
1105 |
|
8a68b5794c91
(Fboundp, find_symbol_value): Use type test macros instead of checking XTYPE
Karl Heuer <kwzh@gnu.org>
parents:
9465
diff
changeset
|
1106 if (MISCP (valcontents)) |
| 298 | 1107 { |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
1108 switch (XMISCTYPE (valcontents)) |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1109 { |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1110 case Lisp_Misc_Intfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1111 XSETINT (val, *XINTFWD (valcontents)->intvar); |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1112 return val; |
| 298 | 1113 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1114 case Lisp_Misc_Boolfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1115 return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil); |
| 298 | 1116 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1117 case Lisp_Misc_Objfwd: |
|
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1118 return *XOBJFWD (valcontents)->objvar; |
| 298 | 1119 |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1120 case Lisp_Misc_Buffer_Objfwd: |
| 28351 | 1121 return PER_BUFFER_VALUE (current_buffer, |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1122 XBUFFER_OBJFWD (valcontents)->offset); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
1123 |
|
11019
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
1124 case Lisp_Misc_Kboard_Objfwd: |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
1125 return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset |
|
48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
Karl Heuer <kwzh@gnu.org>
parents:
11002
diff
changeset
|
1126 + (char *)current_kboard); |
|
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
1127 } |
| 298 | 1128 } |
| 1129 | |
| 1130 return valcontents; | |
| 1131 } | |
| 1132 | |
| 514 | 1133 DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1134 doc: /* Return SYMBOL's value. Error if that is void. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1135 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1136 Lisp_Object symbol; |
| 514 | 1137 { |
|
6497
89ff61b53cee
(store_symval_forwarding, Fsymbol_value): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6459
diff
changeset
|
1138 Lisp_Object val; |
| 514 | 1139 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1140 val = find_symbol_value (symbol); |
| 514 | 1141 if (EQ (val, Qunbound)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1142 return Fsignal (Qvoid_variable, Fcons (symbol, Qnil)); |
| 514 | 1143 else |
| 1144 return val; | |
| 1145 } | |
| 1146 | |
| 298 | 1147 DEFUN ("set", Fset, Sset, 2, 2, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1148 doc: /* Set SYMBOL's value to NEWVAL, and return NEWVAL. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1149 (symbol, newval) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1150 register Lisp_Object symbol, newval; |
| 298 | 1151 { |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1152 return set_internal (symbol, newval, current_buffer, 0); |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1153 } |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1154 |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1155 /* Return 1 if SYMBOL currently has a let-binding |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1156 which was made in the buffer that is now current. */ |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1157 |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1158 static int |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1159 let_shadows_buffer_binding_p (symbol) |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1160 Lisp_Object symbol; |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1161 { |
|
51030
7ef125284156
(let_shadows_buffer_binding_p): Make target of p volatile.
Richard M. Stallman <rms@gnu.org>
parents:
50632
diff
changeset
|
1162 volatile struct specbinding *p; |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1163 |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1164 for (p = specpdl_ptr - 1; p >= specpdl; p--) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1165 if (p->func == NULL |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1166 && CONSP (p->symbol)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1167 { |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1168 Lisp_Object let_bound_symbol = XCAR (p->symbol); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1169 if ((EQ (symbol, let_bound_symbol) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1170 || (XSYMBOL (let_bound_symbol)->indirect_variable |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1171 && EQ (symbol, indirect_variable (let_bound_symbol)))) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1172 && XBUFFER (XCDR (XCDR (p->symbol))) == current_buffer) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1173 break; |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1174 } |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1175 |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1176 return p >= specpdl; |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1177 } |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1178 |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1179 /* Store the value NEWVAL into SYMBOL. |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1180 If buffer-locality is an issue, BUF specifies which buffer to use. |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1181 (0 stands for the current buffer.) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1182 |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1183 If BINDFLAG is zero, then if this symbol is supposed to become |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1184 local in every buffer where it is set, then we make it local. |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1185 If BINDFLAG is nonzero, we don't do that. */ |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1186 |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1187 Lisp_Object |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1188 set_internal (symbol, newval, buf, bindflag) |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1189 register Lisp_Object symbol, newval; |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1190 struct buffer *buf; |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1191 int bindflag; |
|
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1192 { |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1193 int voide = EQ (newval, Qunbound); |
| 298 | 1194 |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1195 register Lisp_Object valcontents, innercontents, tem1, current_alist_element; |
| 298 | 1196 |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1197 if (buf == 0) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1198 buf = current_buffer; |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1199 |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1200 /* If restoring in a dead buffer, do nothing. */ |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1201 if (NILP (buf->name)) |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1202 return newval; |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1203 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1204 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1205 if (SYMBOL_CONSTANT_P (symbol) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1206 && (NILP (Fkeywordp (symbol)) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1207 || !EQ (newval, SYMBOL_VALUE (symbol)))) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1208 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1209 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1210 innercontents = valcontents = SYMBOL_VALUE (symbol); |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1211 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1212 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1213 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1214 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1215 int idx = PER_BUFFER_IDX (offset); |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1216 if (idx > 0 |
|
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1217 && !bindflag |
|
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1218 && !let_shadows_buffer_binding_p (symbol)) |
| 28351 | 1219 SET_PER_BUFFER_VALUE_P (buf, idx, 1); |
| 298 | 1220 } |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1221 else if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1222 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1223 { |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1224 /* valcontents is a struct Lisp_Buffer_Local_Value. */ |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1225 if (XSYMBOL (symbol)->indirect_variable) |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1226 symbol = indirect_variable (symbol); |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1227 |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1228 /* What binding is loaded right now? */ |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1229 current_alist_element |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1230 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
| 298 | 1231 |
| 733 | 1232 /* If the current buffer is not the buffer whose binding is |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1233 loaded, or if there may be frame-local bindings and the frame |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1234 isn't the right one, or if it's a Lisp_Buffer_Local_Value and |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1235 the default binding is loaded, the loaded binding may be the |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1236 wrong one. */ |
|
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28351
diff
changeset
|
1237 if (!BUFFERP (XBUFFER_LOCAL_VALUE (valcontents)->buffer) |
|
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28351
diff
changeset
|
1238 || buf != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer) |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1239 || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1240 && !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame)) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1241 || (BUFFER_LOCAL_VALUEP (valcontents) |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1242 && EQ (XCAR (current_alist_element), |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1243 current_alist_element))) |
| 298 | 1244 { |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1245 /* The currently loaded binding is not necessarily valid. |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1246 We need to unload it, and choose a new binding. */ |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1247 |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1248 /* Write out `realvalue' to the old loaded binding. */ |
| 733 | 1249 Fsetcdr (current_alist_element, |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1250 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue)); |
| 298 | 1251 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1252 /* Find the new binding. */ |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1253 tem1 = Fassq (symbol, buf->local_var_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1254 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1255 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1256 |
| 490 | 1257 if (NILP (tem1)) |
| 733 | 1258 { |
| 1259 /* This buffer still sees the default value. */ | |
| 1260 | |
| 1261 /* If the variable is a Lisp_Some_Buffer_Local_Value, | |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1262 or if this is `let' rather than `set', |
| 733 | 1263 make CURRENT-ALIST-ELEMENT point to itself, |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1264 indicating that we're seeing the default value. |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1265 Likewise if the variable has been let-bound |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1266 in the current buffer. */ |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1267 if (bindflag || SOME_BUFFER_LOCAL_VALUEP (valcontents) |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1268 || let_shadows_buffer_binding_p (symbol)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1269 { |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1270 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1271 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1272 if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame) |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1273 tem1 = Fassq (symbol, |
|
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1274 XFRAME (selected_frame)->param_alist); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1275 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1276 if (! NILP (tem1)) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1277 XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1278 else |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1279 tem1 = XBUFFER_LOCAL_VALUE (valcontents)->cdr; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1280 } |
|
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1281 /* If it's a Lisp_Buffer_Local_Value, being set not bound, |
|
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1282 and we're not within a let that was made for this buffer, |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1283 create a new buffer-local binding for the variable. |
|
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1284 That means, give this buffer a new assoc for a local value |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1285 and load that binding. */ |
| 733 | 1286 else |
| 1287 { | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1288 tem1 = Fcons (symbol, XCDR (current_alist_element)); |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1289 buf->local_var_alist |
|
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1290 = Fcons (tem1, buf->local_var_alist); |
| 733 | 1291 } |
| 1292 } | |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1293 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1294 /* Record which binding is now loaded. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1295 XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1296 tem1); |
| 733 | 1297 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1298 /* Set `buffer' and `frame' slots for thebinding now loaded. */ |
|
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1299 XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf); |
|
25665
8250026fe76d
(swap_in_symval_forwarding): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25504
diff
changeset
|
1300 XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame; |
| 298 | 1301 } |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1302 innercontents = XBUFFER_LOCAL_VALUE (valcontents)->realvalue; |
| 298 | 1303 } |
| 733 | 1304 |
| 298 | 1305 /* If storing void (making the symbol void), forward only through |
| 1306 buffer-local indicator, not through Lisp_Objfwd, etc. */ | |
| 1307 if (voide) | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1308 store_symval_forwarding (symbol, Qnil, newval, buf); |
| 298 | 1309 else |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1310 store_symval_forwarding (symbol, innercontents, newval, buf); |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1311 |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1312 /* If we just set a variable whose current binding is frame-local, |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1313 store the new value in the frame parameter too. */ |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1314 |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1315 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1316 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1317 { |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1318 /* What binding is loaded right now? */ |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1319 current_alist_element |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1320 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1321 |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1322 /* If the current buffer is not the buffer whose binding is |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1323 loaded, or if there may be frame-local bindings and the frame |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1324 isn't the right one, or if it's a Lisp_Buffer_Local_Value and |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1325 the default binding is loaded, the loaded binding may be the |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1326 wrong one. */ |
|
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1327 if (XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame) |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1328 XSETCDR (current_alist_element, newval); |
|
29735
ab56f683df46
(set_internal): If variable is frame-local,
Gerd Moellmann <gerd@gnu.org>
parents:
29660
diff
changeset
|
1329 } |
| 733 | 1330 |
| 298 | 1331 return newval; |
| 1332 } | |
| 1333 | |
| 1334 /* Access or set a buffer-local symbol's default value. */ | |
| 1335 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1336 /* Return the default value of SYMBOL, but don't check for voidness. |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1337 Return Qunbound if it is void. */ |
| 298 | 1338 |
| 1339 Lisp_Object | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1340 default_value (symbol) |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1341 Lisp_Object symbol; |
| 298 | 1342 { |
| 1343 register Lisp_Object valcontents; | |
| 1344 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1345 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1346 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 1347 |
| 1348 /* For a built-in buffer-local variable, get the default value | |
| 1349 rather than letting do_symval_forwarding get the current value. */ | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1350 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1351 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1352 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1353 if (PER_BUFFER_IDX (offset) != 0) |
| 1354 return PER_BUFFER_DEFAULT (offset); | |
| 298 | 1355 } |
| 1356 | |
| 1357 /* Handle user-created local variables. */ | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1358 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1359 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1360 { |
| 1361 /* If var is set up for a buffer that lacks a local value for it, | |
| 1362 the current value is nominally the default value. | |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1363 But the `realvalue' slot may be more up to date, since |
| 298 | 1364 ordinary setq stores just that slot. So use that. */ |
| 1365 Lisp_Object current_alist_element, alist_element_car; | |
| 1366 current_alist_element | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1367 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1368 alist_element_car = XCAR (current_alist_element); |
| 298 | 1369 if (EQ (alist_element_car, current_alist_element)) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1370 return do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue); |
| 298 | 1371 else |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1372 return XCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
| 298 | 1373 } |
| 1374 /* For other variables, get the current value. */ | |
| 1375 return do_symval_forwarding (valcontents); | |
| 1376 } | |
| 1377 | |
| 1378 DEFUN ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1379 doc: /* Return t if SYMBOL has a non-void default value. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1380 This is the value that is seen in buffers that do not have their own values |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1381 for this variable. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1382 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1383 Lisp_Object symbol; |
| 298 | 1384 { |
| 1385 register Lisp_Object value; | |
| 1386 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1387 value = default_value (symbol); |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1388 return (EQ (value, Qunbound) ? Qnil : Qt); |
| 298 | 1389 } |
| 1390 | |
| 1391 DEFUN ("default-value", Fdefault_value, Sdefault_value, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1392 doc: /* Return SYMBOL's default value. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1393 This is the value that is seen in buffers that do not have their own values |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1394 for this variable. The default value is meaningful for variables with |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1395 local bindings in certain buffers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1396 (symbol) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1397 Lisp_Object symbol; |
| 298 | 1398 { |
| 1399 register Lisp_Object value; | |
| 1400 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1401 value = default_value (symbol); |
|
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1402 if (EQ (value, Qunbound)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1403 return Fsignal (Qvoid_variable, Fcons (symbol, Qnil)); |
| 298 | 1404 return value; |
| 1405 } | |
| 1406 | |
| 1407 DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0, | |
|
55616
c2be5da8c8cb
(Fset_default): Make argument names match their use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55455
diff
changeset
|
1408 doc: /* Set SYMBOL's default value to VALUE. SYMBOL and VALUE are evaluated. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1409 The default value is seen in buffers that do not have their own values |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1410 for this variable. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1411 (symbol, value) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1412 Lisp_Object symbol, value; |
| 298 | 1413 { |
| 1414 register Lisp_Object valcontents, current_alist_element, alist_element_buffer; | |
| 1415 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1416 CHECK_SYMBOL (symbol); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1417 valcontents = SYMBOL_VALUE (symbol); |
| 298 | 1418 |
| 1419 /* Handle variables like case-fold-search that have special slots | |
| 1420 in the buffer. Make them work apparently like Lisp_Buffer_Local_Value | |
| 1421 variables. */ | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1422 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1423 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1424 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1425 int idx = PER_BUFFER_IDX (offset); |
| 1426 | |
| 1427 PER_BUFFER_DEFAULT (offset) = value; | |
|
20996
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
1428 |
|
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
1429 /* If this variable is not always local in all buffers, |
|
b52e351a40fa
(store_symval_forwarding) <Lisp_Misc_Buffer_Objfwd>:
Karl Heuer <kwzh@gnu.org>
parents:
20827
diff
changeset
|
1430 set it in the buffers that don't nominally have a local value. */ |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1431 if (idx > 0) |
| 298 | 1432 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1433 struct buffer *b; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1434 |
| 298 | 1435 for (b = all_buffers; b; b = b->next) |
| 28351 | 1436 if (!PER_BUFFER_VALUE_P (b, idx)) |
| 1437 PER_BUFFER_VALUE (b, offset) = value; | |
| 298 | 1438 } |
| 1439 return value; | |
| 1440 } | |
| 1441 | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1442 if (!BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1443 && !SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1444 return Fset (symbol, value); |
| 298 | 1445 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1446 /* Store new value into the DEFAULT-VALUE slot. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1447 XSETCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, value); |
| 298 | 1448 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1449 /* If the default binding is now loaded, set the REALVALUE slot too. */ |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1450 current_alist_element |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1451 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
| 298 | 1452 alist_element_buffer = Fcar (current_alist_element); |
| 1453 if (EQ (alist_element_buffer, current_alist_element)) | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1454 store_symval_forwarding (symbol, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1455 XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
1456 value, NULL); |
| 298 | 1457 |
| 1458 return value; | |
| 1459 } | |
| 1460 | |
|
60064
896e880eab56
(Fsetq_default): Allow no arg case.
Richard M. Stallman <rms@gnu.org>
parents:
59110
diff
changeset
|
1461 DEFUN ("setq-default", Fsetq_default, Ssetq_default, 0, UNEVALLED, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1462 doc: /* Set the default value of variable VAR to VALUE. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1463 VAR, the variable name, is literal (not evaluated); |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1464 VALUE is an expression: it is evaluated and its value returned. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1465 The default value of a variable is seen in buffers |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1466 that do not have their own values for the variable. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1467 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1468 More generally, you can use multiple variables and values, as in |
|
55378
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1469 (setq-default VAR VALUE VAR VALUE...) |
|
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1470 This sets each VAR's default value to the corresponding VALUE. |
|
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1471 The VALUE for the Nth VAR can refer to the new default values |
|
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1472 of previous VARs. |
|
60064
896e880eab56
(Fsetq_default): Allow no arg case.
Richard M. Stallman <rms@gnu.org>
parents:
59110
diff
changeset
|
1473 usage: (setq-default [VAR VALUE...]) */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1474 (args) |
| 298 | 1475 Lisp_Object args; |
| 1476 { | |
| 1477 register Lisp_Object args_left; | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1478 register Lisp_Object val, symbol; |
| 298 | 1479 struct gcpro gcpro1; |
| 1480 | |
| 490 | 1481 if (NILP (args)) |
| 298 | 1482 return Qnil; |
| 1483 | |
| 1484 args_left = args; | |
| 1485 GCPRO1 (args); | |
| 1486 | |
| 1487 do | |
| 1488 { | |
| 1489 val = Feval (Fcar (Fcdr (args_left))); | |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1490 symbol = XCAR (args_left); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1491 Fset_default (symbol, val); |
|
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1492 args_left = Fcdr (XCDR (args_left)); |
| 298 | 1493 } |
| 490 | 1494 while (!NILP (args_left)); |
| 298 | 1495 |
| 1496 UNGCPRO; | |
| 1497 return val; | |
| 1498 } | |
| 1499 | |
|
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1500 /* Lisp functions for creating and removing buffer-local variables. */ |
|
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1501 |
| 298 | 1502 DEFUN ("make-variable-buffer-local", Fmake_variable_buffer_local, Smake_variable_buffer_local, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1503 1, 1, "vMake Variable Buffer Local: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1504 doc: /* Make VARIABLE become buffer-local whenever it is set. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1505 At any time, the value for the current buffer is in effect, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1506 unless the variable has never been set in this buffer, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1507 in which case the default value is in effect. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1508 Note that binding the variable with `let', or setting it while |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1509 a `let'-style binding made in this buffer is in effect, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1510 does not make the variable buffer-local. Return VARIABLE. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1511 |
|
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1512 In most cases it is better to use `make-local-variable', |
|
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1513 which makes a variable local in just one buffer. |
|
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1514 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1515 The function `default-value' gets the default value and `set-default' sets it. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1516 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1517 register Lisp_Object variable; |
| 298 | 1518 { |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1519 register Lisp_Object tem, valcontents, newval; |
| 298 | 1520 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1521 CHECK_SYMBOL (variable); |
|
52376
78af369bc6ac
(Fmake_variable_buffer_local, Fmake_local_variable)
Richard M. Stallman <rms@gnu.org>
parents:
51030
diff
changeset
|
1522 variable = indirect_variable (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1523 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1524 valcontents = SYMBOL_VALUE (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1525 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1526 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
| 298 | 1527 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1528 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1529 return variable; |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1530 if (SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1531 { |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1532 XMISCTYPE (SYMBOL_VALUE (variable)) = Lisp_Misc_Buffer_Local_Value; |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1533 return variable; |
| 298 | 1534 } |
| 1535 if (EQ (valcontents, Qunbound)) | |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1536 SET_SYMBOL_VALUE (variable, Qnil); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1537 tem = Fcons (Qnil, Fsymbol_value (variable)); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1538 XSETCAR (tem, tem); |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1539 newval = allocate_misc (); |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
1540 XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1541 XBUFFER_LOCAL_VALUE (newval)->realvalue = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1542 XBUFFER_LOCAL_VALUE (newval)->buffer = Fcurrent_buffer (); |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1543 XBUFFER_LOCAL_VALUE (newval)->frame = Qnil; |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1544 XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1545 XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1546 XBUFFER_LOCAL_VALUE (newval)->check_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1547 XBUFFER_LOCAL_VALUE (newval)->cdr = tem; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1548 SET_SYMBOL_VALUE (variable, newval); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1549 return variable; |
| 298 | 1550 } |
| 1551 | |
| 1552 DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1553 1, 1, "vMake Local Variable: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1554 doc: /* Make VARIABLE have a separate value in the current buffer. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1555 Other buffers will continue to share a common default value. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1556 \(The buffer-local value of VARIABLE starts out as the same value |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1557 VARIABLE previously had. If VARIABLE was void, it remains void.\) |
|
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1558 Return VARIABLE. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1559 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1560 If the variable is already arranged to become local when set, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1561 this function causes a local value to exist for this buffer, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1562 just as setting the variable would do. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1563 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1564 This function returns VARIABLE, and therefore |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1565 (set (make-local-variable 'VARIABLE) VALUE-EXP) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1566 works. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1567 |
|
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1568 See also `make-variable-buffer-local'. |
|
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1569 |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1570 Do not use `make-local-variable' to make a hook variable buffer-local. |
|
40628
ae231ad6710d
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40123
diff
changeset
|
1571 Instead, use `add-hook' and specify t for the LOCAL argument. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1572 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1573 register Lisp_Object variable; |
| 298 | 1574 { |
| 1575 register Lisp_Object tem, valcontents; | |
| 1576 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1577 CHECK_SYMBOL (variable); |
|
52376
78af369bc6ac
(Fmake_variable_buffer_local, Fmake_local_variable)
Richard M. Stallman <rms@gnu.org>
parents:
51030
diff
changeset
|
1578 variable = indirect_variable (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1579 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1580 valcontents = SYMBOL_VALUE (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1581 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1582 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
| 298 | 1583 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1584 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents)) |
| 298 | 1585 { |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1586 tem = Fboundp (variable); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
1587 |
| 298 | 1588 /* Make sure the symbol has a local value in this particular buffer, |
| 1589 by setting it to the same value it already has. */ | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1590 Fset (variable, (EQ (tem, Qt) ? Fsymbol_value (variable) : Qunbound)); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1591 return variable; |
| 298 | 1592 } |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1593 /* Make sure symbol is set up to hold per-buffer values. */ |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1594 if (!SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
| 298 | 1595 { |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1596 Lisp_Object newval; |
| 298 | 1597 tem = Fcons (Qnil, do_symval_forwarding (valcontents)); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1598 XSETCAR (tem, tem); |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1599 newval = allocate_misc (); |
|
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
1600 XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1601 XBUFFER_LOCAL_VALUE (newval)->realvalue = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1602 XBUFFER_LOCAL_VALUE (newval)->buffer = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1603 XBUFFER_LOCAL_VALUE (newval)->frame = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1604 XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1605 XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1606 XBUFFER_LOCAL_VALUE (newval)->check_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1607 XBUFFER_LOCAL_VALUE (newval)->cdr = tem; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1608 SET_SYMBOL_VALUE (variable, newval);; |
| 298 | 1609 } |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1610 /* Make sure this buffer has its own value of symbol. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1611 tem = Fassq (variable, current_buffer->local_var_alist); |
| 490 | 1612 if (NILP (tem)) |
| 298 | 1613 { |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1614 /* Swap out any local binding for some other buffer, and make |
|
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1615 sure the current value is permanently recorded, if it's the |
|
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1616 default value. */ |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1617 find_symbol_value (variable); |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1618 |
| 298 | 1619 current_buffer->local_var_alist |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1620 = Fcons (Fcons (variable, XCDR (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (variable))->cdr)), |
| 298 | 1621 current_buffer->local_var_alist); |
| 1622 | |
| 1623 /* Make sure symbol does not think it is set up for this buffer; | |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1624 force it to look once again for this buffer's value. */ |
| 298 | 1625 { |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1626 Lisp_Object *pvalbuf; |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1627 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1628 valcontents = SYMBOL_VALUE (variable); |
|
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1629 |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1630 pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer; |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1631 if (current_buffer == XBUFFER (*pvalbuf)) |
|
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1632 *pvalbuf = Qnil; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1633 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
| 298 | 1634 } |
|
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1635 } |
| 298 | 1636 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1637 /* If the symbol forwards into a C variable, then load the binding |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1638 for this buffer now. If C code modifies the variable before we |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1639 load the binding in, then that new value will clobber the default |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1640 binding the next time we unload it. */ |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1641 valcontents = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (variable))->realvalue; |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1642 if (INTFWDP (valcontents) || BOOLFWDP (valcontents) || OBJFWDP (valcontents)) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1643 swap_in_symval_forwarding (variable, SYMBOL_VALUE (variable)); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1644 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1645 return variable; |
| 298 | 1646 } |
| 1647 | |
| 1648 DEFUN ("kill-local-variable", Fkill_local_variable, Skill_local_variable, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1649 1, 1, "vKill Local Variable: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1650 doc: /* Make VARIABLE no longer have a separate value in the current buffer. |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1651 From now on the default value will apply in this buffer. Return VARIABLE. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1652 (variable) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1653 register Lisp_Object variable; |
| 298 | 1654 { |
| 1655 register Lisp_Object tem, valcontents; | |
| 1656 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1657 CHECK_SYMBOL (variable); |
|
52376
78af369bc6ac
(Fmake_variable_buffer_local, Fmake_local_variable)
Richard M. Stallman <rms@gnu.org>
parents:
51030
diff
changeset
|
1658 variable = indirect_variable (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1659 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1660 valcontents = SYMBOL_VALUE (variable); |
| 298 | 1661 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1662 if (BUFFER_OBJFWDP (valcontents)) |
| 298 | 1663 { |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1664 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1665 int idx = PER_BUFFER_IDX (offset); |
|
28312
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1666 |
|
034f252dd69b
(do_symval_forwarding, store_symval_forwarding)
Gerd Moellmann <gerd@gnu.org>
parents:
27826
diff
changeset
|
1667 if (idx > 0) |
| 298 | 1668 { |
| 28351 | 1669 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0); |
| 1670 PER_BUFFER_VALUE (current_buffer, offset) | |
| 1671 = PER_BUFFER_DEFAULT (offset); | |
| 298 | 1672 } |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1673 return variable; |
| 298 | 1674 } |
| 1675 | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1676 if (!BUFFER_LOCAL_VALUEP (valcontents) |
|
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1677 && !SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1678 return variable; |
| 298 | 1679 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1680 /* Get rid of this buffer's alist element, if any. */ |
| 298 | 1681 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1682 tem = Fassq (variable, current_buffer->local_var_alist); |
| 490 | 1683 if (!NILP (tem)) |
|
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1684 current_buffer->local_var_alist |
|
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1685 = Fdelq (tem, current_buffer->local_var_alist); |
| 298 | 1686 |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1687 /* If the symbol is set up with the current buffer's binding |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1688 loaded, recompute its value. We have to do it now, or else |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1689 forwarded objects won't work right. */ |
| 298 | 1690 { |
|
50305
77bee06b14c5
(store_symval_forwarding): Delete special read-only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50109
diff
changeset
|
1691 Lisp_Object *pvalbuf, buf; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1692 valcontents = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1693 pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer; |
|
50305
77bee06b14c5
(store_symval_forwarding): Delete special read-only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50109
diff
changeset
|
1694 XSETBUFFER (buf, current_buffer); |
|
77bee06b14c5
(store_symval_forwarding): Delete special read-only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50109
diff
changeset
|
1695 if (EQ (buf, *pvalbuf)) |
|
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1696 { |
|
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1697 *pvalbuf = Qnil; |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1698 XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0; |
|
14745
f78162b0fc6e
(Fkill_local_variable): Call find_symbol_value directly,
Richard M. Stallman <rms@gnu.org>
parents:
14302
diff
changeset
|
1699 find_symbol_value (variable); |
|
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1700 } |
| 298 | 1701 } |
| 1702 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1703 return variable; |
| 298 | 1704 } |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1705 |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1706 /* Lisp functions for creating and removing buffer-local variables. */ |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1707 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1708 DEFUN ("make-variable-frame-local", Fmake_variable_frame_local, Smake_variable_frame_local, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1709 1, 1, "vMake Variable Frame Local: ", |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1710 doc: /* Enable VARIABLE to have frame-local bindings. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1711 When a frame-local binding exists in the current frame, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1712 it is in effect whenever the current buffer has no buffer-local binding. |
|
46831
06e2e0c47046
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46521
diff
changeset
|
1713 A frame-local binding is actually a frame parameter value; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1714 thus, any given frame has a local binding for VARIABLE if it has |
|
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
1715 a value for the frame parameter named VARIABLE. Return VARIABLE. |
|
46831
06e2e0c47046
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46521
diff
changeset
|
1716 See `modify-frame-parameters' for how to set frame parameters. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1717 (variable) |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1718 register Lisp_Object variable; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1719 { |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1720 register Lisp_Object tem, valcontents, newval; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1721 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1722 CHECK_SYMBOL (variable); |
|
52376
78af369bc6ac
(Fmake_variable_buffer_local, Fmake_local_variable)
Richard M. Stallman <rms@gnu.org>
parents:
51030
diff
changeset
|
1723 variable = indirect_variable (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1724 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1725 valcontents = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1726 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1727 || BUFFER_OBJFWDP (valcontents)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1728 error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable))); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1729 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1730 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1731 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1732 { |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1733 XBUFFER_LOCAL_VALUE (valcontents)->check_frame = 1; |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1734 return variable; |
|
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1735 } |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1736 |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1737 if (EQ (valcontents, Qunbound)) |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1738 SET_SYMBOL_VALUE (variable, Qnil); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1739 tem = Fcons (Qnil, Fsymbol_value (variable)); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
1740 XSETCAR (tem, tem); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1741 newval = allocate_misc (); |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1742 XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1743 XBUFFER_LOCAL_VALUE (newval)->realvalue = SYMBOL_VALUE (variable); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1744 XBUFFER_LOCAL_VALUE (newval)->buffer = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1745 XBUFFER_LOCAL_VALUE (newval)->frame = Qnil; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1746 XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1747 XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1748 XBUFFER_LOCAL_VALUE (newval)->check_frame = 1; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1749 XBUFFER_LOCAL_VALUE (newval)->cdr = tem; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1750 SET_SYMBOL_VALUE (variable, newval); |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1751 return variable; |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1752 } |
|
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1753 |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1754 DEFUN ("local-variable-p", Flocal_variable_p, Slocal_variable_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1755 1, 2, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1756 doc: /* Non-nil if VARIABLE has a local binding in buffer BUFFER. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1757 BUFFER defaults to the current buffer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1758 (variable, buffer) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1759 register Lisp_Object variable, buffer; |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1760 { |
|
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1761 Lisp_Object valcontents; |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1762 register struct buffer *buf; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1763 |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1764 if (NILP (buffer)) |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1765 buf = current_buffer; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1766 else |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1767 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1768 CHECK_BUFFER (buffer); |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1769 buf = XBUFFER (buffer); |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1770 } |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1771 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1772 CHECK_SYMBOL (variable); |
|
52376
78af369bc6ac
(Fmake_variable_buffer_local, Fmake_local_variable)
Richard M. Stallman <rms@gnu.org>
parents:
51030
diff
changeset
|
1773 variable = indirect_variable (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1774 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1775 valcontents = SYMBOL_VALUE (variable); |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1776 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
12225
a0067d2edef7
(Flocal_variable_p): Fix backwards logical operator.
Richard M. Stallman <rms@gnu.org>
parents:
12113
diff
changeset
|
1777 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1778 { |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1779 Lisp_Object tail, elt; |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1780 |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1781 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1782 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1783 elt = XCAR (tail); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1784 if (EQ (variable, XCAR (elt))) |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1785 return Qt; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1786 } |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1787 } |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1788 if (BUFFER_OBJFWDP (valcontents)) |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1789 { |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1790 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
| 28351 | 1791 int idx = PER_BUFFER_IDX (offset); |
| 1792 if (idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) | |
|
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1793 return Qt; |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1794 } |
|
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1795 return Qnil; |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1796 } |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1797 |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1798 DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1799 1, 2, 0, |
|
57618
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1800 doc: /* Non-nil if VARIABLE will be local in buffer BUFFER when set there. |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1801 More precisely, this means that setting the variable \(with `set' or`setq'), |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1802 while it does not have a `let'-style binding that was made in BUFFER, |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1803 will produce a buffer local binding. See Info node |
|
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1804 `(elisp)Creating Buffer-Local'. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1805 BUFFER defaults to the current buffer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1806 (variable, buffer) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1807 register Lisp_Object variable, buffer; |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1808 { |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1809 Lisp_Object valcontents; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1810 register struct buffer *buf; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1811 |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1812 if (NILP (buffer)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1813 buf = current_buffer; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1814 else |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1815 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1816 CHECK_BUFFER (buffer); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1817 buf = XBUFFER (buffer); |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1818 } |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1819 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1820 CHECK_SYMBOL (variable); |
|
52376
78af369bc6ac
(Fmake_variable_buffer_local, Fmake_local_variable)
Richard M. Stallman <rms@gnu.org>
parents:
51030
diff
changeset
|
1821 variable = indirect_variable (variable); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1822 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1823 valcontents = SYMBOL_VALUE (variable); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1824 |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1825 /* This means that make-variable-buffer-local was done. */ |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1826 if (BUFFER_LOCAL_VALUEP (valcontents)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1827 return Qt; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1828 /* All these slots become local if they are set. */ |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1829 if (BUFFER_OBJFWDP (valcontents)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1830 return Qt; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1831 if (SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1832 { |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1833 Lisp_Object tail, elt; |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1834 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1835 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1836 elt = XCAR (tail); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1837 if (EQ (variable, XCAR (elt))) |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1838 return Qt; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1839 } |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1840 } |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1841 return Qnil; |
|
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1842 } |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1843 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1844 DEFUN ("variable-binding-locus", Fvariable_binding_locus, Svariable_binding_locus, |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1845 1, 1, 0, |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1846 doc: /* Return a value indicating where VARIABLE's current binding comes from. |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1847 If the current binding is buffer-local, the value is the current buffer. |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1848 If the current binding is frame-local, the value is the selected frame. |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1849 If the current binding is global (the default), the value is nil. */) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1850 (variable) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1851 register Lisp_Object variable; |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1852 { |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1853 Lisp_Object valcontents; |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1854 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1855 CHECK_SYMBOL (variable); |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1856 variable = indirect_variable (variable); |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1857 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1858 /* Make sure the current binding is actually swapped in. */ |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1859 find_symbol_value (variable); |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1860 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1861 valcontents = XSYMBOL (variable)->value; |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1862 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1863 if (BUFFER_LOCAL_VALUEP (valcontents) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1864 || SOME_BUFFER_LOCAL_VALUEP (valcontents) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1865 || BUFFER_OBJFWDP (valcontents)) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1866 { |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1867 /* For a local variable, record both the symbol and which |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1868 buffer's or frame's value we are saving. */ |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1869 if (!NILP (Flocal_variable_p (variable, Qnil))) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1870 return Fcurrent_buffer (); |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1871 else if (!BUFFER_OBJFWDP (valcontents) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1872 && XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame) |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1873 return XBUFFER_LOCAL_VALUE (valcontents)->frame; |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1874 } |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1875 |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1876 return Qnil; |
|
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1877 } |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1878 |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1879 extern struct device *get_device P_ ((Lisp_Object display, int)); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1880 |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1881 DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0, |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1882 doc: /* Return the terminal-local value of SYMBOL on DEVICE. |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1883 If SYMBOL is not a terminal-local variable, then return its normal |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1884 value, like `symbol-value'. |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1885 |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1886 DEVICE may be a display device id, a frame, or nil (meaning the |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1887 selected frame's display device). */) |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1888 (symbol, device) |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1889 Lisp_Object symbol; |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1890 Lisp_Object device; |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1891 { |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1892 Lisp_Object result; |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1893 struct device *d = get_device (device, 1); |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1894 push_device_kboard (d); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1895 result = Fsymbol_value (symbol); |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1896 pop_frame_kboard (); |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1897 return result; |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1898 } |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1899 |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1900 DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_local_value, 3, 3, 0, |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1901 doc: /* Set the terminal-local binding of SYMBOL on DEVICE to VALUE. |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1902 If VARIABLE is not a terminal-local variable, then set its normal |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1903 binding, like `set'. |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1904 |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1905 DEVICE may be a display device id, a frame, or nil (meaning the |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1906 selected frame's display device). */) |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1907 (symbol, device, value) |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1908 Lisp_Object symbol; |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1909 Lisp_Object device; |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1910 Lisp_Object value; |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1911 { |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1912 Lisp_Object result; |
|
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1913 struct device *d = get_device (device, 1); |
|
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1914 push_device_kboard (d); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1915 result = Fset (symbol, value); |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1916 pop_frame_kboard (); |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1917 return result; |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1918 } |
| 298 | 1919 |
| 648 | 1920 /* Find the function at the end of a chain of symbol function indirections. */ |
| 1921 | |
| 1922 /* If OBJECT is a symbol, find the end of its function chain and | |
| 1923 return the value found there. If OBJECT is not a symbol, just | |
| 1924 return it. If there is a cycle in the function chain, signal a | |
| 1925 cyclic-function-indirection error. | |
| 1926 | |
| 1927 This is like Findirect_function, except that it doesn't signal an | |
| 1928 error if the chain ends up unbound. */ | |
| 1929 Lisp_Object | |
|
1648
27e9f99fe095
src/ * data.c (indirect_function): Delete unused argument ERROR.
Jim Blandy <jimb@redhat.com>
parents:
1508
diff
changeset
|
1930 indirect_function (object) |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1931 register Lisp_Object object; |
| 648 | 1932 { |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1933 Lisp_Object tortoise, hare; |
| 648 | 1934 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1935 hare = tortoise = object; |
| 648 | 1936 |
| 1937 for (;;) | |
| 1938 { | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1939 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
| 648 | 1940 break; |
| 1941 hare = XSYMBOL (hare)->function; | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1942 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
| 648 | 1943 break; |
| 1944 hare = XSYMBOL (hare)->function; | |
| 1945 | |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1946 tortoise = XSYMBOL (tortoise)->function; |
| 648 | 1947 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
1948 if (EQ (hare, tortoise)) |
| 648 | 1949 Fsignal (Qcyclic_function_indirection, Fcons (object, Qnil)); |
| 1950 } | |
| 1951 | |
| 1952 return hare; | |
| 1953 } | |
| 1954 | |
| 1955 DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1956 doc: /* Return the function at the end of OBJECT's function chain. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1957 If OBJECT is a symbol, follow all function indirections and return the final |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1958 function binding. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1959 If OBJECT is not a symbol, just return it. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1960 Signal a void-function error if the final symbol is unbound. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1961 Signal a cyclic-function-indirection error if there is a loop in the |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1962 function chain of symbols. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1963 (object) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1964 register Lisp_Object object; |
| 648 | 1965 { |
| 1966 Lisp_Object result; | |
| 1967 | |
| 1968 result = indirect_function (object); | |
| 1969 | |
| 1970 if (EQ (result, Qunbound)) | |
| 1971 return Fsignal (Qvoid_function, Fcons (object, Qnil)); | |
| 1972 return result; | |
| 1973 } | |
| 1974 | |
| 298 | 1975 /* Extract and set vector and string elements */ |
| 1976 | |
| 1977 DEFUN ("aref", Faref, Saref, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1978 doc: /* Return the element of ARRAY at index IDX. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1979 ARRAY may be a vector, a string, a char-table, a bool-vector, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1980 or a byte-code object. IDX starts at 0. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1981 (array, idx) |
| 298 | 1982 register Lisp_Object array; |
| 1983 Lisp_Object idx; | |
| 1984 { | |
| 1985 register int idxval; | |
| 1986 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1987 CHECK_NUMBER (idx); |
| 298 | 1988 idxval = XINT (idx); |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
1989 if (STRINGP (array)) |
| 298 | 1990 { |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1991 int c, idxval_byte; |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1992 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1993 if (idxval < 0 || idxval >= SCHARS (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
1994 args_out_of_range (array, idx); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1995 if (! STRING_MULTIBYTE (array)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
1996 return make_number ((unsigned char) SREF (array, idxval)); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1997 idxval_byte = string_char_to_byte (array, idxval); |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1998 |
|
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
1999 c = STRING_CHAR (SDATA (array) + idxval_byte, |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2000 SBYTES (array) - idxval_byte); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2001 return make_number (c); |
| 298 | 2002 } |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2003 else if (BOOL_VECTOR_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2004 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2005 int val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2006 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2007 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2008 args_out_of_range (array, idx); |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2009 |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2010 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
|
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2011 return (val & (1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)) ? Qt : Qnil); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2012 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2013 else if (CHAR_TABLE_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2014 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2015 Lisp_Object val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2016 |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2017 val = Qnil; |
|
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2018 |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2019 if (idxval < 0) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2020 args_out_of_range (array, idx); |
|
20827
4b85e02aae14
(Faref, Faset): Allow indexing a char-table
Richard M. Stallman <rms@gnu.org>
parents:
20793
diff
changeset
|
2021 if (idxval < CHAR_TABLE_ORDINARY_SLOTS) |
| 17027 | 2022 { |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2023 if (! SINGLE_BYTE_CHAR_P (idxval)) |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2024 args_out_of_range (array, idx); |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2025 /* For ASCII and 8-bit European characters, the element is |
|
17184
caab9110ee07
(Faref, Faset): Adjusted for the change of CHAR_TABLE_ORDINARY_SLOTS.
Kenichi Handa <handa@m17n.org>
parents:
17117
diff
changeset
|
2026 stored in the top table. */ |
| 17027 | 2027 val = XCHAR_TABLE (array)->contents[idxval]; |
| 2028 if (NILP (val)) | |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2029 { |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2030 int default_slot |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2031 = (idxval < 0x80 ? CHAR_TABLE_DEFAULT_SLOT_ASCII |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2032 : idxval < 0xA0 ? CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2033 : CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC); |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2034 val = XCHAR_TABLE (array)->contents[default_slot]; |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2035 } |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2036 if (NILP (val)) |
| 17027 | 2037 val = XCHAR_TABLE (array)->defalt; |
| 2038 while (NILP (val)) /* Follow parents until we find some value. */ | |
| 2039 { | |
| 2040 array = XCHAR_TABLE (array)->parent; | |
| 2041 if (NILP (array)) | |
| 2042 return Qnil; | |
| 2043 val = XCHAR_TABLE (array)->contents[idxval]; | |
| 2044 if (NILP (val)) | |
| 2045 val = XCHAR_TABLE (array)->defalt; | |
| 2046 } | |
| 2047 return val; | |
| 2048 } | |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2049 else |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2050 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2051 int code[4], i; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2052 Lisp_Object sub_table; |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2053 Lisp_Object current_default; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2054 |
|
29007
180a8014aa14
(Faref): Use SPLIT_CHAR instead of SPLIT_NON_ASCII_CHAR.
Kenichi Handa <handa@m17n.org>
parents:
28417
diff
changeset
|
2055 SPLIT_CHAR (idxval, code[0], code[1], code[2]); |
|
26849
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
2056 if (code[1] < 32) code[1] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
2057 else if (code[2] < 32) code[2] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
2058 |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2059 /* Here, the possible range of CODE[0] (== charset ID) is |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2060 128..MAX_CHARSET. Since the top level char table contains |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2061 data for multibyte characters after 256th element, we must |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2062 increment CODE[0] by 128 to get a correct index. */ |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2063 code[0] += 128; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2064 code[3] = -1; /* anchor */ |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2065 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2066 try_parent_char_table: |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2067 current_default = XCHAR_TABLE (array)->defalt; |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2068 sub_table = array; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2069 for (i = 0; code[i] >= 0; i++) |
| 17027 | 2070 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2071 val = XCHAR_TABLE (sub_table)->contents[code[i]]; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2072 if (SUB_CHAR_TABLE_P (val)) |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2073 { |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2074 sub_table = val; |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2075 if (! NILP (XCHAR_TABLE (sub_table)->defalt)) |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2076 current_default = XCHAR_TABLE (sub_table)->defalt; |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2077 } |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2078 else |
| 17027 | 2079 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2080 if (NILP (val)) |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2081 val = current_default; |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2082 if (NILP (val)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2083 { |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2084 array = XCHAR_TABLE (array)->parent; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2085 if (!NILP (array)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2086 goto try_parent_char_table; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2087 } |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2088 return val; |
| 17027 | 2089 } |
| 2090 } | |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2091 /* Reaching here means IDXVAL is a generic character in |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2092 which each character or a group has independent value. |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2093 Essentially it's nonsense to get a value for such a |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2094 generic character, but for backward compatibility, we try |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2095 the default value and parent. */ |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2096 val = current_default; |
| 17027 | 2097 if (NILP (val)) |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2098 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2099 array = XCHAR_TABLE (array)->parent; |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2100 if (!NILP (array)) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2101 goto try_parent_char_table; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2102 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2103 return val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2104 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2105 } |
| 298 | 2106 else |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2107 { |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2108 int size = 0; |
|
10290
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2109 if (VECTORP (array)) |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2110 size = XVECTOR (array)->size; |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2111 else if (COMPILEDP (array)) |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2112 size = XVECTOR (array)->size & PSEUDOVECTOR_SIZE_MASK; |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2113 else |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2114 wrong_type_argument (Qarrayp, array); |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2115 |
|
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2116 if (idxval < 0 || idxval >= size) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2117 args_out_of_range (array, idx); |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2118 return XVECTOR (array)->contents[idxval]; |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2119 } |
| 298 | 2120 } |
| 2121 | |
| 2122 DEFUN ("aset", Faset, Saset, 3, 3, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2123 doc: /* Store into the element of ARRAY at index IDX the value NEWELT. |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2124 Return NEWELT. ARRAY may be a vector, a string, a char-table or a |
|
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2125 bool-vector. IDX starts at 0. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2126 (array, idx, newelt) |
| 298 | 2127 register Lisp_Object array; |
| 2128 Lisp_Object idx, newelt; | |
| 2129 { | |
| 2130 register int idxval; | |
| 2131 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2132 CHECK_NUMBER (idx); |
| 298 | 2133 idxval = XINT (idx); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2134 if (!VECTORP (array) && !STRINGP (array) && !BOOL_VECTOR_P (array) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2135 && ! CHAR_TABLE_P (array)) |
| 298 | 2136 array = wrong_type_argument (Qarrayp, array); |
| 2137 CHECK_IMPURE (array); | |
| 2138 | |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2139 if (VECTORP (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2140 { |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2141 if (idxval < 0 || idxval >= XVECTOR (array)->size) |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2142 args_out_of_range (array, idx); |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2143 XVECTOR (array)->contents[idxval] = newelt; |
|
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2144 } |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2145 else if (BOOL_VECTOR_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2146 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2147 int val; |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2148 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2149 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2150 args_out_of_range (array, idx); |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2151 |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2152 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2153 |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2154 if (! NILP (newelt)) |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2155 val |= 1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2156 else |
|
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2157 val &= ~(1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)); |
|
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2158 XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR] = val; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2159 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2160 else if (CHAR_TABLE_P (array)) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2161 { |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2162 if (idxval < 0) |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2163 args_out_of_range (array, idx); |
|
20827
4b85e02aae14
(Faref, Faset): Allow indexing a char-table
Richard M. Stallman <rms@gnu.org>
parents:
20793
diff
changeset
|
2164 if (idxval < CHAR_TABLE_ORDINARY_SLOTS) |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2165 { |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2166 if (! SINGLE_BYTE_CHAR_P (idxval)) |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2167 args_out_of_range (array, idx); |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2168 XCHAR_TABLE (array)->contents[idxval] = newelt; |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2169 } |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2170 else |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2171 { |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2172 int code[4], i; |
| 17027 | 2173 Lisp_Object val; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2174 |
|
29007
180a8014aa14
(Faref): Use SPLIT_CHAR instead of SPLIT_NON_ASCII_CHAR.
Kenichi Handa <handa@m17n.org>
parents:
28417
diff
changeset
|
2175 SPLIT_CHAR (idxval, code[0], code[1], code[2]); |
|
26849
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
2176 if (code[1] < 32) code[1] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
2177 else if (code[2] < 32) code[2] = -1; |
|
a0ecda172035
(Faref): Delete codes for a composite character..
Kenichi Handa <handa@m17n.org>
parents:
26274
diff
changeset
|
2178 |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2179 /* See the comment of the corresponding part in Faref. */ |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2180 code[0] += 128; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2181 code[3] = -1; /* anchor */ |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2182 for (i = 0; code[i + 1] >= 0; i++) |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2183 { |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2184 val = XCHAR_TABLE (array)->contents[code[i]]; |
|
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2185 if (SUB_CHAR_TABLE_P (val)) |
| 17027 | 2186 array = val; |
| 2187 else | |
|
19751
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2188 { |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2189 Lisp_Object temp; |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2190 |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2191 /* VAL is a leaf. Create a sub char table with the |
|
61686
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2192 initial value VAL and look into it. */ |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2193 |
|
527b912957bf
(Faref): Handle special slots used as default values of
Kenichi Handa <handa@m17n.org>
parents:
60064
diff
changeset
|
2194 temp = make_sub_char_table (val); |
|
19751
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2195 XCHAR_TABLE (array)->contents[code[i]] = temp; |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2196 array = temp; |
|
19f79afe3e78
(Faset): Simplify a statement in the char-table case.
Richard M. Stallman <rms@gnu.org>
parents:
18854
diff
changeset
|
2197 } |
| 17027 | 2198 } |
|
17319
a58d6ceeb370
(Faref, Faset): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17184
diff
changeset
|
2199 XCHAR_TABLE (array)->contents[code[i]] = newelt; |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2200 } |
|
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2201 } |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2202 else if (STRING_MULTIBYTE (array)) |
|
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2203 { |
|
50632
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2204 int idxval_byte, prev_bytes, new_bytes, nbytes; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2205 unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1; |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2206 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2207 if (idxval < 0 || idxval >= SCHARS (array)) |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2208 args_out_of_range (array, idx); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2209 CHECK_NUMBER (newelt); |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2210 |
|
50632
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2211 nbytes = SBYTES (array); |
|
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2212 |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2213 idxval_byte = string_char_to_byte (array, idxval); |
|
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2214 p1 = SDATA (array) + idxval_byte; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2215 PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2216 new_bytes = CHAR_STRING (XINT (newelt), p0); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2217 if (prev_bytes != new_bytes) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2218 { |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2219 /* We must relocate the string data. */ |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2220 int nchars = SCHARS (array); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2221 unsigned char *str; |
| 56193 | 2222 USE_SAFE_ALLOCA; |
| 2223 | |
| 2224 SAFE_ALLOCA (str, unsigned char *, nbytes); | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2225 bcopy (SDATA (array), str, nbytes); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2226 allocate_string_data (XSTRING (array), nchars, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2227 nbytes + new_bytes - prev_bytes); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2228 bcopy (str, SDATA (array), idxval_byte); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2229 p1 = SDATA (array) + idxval_byte; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2230 bcopy (str + idxval_byte + prev_bytes, p1 + new_bytes, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2231 nbytes - (idxval_byte + prev_bytes)); |
|
57726
66e97a54985f
Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents:
57618
diff
changeset
|
2232 SAFE_FREE (); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2233 clear_string_char_byte_cache (); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2234 } |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2235 while (new_bytes--) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2236 *p1++ = *p0++; |
|
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2237 } |
| 298 | 2238 else |
| 2239 { | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2240 if (idxval < 0 || idxval >= SCHARS (array)) |
|
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2241 args_out_of_range (array, idx); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2242 CHECK_NUMBER (newelt); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2243 |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2244 if (XINT (newelt) < 0 || SINGLE_BYTE_CHAR_P (XINT (newelt))) |
|
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2245 SSET (array, idxval, XINT (newelt)); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2246 else |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2247 { |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2248 /* We must relocate the string data while converting it to |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2249 multibyte. */ |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2250 int idxval_byte, prev_bytes, new_bytes; |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2251 unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2252 unsigned char *origstr = SDATA (array), *str; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2253 int nchars, nbytes; |
| 56193 | 2254 USE_SAFE_ALLOCA; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2255 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2256 nchars = SCHARS (array); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2257 nbytes = idxval_byte = count_size_as_multibyte (origstr, idxval); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2258 nbytes += count_size_as_multibyte (origstr + idxval, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2259 nchars - idxval); |
| 56193 | 2260 SAFE_ALLOCA (str, unsigned char *, nbytes); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2261 copy_text (SDATA (array), str, nchars, 0, 1); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2262 PARSE_MULTIBYTE_SEQ (str + idxval_byte, nbytes - idxval_byte, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2263 prev_bytes); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2264 new_bytes = CHAR_STRING (XINT (newelt), p0); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2265 allocate_string_data (XSTRING (array), nchars, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2266 nbytes + new_bytes - prev_bytes); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2267 bcopy (str, SDATA (array), idxval_byte); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2268 p1 = SDATA (array) + idxval_byte; |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2269 while (new_bytes--) |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2270 *p1++ = *p0++; |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2271 bcopy (str + idxval_byte + prev_bytes, p1, |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2272 nbytes - (idxval_byte + prev_bytes)); |
|
57726
66e97a54985f
Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents:
57618
diff
changeset
|
2273 SAFE_FREE (); |
|
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2274 clear_string_char_byte_cache (); |
|
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2275 } |
| 298 | 2276 } |
| 2277 | |
| 2278 return newelt; | |
| 2279 } | |
| 2280 | |
| 2281 /* Arithmetic functions */ | |
| 2282 | |
| 2283 enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal }; | |
| 2284 | |
| 2285 Lisp_Object | |
| 2286 arithcompare (num1, num2, comparison) | |
| 2287 Lisp_Object num1, num2; | |
| 2288 enum comparison comparison; | |
| 2289 { | |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2290 double f1 = 0, f2 = 0; |
| 298 | 2291 int floatp = 0; |
| 2292 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2293 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2294 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2); |
| 298 | 2295 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2296 if (FLOATP (num1) || FLOATP (num2)) |
| 298 | 2297 { |
| 2298 floatp = 1; | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2299 f1 = (FLOATP (num1)) ? XFLOAT_DATA (num1) : XINT (num1); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2300 f2 = (FLOATP (num2)) ? XFLOAT_DATA (num2) : XINT (num2); |
| 298 | 2301 } |
| 2302 | |
| 2303 switch (comparison) | |
| 2304 { | |
| 2305 case equal: | |
| 2306 if (floatp ? f1 == f2 : XINT (num1) == XINT (num2)) | |
| 2307 return Qt; | |
| 2308 return Qnil; | |
| 2309 | |
| 2310 case notequal: | |
| 2311 if (floatp ? f1 != f2 : XINT (num1) != XINT (num2)) | |
| 2312 return Qt; | |
| 2313 return Qnil; | |
| 2314 | |
| 2315 case less: | |
| 2316 if (floatp ? f1 < f2 : XINT (num1) < XINT (num2)) | |
| 2317 return Qt; | |
| 2318 return Qnil; | |
| 2319 | |
| 2320 case less_or_equal: | |
| 2321 if (floatp ? f1 <= f2 : XINT (num1) <= XINT (num2)) | |
| 2322 return Qt; | |
| 2323 return Qnil; | |
| 2324 | |
| 2325 case grtr: | |
| 2326 if (floatp ? f1 > f2 : XINT (num1) > XINT (num2)) | |
| 2327 return Qt; | |
| 2328 return Qnil; | |
| 2329 | |
| 2330 case grtr_or_equal: | |
| 2331 if (floatp ? f1 >= f2 : XINT (num1) >= XINT (num2)) | |
| 2332 return Qt; | |
| 2333 return Qnil; | |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2334 |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2335 default: |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2336 abort (); |
| 298 | 2337 } |
| 2338 } | |
| 2339 | |
| 2340 DEFUN ("=", Feqlsign, Seqlsign, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2341 doc: /* Return t if two args, both numbers or markers, are equal. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2342 (num1, num2) |
| 298 | 2343 register Lisp_Object num1, num2; |
| 2344 { | |
| 2345 return arithcompare (num1, num2, equal); | |
| 2346 } | |
| 2347 | |
| 2348 DEFUN ("<", Flss, Slss, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2349 doc: /* Return t if first arg is less than second arg. Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2350 (num1, num2) |
| 298 | 2351 register Lisp_Object num1, num2; |
| 2352 { | |
| 2353 return arithcompare (num1, num2, less); | |
| 2354 } | |
| 2355 | |
| 2356 DEFUN (">", Fgtr, Sgtr, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2357 doc: /* Return t if first arg is greater than second arg. Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2358 (num1, num2) |
| 298 | 2359 register Lisp_Object num1, num2; |
| 2360 { | |
| 2361 return arithcompare (num1, num2, grtr); | |
| 2362 } | |
| 2363 | |
| 2364 DEFUN ("<=", Fleq, Sleq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2365 doc: /* Return t if first arg is less than or equal to second arg. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2366 Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2367 (num1, num2) |
| 298 | 2368 register Lisp_Object num1, num2; |
| 2369 { | |
| 2370 return arithcompare (num1, num2, less_or_equal); | |
| 2371 } | |
| 2372 | |
| 2373 DEFUN (">=", Fgeq, Sgeq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2374 doc: /* Return t if first arg is greater than or equal to second arg. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2375 Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2376 (num1, num2) |
| 298 | 2377 register Lisp_Object num1, num2; |
| 2378 { | |
| 2379 return arithcompare (num1, num2, grtr_or_equal); | |
| 2380 } | |
| 2381 | |
| 2382 DEFUN ("/=", Fneq, Sneq, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2383 doc: /* Return t if first arg is not equal to second arg. Both must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2384 (num1, num2) |
| 298 | 2385 register Lisp_Object num1, num2; |
| 2386 { | |
| 2387 return arithcompare (num1, num2, notequal); | |
| 2388 } | |
| 2389 | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2390 DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0, |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2391 doc: /* Return t if NUMBER is zero. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2392 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2393 register Lisp_Object number; |
| 298 | 2394 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2395 CHECK_NUMBER_OR_FLOAT (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2396 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2397 if (FLOATP (number)) |
| 298 | 2398 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2399 if (XFLOAT_DATA (number) == 0.0) |
| 298 | 2400 return Qt; |
| 2401 return Qnil; | |
| 2402 } | |
| 2403 | |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2404 if (!XINT (number)) |
| 298 | 2405 return Qt; |
| 2406 return Qnil; | |
| 2407 } | |
| 2408 | |
| 12043 | 2409 /* Convert between long values and pairs of Lisp integers. */ |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2410 |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2411 Lisp_Object |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2412 long_to_cons (i) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2413 unsigned long i; |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2414 { |
|
50109
d23ab2416c49
(long_to_cons): Fix type of top.
Andreas Schwab <schwab@suse.de>
parents:
48996
diff
changeset
|
2415 unsigned long top = i >> 16; |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2416 unsigned int bot = i & 0xFFFF; |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2417 if (top == 0) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2418 return make_number (bot); |
|
11879
606889516975
(long_to_cons): Don't assume 32-bit longs.
Karl Heuer <kwzh@gnu.org>
parents:
11734
diff
changeset
|
2419 if (top == (unsigned long)-1 >> 16) |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2420 return Fcons (make_number (-1), make_number (bot)); |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2421 return Fcons (make_number (top), make_number (bot)); |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2422 } |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2423 |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2424 unsigned long |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2425 cons_to_long (c) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2426 Lisp_Object c; |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2427 { |
|
3675
f42eaf84478f
(cons_to_long): Declare top, bot as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
2428 Lisp_Object top, bot; |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2429 if (INTEGERP (c)) |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2430 return XINT (c); |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2431 top = XCAR (c); |
|
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2432 bot = XCDR (c); |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2433 if (CONSP (bot)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2434 bot = XCAR (bot); |
|
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2435 return ((XINT (top) << 16) | XINT (bot)); |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2436 } |
|
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2437 |
|
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
2438 DEFUN ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0, |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2439 doc: /* Return the decimal representation of NUMBER as a string. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2440 Uses a minus sign if negative. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2441 NUMBER may be an integer or a floating point number. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2442 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2443 Lisp_Object number; |
| 298 | 2444 { |
|
12528
ed5b91dd829a
(Fnumber_to_string): Make `buffer' long enough.
Karl Heuer <kwzh@gnu.org>
parents:
12295
diff
changeset
|
2445 char buffer[VALBITS]; |
| 298 | 2446 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2447 CHECK_NUMBER_OR_FLOAT (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2448 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2449 if (FLOATP (number)) |
| 298 | 2450 { |
| 2451 char pigbuf[350]; /* see comments in float_to_string */ | |
| 2452 | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2453 float_to_string (pigbuf, XFLOAT_DATA (number)); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2454 return build_string (pigbuf); |
| 298 | 2455 } |
| 2456 | |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2457 if (sizeof (int) == sizeof (EMACS_INT)) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2458 sprintf (buffer, "%d", XINT (number)); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2459 else if (sizeof (long) == sizeof (EMACS_INT)) |
|
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
2460 sprintf (buffer, "%ld", (long) XINT (number)); |
|
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2461 else |
|
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2462 abort (); |
| 298 | 2463 return build_string (buffer); |
| 2464 } | |
| 2465 | |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2466 INLINE static int |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2467 digit_to_number (character, base) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2468 int character, base; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2469 { |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2470 int digit; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2471 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2472 if (character >= '0' && character <= '9') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2473 digit = character - '0'; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2474 else if (character >= 'a' && character <= 'z') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2475 digit = character - 'a' + 10; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2476 else if (character >= 'A' && character <= 'Z') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2477 digit = character - 'A' + 10; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2478 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2479 return -1; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2480 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2481 if (digit >= base) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2482 return -1; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2483 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2484 return digit; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2485 } |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2486 |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2487 DEFUN ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0, |
|
48996
7931f73b31db
(Fstring_to_number, Fminus): Better English in doc strings.
Francesco Potort? <pot@gnu.org>
parents:
48961
diff
changeset
|
2488 doc: /* Parse STRING as a decimal number and return the number. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2489 This parses both integers and floating point numbers. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2490 It ignores leading spaces and tabs. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2491 |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2492 If BASE, interpret STRING as a number in that base. If BASE isn't |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2493 present, base 10 is used. BASE must be between 2 and 16 (inclusive). |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2494 If the base used is not 10, floating point is not recognized. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2495 (string, base) |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2496 register Lisp_Object string, base; |
| 298 | 2497 { |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2498 register unsigned char *p; |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2499 register int b; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2500 int sign = 1; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2501 Lisp_Object val; |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2502 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2503 CHECK_STRING (string); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2504 |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2505 if (NILP (base)) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2506 b = 10; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2507 else |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2508 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2509 CHECK_NUMBER (base); |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2510 b = XINT (base); |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2511 if (b < 2 || b > 16) |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2512 Fsignal (Qargs_out_of_range, Fcons (base, Qnil)); |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2513 } |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2514 |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2515 /* Skip any whitespace at the front of the number. Some versions of |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2516 atoi do this anyway, so we might as well make Emacs lisp consistent. */ |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2517 p = SDATA (string); |
|
1987
cd893024d6b9
* data.c (Fstring_to_number): Declare p to be an unsigned char, to
Jim Blandy <jimb@redhat.com>
parents:
1914
diff
changeset
|
2518 while (*p == ' ' || *p == '\t') |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2519 p++; |
|
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2520 |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2521 if (*p == '-') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2522 { |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2523 sign = -1; |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2524 p++; |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2525 } |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2526 else if (*p == '+') |
|
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2527 p++; |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
2528 |
|
23420
460aba3ec682
(Fstring_to_number): Don't recognize floating point if base is not 10.
Kenichi Handa <handa@m17n.org>
parents:
23250
diff
changeset
|
2529 if (isfloat_string (p) && b == 10) |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2530 val = make_float (sign * atof (p)); |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2531 else |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2532 { |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2533 double v = 0; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2534 |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2535 while (1) |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2536 { |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2537 int digit = digit_to_number (*p++, b); |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2538 if (digit < 0) |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2539 break; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2540 v = v * b + digit; |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2541 } |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2542 |
|
39775
280975f8c65e
(Fstring_to_number): Use make_fixnum_or_float.
Gerd Moellmann <gerd@gnu.org>
parents:
39767
diff
changeset
|
2543 val = make_fixnum_or_float (sign * v); |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2544 } |
|
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2545 |
|
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2546 return val; |
| 298 | 2547 } |
|
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2548 |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2549 |
| 298 | 2550 enum arithop |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2551 { |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2552 Aadd, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2553 Asub, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2554 Amult, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2555 Adiv, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2556 Alogand, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2557 Alogior, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2558 Alogxor, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2559 Amax, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2560 Amin |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2561 }; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2562 |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2563 static Lisp_Object float_arith_driver P_ ((double, int, enum arithop, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2564 int, Lisp_Object *)); |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2565 extern Lisp_Object fmod_float (); |
|
1508
768d4c10c2bf
* data.c (Fset): See if current_alist_element points to itself
Jim Blandy <jimb@redhat.com>
parents:
1293
diff
changeset
|
2566 |
| 298 | 2567 Lisp_Object |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2568 arith_driver (code, nargs, args) |
| 298 | 2569 enum arithop code; |
| 2570 int nargs; | |
| 2571 register Lisp_Object *args; | |
| 2572 { | |
| 2573 register Lisp_Object val; | |
| 2574 register int argnum; | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2575 register EMACS_INT accum = 0; |
|
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2576 register EMACS_INT next; |
| 298 | 2577 |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2578 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2579 { |
| 2580 case Alogior: | |
| 2581 case Alogxor: | |
| 2582 case Aadd: | |
| 2583 case Asub: | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2584 accum = 0; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2585 break; |
| 298 | 2586 case Amult: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2587 accum = 1; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2588 break; |
| 298 | 2589 case Alogand: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2590 accum = -1; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2591 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2592 default: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2593 break; |
| 298 | 2594 } |
| 2595 | |
| 2596 for (argnum = 0; argnum < nargs; argnum++) | |
| 2597 { | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2598 /* Using args[argnum] as argument to CHECK_NUMBER_... */ |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2599 val = args[argnum]; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2600 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
| 298 | 2601 |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2602 if (FLOATP (val)) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2603 return float_arith_driver ((double) accum, argnum, code, |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2604 nargs, args); |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2605 args[argnum] = val; |
| 298 | 2606 next = XINT (args[argnum]); |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2607 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2608 { |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2609 case Aadd: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2610 accum += next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2611 break; |
| 298 | 2612 case Asub: |
|
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2613 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
| 298 | 2614 break; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2615 case Amult: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2616 accum *= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2617 break; |
| 298 | 2618 case Adiv: |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2619 if (!argnum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2620 accum = next; |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2621 else |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2622 { |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2623 if (next == 0) |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2624 Fsignal (Qarith_error, Qnil); |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2625 accum /= next; |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2626 } |
| 298 | 2627 break; |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2628 case Alogand: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2629 accum &= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2630 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2631 case Alogior: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2632 accum |= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2633 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2634 case Alogxor: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2635 accum ^= next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2636 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2637 case Amax: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2638 if (!argnum || next > accum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2639 accum = next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2640 break; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2641 case Amin: |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2642 if (!argnum || next < accum) |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2643 accum = next; |
|
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2644 break; |
| 298 | 2645 } |
| 2646 } | |
| 2647 | |
|
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2648 XSETINT (val, accum); |
| 298 | 2649 return val; |
| 2650 } | |
| 2651 | |
| 6201 | 2652 #undef isnan |
| 2653 #define isnan(x) ((x) != (x)) | |
| 2654 | |
|
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2655 static Lisp_Object |
| 298 | 2656 float_arith_driver (accum, argnum, code, nargs, args) |
| 2657 double accum; | |
| 2658 register int argnum; | |
| 2659 enum arithop code; | |
| 2660 int nargs; | |
| 2661 register Lisp_Object *args; | |
| 2662 { | |
| 2663 register Lisp_Object val; | |
| 2664 double next; | |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2665 |
| 298 | 2666 for (; argnum < nargs; argnum++) |
| 2667 { | |
| 2668 val = args[argnum]; /* using args[argnum] as argument to CHECK_NUMBER_... */ | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2669 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
| 298 | 2670 |
|
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2671 if (FLOATP (val)) |
| 298 | 2672 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2673 next = XFLOAT_DATA (val); |
| 298 | 2674 } |
| 2675 else | |
| 2676 { | |
| 2677 args[argnum] = val; /* runs into a compiler bug. */ | |
| 2678 next = XINT (args[argnum]); | |
| 2679 } | |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2680 switch (SWITCH_ENUM_CAST (code)) |
| 298 | 2681 { |
| 2682 case Aadd: | |
| 2683 accum += next; | |
| 2684 break; | |
| 2685 case Asub: | |
|
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2686 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
| 298 | 2687 break; |
| 2688 case Amult: | |
| 2689 accum *= next; | |
| 2690 break; | |
| 2691 case Adiv: | |
| 2692 if (!argnum) | |
| 2693 accum = next; | |
| 2694 else | |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2695 { |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2696 if (! IEEE_FLOATING_POINT && next == 0) |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2697 Fsignal (Qarith_error, Qnil); |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2698 accum /= next; |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2699 } |
| 298 | 2700 break; |
| 2701 case Alogand: | |
| 2702 case Alogior: | |
| 2703 case Alogxor: | |
| 2704 return wrong_type_argument (Qinteger_or_marker_p, val); | |
| 2705 case Amax: | |
| 6201 | 2706 if (!argnum || isnan (next) || next > accum) |
| 298 | 2707 accum = next; |
| 2708 break; | |
| 2709 case Amin: | |
| 6201 | 2710 if (!argnum || isnan (next) || next < accum) |
| 298 | 2711 accum = next; |
| 2712 break; | |
| 2713 } | |
| 2714 } | |
| 2715 | |
| 2716 return make_float (accum); | |
| 2717 } | |
|
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
2718 |
| 298 | 2719 |
| 2720 DEFUN ("+", Fplus, Splus, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2721 doc: /* Return sum of any number of arguments, which are numbers or markers. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2722 usage: (+ &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2723 (nargs, args) |
| 298 | 2724 int nargs; |
| 2725 Lisp_Object *args; | |
| 2726 { | |
| 2727 return arith_driver (Aadd, nargs, args); | |
| 2728 } | |
| 2729 | |
| 2730 DEFUN ("-", Fminus, Sminus, 0, MANY, 0, | |
|
48996
7931f73b31db
(Fstring_to_number, Fminus): Better English in doc strings.
Francesco Potort? <pot@gnu.org>
parents:
48961
diff
changeset
|
2731 doc: /* Negate number or subtract numbers or markers and return the result. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2732 With one arg, negates it. With more than one arg, |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2733 subtracts all but the first from the first. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2734 usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2735 (nargs, args) |
| 298 | 2736 int nargs; |
| 2737 Lisp_Object *args; | |
| 2738 { | |
| 2739 return arith_driver (Asub, nargs, args); | |
| 2740 } | |
| 2741 | |
| 2742 DEFUN ("*", Ftimes, Stimes, 0, MANY, 0, | |
| 41153 | 2743 doc: /* Return product of any number of arguments, which are numbers or markers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2744 usage: (* &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2745 (nargs, args) |
| 298 | 2746 int nargs; |
| 2747 Lisp_Object *args; | |
| 2748 { | |
| 2749 return arith_driver (Amult, nargs, args); | |
| 2750 } | |
| 2751 | |
| 2752 DEFUN ("/", Fquo, Squo, 2, MANY, 0, | |
| 41153 | 2753 doc: /* Return first argument divided by all the remaining arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2754 The arguments must be numbers or markers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2755 usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2756 (nargs, args) |
| 298 | 2757 int nargs; |
| 2758 Lisp_Object *args; | |
| 2759 { | |
|
55440
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2760 int argnum; |
| 55455 | 2761 for (argnum = 2; argnum < nargs; argnum++) |
|
55440
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2762 if (FLOATP (args[argnum])) |
|
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2763 return float_arith_driver (0, 0, Adiv, nargs, args); |
| 298 | 2764 return arith_driver (Adiv, nargs, args); |
| 2765 } | |
| 2766 | |
| 2767 DEFUN ("%", Frem, Srem, 2, 2, 0, | |
| 41153 | 2768 doc: /* Return remainder of X divided by Y. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2769 Both must be integers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2770 (x, y) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2771 register Lisp_Object x, y; |
| 298 | 2772 { |
| 2773 Lisp_Object val; | |
| 2774 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2775 CHECK_NUMBER_COERCE_MARKER (x); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2776 CHECK_NUMBER_COERCE_MARKER (y); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2777 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2778 if (XFASTINT (y) == 0) |
|
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2779 Fsignal (Qarith_error, Qnil); |
|
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2780 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2781 XSETINT (val, XINT (x) % XINT (y)); |
| 298 | 2782 return val; |
| 2783 } | |
| 2784 | |
|
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2785 #ifndef HAVE_FMOD |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2786 double |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2787 fmod (f1, f2) |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2788 double f1, f2; |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2789 { |
|
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2790 double r = f1; |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2791 |
|
13296
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2792 if (f2 < 0.0) |
|
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2793 f2 = -f2; |
|
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2794 |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2795 /* If the magnitude of the result exceeds that of the divisor, or |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2796 the sign of the result does not agree with that of the dividend, |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2797 iterate with the reduced value. This does not yield a |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2798 particularly accurate result, but at least it will be in the |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2799 range promised by fmod. */ |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2800 do |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2801 r -= f2 * floor (r / f2); |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2802 while (f2 <= (r < 0 ? -r : r) || ((r < 0) != (f1 < 0) && ! isnan (r))); |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2803 |
|
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2804 return r; |
|
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2805 } |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2806 #endif /* ! HAVE_FMOD */ |
|
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2807 |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2808 DEFUN ("mod", Fmod, Smod, 2, 2, 0, |
| 41153 | 2809 doc: /* Return X modulo Y. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2810 The result falls between zero (inclusive) and Y (exclusive). |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2811 Both X and Y must be numbers or markers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2812 (x, y) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2813 register Lisp_Object x, y; |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2814 { |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2815 Lisp_Object val; |
|
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2816 EMACS_INT i1, i2; |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2817 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2818 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (x); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2819 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (y); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2820 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2821 if (FLOATP (x) || FLOATP (y)) |
|
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2822 return fmod_float (x, y); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2823 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2824 i1 = XINT (x); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2825 i2 = XINT (y); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2826 |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2827 if (i2 == 0) |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2828 Fsignal (Qarith_error, Qnil); |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2829 |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2830 i1 %= i2; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2831 |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2832 /* If the "remainder" comes out with the wrong sign, fix it. */ |
|
11155
0aede77c1593
(Fmod): Fix the final adjustment, when i2 < 0 and i1 == 0.
Richard M. Stallman <rms@gnu.org>
parents:
11019
diff
changeset
|
2833 if (i2 < 0 ? i1 > 0 : i1 < 0) |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2834 i1 += i2; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2835 |
|
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2836 XSETINT (val, i1); |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2837 return val; |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2838 } |
|
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2839 |
| 298 | 2840 DEFUN ("max", Fmax, Smax, 1, MANY, 0, |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2841 doc: /* Return largest of all the arguments (which must be numbers or markers). |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2842 The value is always a number; markers are converted to numbers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2843 usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2844 (nargs, args) |
| 298 | 2845 int nargs; |
| 2846 Lisp_Object *args; | |
| 2847 { | |
| 2848 return arith_driver (Amax, nargs, args); | |
| 2849 } | |
| 2850 | |
| 2851 DEFUN ("min", Fmin, Smin, 1, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2852 doc: /* Return smallest of all the arguments (which must be numbers or markers). |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2853 The value is always a number; markers are converted to numbers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2854 usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2855 (nargs, args) |
| 298 | 2856 int nargs; |
| 2857 Lisp_Object *args; | |
| 2858 { | |
| 2859 return arith_driver (Amin, nargs, args); | |
| 2860 } | |
| 2861 | |
| 2862 DEFUN ("logand", Flogand, Slogand, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2863 doc: /* Return bitwise-and of all the arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2864 Arguments may be integers, or markers converted to integers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2865 usage: (logand &rest INTS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2866 (nargs, args) |
| 298 | 2867 int nargs; |
| 2868 Lisp_Object *args; | |
| 2869 { | |
| 2870 return arith_driver (Alogand, nargs, args); | |
| 2871 } | |
| 2872 | |
| 2873 DEFUN ("logior", Flogior, Slogior, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2874 doc: /* Return bitwise-or of all the arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2875 Arguments may be integers, or markers converted to integers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2876 usage: (logior &rest INTS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2877 (nargs, args) |
| 298 | 2878 int nargs; |
| 2879 Lisp_Object *args; | |
| 2880 { | |
| 2881 return arith_driver (Alogior, nargs, args); | |
| 2882 } | |
| 2883 | |
| 2884 DEFUN ("logxor", Flogxor, Slogxor, 0, MANY, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2885 doc: /* Return bitwise-exclusive-or of all the arguments. |
|
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2886 Arguments may be integers, or markers converted to integers. |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2887 usage: (logxor &rest INTS-OR-MARKERS) */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2888 (nargs, args) |
| 298 | 2889 int nargs; |
| 2890 Lisp_Object *args; | |
| 2891 { | |
| 2892 return arith_driver (Alogxor, nargs, args); | |
| 2893 } | |
| 2894 | |
| 2895 DEFUN ("ash", Fash, Sash, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2896 doc: /* Return VALUE with its bits shifted left by COUNT. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2897 If COUNT is negative, shifting is actually to the right. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2898 In this case, the sign bit is duplicated. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2899 (value, count) |
|
11002
ff115809a39e
(Fash): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
10951
diff
changeset
|
2900 register Lisp_Object value, count; |
| 298 | 2901 { |
| 2902 register Lisp_Object val; | |
| 2903 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2904 CHECK_NUMBER (value); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2905 CHECK_NUMBER (count); |
| 298 | 2906 |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2907 if (XINT (count) >= BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2908 XSETINT (val, 0); |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2909 else if (XINT (count) > 0) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2910 XSETINT (val, XINT (value) << XFASTINT (count)); |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2911 else if (XINT (count) <= -BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2912 XSETINT (val, XINT (value) < 0 ? -1 : 0); |
| 298 | 2913 else |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2914 XSETINT (val, XINT (value) >> -XINT (count)); |
| 298 | 2915 return val; |
| 2916 } | |
| 2917 | |
| 2918 DEFUN ("lsh", Flsh, Slsh, 2, 2, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2919 doc: /* Return VALUE with its bits shifted left by COUNT. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2920 If COUNT is negative, shifting is actually to the right. |
|
47276
fbe02a367006
(Flsh): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
46831
diff
changeset
|
2921 In this case, zeros are shifted in on the left. */) |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2922 (value, count) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2923 register Lisp_Object value, count; |
| 298 | 2924 { |
| 2925 register Lisp_Object val; | |
| 2926 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2927 CHECK_NUMBER (value); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2928 CHECK_NUMBER (count); |
| 298 | 2929 |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2930 if (XINT (count) >= BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2931 XSETINT (val, 0); |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2932 else if (XINT (count) > 0) |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2933 XSETINT (val, (EMACS_UINT) XUINT (value) << XFASTINT (count)); |
|
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2934 else if (XINT (count) <= -BITS_PER_EMACS_INT) |
|
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2935 XSETINT (val, 0); |
| 298 | 2936 else |
|
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2937 XSETINT (val, (EMACS_UINT) XUINT (value) >> -XINT (count)); |
| 298 | 2938 return val; |
| 2939 } | |
| 2940 | |
| 2941 DEFUN ("1+", Fadd1, Sadd1, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2942 doc: /* Return NUMBER plus one. NUMBER may be a number or a marker. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2943 Markers are converted to integers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2944 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2945 register Lisp_Object number; |
| 298 | 2946 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2947 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2948 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2949 if (FLOATP (number)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2950 return (make_float (1.0 + XFLOAT_DATA (number))); |
| 298 | 2951 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2952 XSETINT (number, XINT (number) + 1); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2953 return number; |
| 298 | 2954 } |
| 2955 | |
| 2956 DEFUN ("1-", Fsub1, Ssub1, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2957 doc: /* Return NUMBER minus one. NUMBER may be a number or a marker. |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2958 Markers are converted to integers. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2959 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2960 register Lisp_Object number; |
| 298 | 2961 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2962 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2963 |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2964 if (FLOATP (number)) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2965 return (make_float (-1.0 + XFLOAT_DATA (number))); |
| 298 | 2966 |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2967 XSETINT (number, XINT (number) - 1); |
|
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2968 return number; |
| 298 | 2969 } |
| 2970 | |
| 2971 DEFUN ("lognot", Flognot, Slognot, 1, 1, 0, | |
|
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2972 doc: /* Return the bitwise complement of NUMBER. NUMBER must be an integer. */) |
|
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2973 (number) |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2974 register Lisp_Object number; |
| 298 | 2975 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2976 CHECK_NUMBER (number); |
|
14096
f3766d691555
(Flognot): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14066
diff
changeset
|
2977 XSETINT (number, ~XINT (number)); |
|
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2978 return number; |
| 298 | 2979 } |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2980 |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2981 DEFUN ("byteorder", Fbyteorder, Sbyteorder, 0, 0, 0, |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2982 doc: /* Return the byteorder for the machine. |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2983 Returns 66 (ASCII uppercase B) for big endian machines or 108 (ASCII |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2984 lowercase l) for small endian machines. */) |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2985 () |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2986 { |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2987 unsigned i = 0x04030201; |
|
54660
122a60d4f165
data.c (Fbyteorder): Make test work even if unsigned is not 4 bytes.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54627
diff
changeset
|
2988 int order = *(char *)&i == 1 ? 108 : 66; |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2989 |
|
53966
26dc8943ee64
Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53910
diff
changeset
|
2990 return make_number (order); |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2991 } |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2992 |
|
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2993 |
| 298 | 2994 |
| 2995 void | |
| 2996 syms_of_data () | |
| 2997 { | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2998 Lisp_Object error_tail, arith_tail; |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2999 |
| 298 | 3000 Qquote = intern ("quote"); |
| 3001 Qlambda = intern ("lambda"); | |
| 3002 Qsubr = intern ("subr"); | |
| 3003 Qerror_conditions = intern ("error-conditions"); | |
| 3004 Qerror_message = intern ("error-message"); | |
| 3005 Qtop_level = intern ("top-level"); | |
| 3006 | |
| 3007 Qerror = intern ("error"); | |
| 3008 Qquit = intern ("quit"); | |
| 3009 Qwrong_type_argument = intern ("wrong-type-argument"); | |
| 3010 Qargs_out_of_range = intern ("args-out-of-range"); | |
| 3011 Qvoid_function = intern ("void-function"); | |
| 648 | 3012 Qcyclic_function_indirection = intern ("cyclic-function-indirection"); |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3013 Qcyclic_variable_indirection = intern ("cyclic-variable-indirection"); |
| 298 | 3014 Qvoid_variable = intern ("void-variable"); |
| 3015 Qsetting_constant = intern ("setting-constant"); | |
| 3016 Qinvalid_read_syntax = intern ("invalid-read-syntax"); | |
| 3017 | |
| 3018 Qinvalid_function = intern ("invalid-function"); | |
| 3019 Qwrong_number_of_arguments = intern ("wrong-number-of-arguments"); | |
| 3020 Qno_catch = intern ("no-catch"); | |
| 3021 Qend_of_file = intern ("end-of-file"); | |
| 3022 Qarith_error = intern ("arith-error"); | |
| 3023 Qbeginning_of_buffer = intern ("beginning-of-buffer"); | |
| 3024 Qend_of_buffer = intern ("end-of-buffer"); | |
| 3025 Qbuffer_read_only = intern ("buffer-read-only"); | |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3026 Qtext_read_only = intern ("text-read-only"); |
| 4036 | 3027 Qmark_inactive = intern ("mark-inactive"); |
| 298 | 3028 |
| 3029 Qlistp = intern ("listp"); | |
| 3030 Qconsp = intern ("consp"); | |
| 3031 Qsymbolp = intern ("symbolp"); | |
| 26931 | 3032 Qkeywordp = intern ("keywordp"); |
| 298 | 3033 Qintegerp = intern ("integerp"); |
| 3034 Qnatnump = intern ("natnump"); | |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3035 Qwholenump = intern ("wholenump"); |
| 298 | 3036 Qstringp = intern ("stringp"); |
| 3037 Qarrayp = intern ("arrayp"); | |
| 3038 Qsequencep = intern ("sequencep"); | |
| 3039 Qbufferp = intern ("bufferp"); | |
| 3040 Qvectorp = intern ("vectorp"); | |
| 3041 Qchar_or_string_p = intern ("char-or-string-p"); | |
| 3042 Qmarkerp = intern ("markerp"); | |
| 1293 | 3043 Qbuffer_or_string_p = intern ("buffer-or-string-p"); |
| 298 | 3044 Qinteger_or_marker_p = intern ("integer-or-marker-p"); |
| 3045 Qboundp = intern ("boundp"); | |
| 3046 Qfboundp = intern ("fboundp"); | |
| 3047 | |
| 3048 Qfloatp = intern ("floatp"); | |
| 3049 Qnumberp = intern ("numberp"); | |
| 3050 Qnumber_or_marker_p = intern ("number-or-marker-p"); | |
| 3051 | |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3052 Qchar_table_p = intern ("char-table-p"); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3053 Qvector_or_char_table_p = intern ("vector-or-char-table-p"); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3054 |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3055 Qsubrp = intern ("subrp"); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3056 Qunevalled = intern ("unevalled"); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3057 Qmany = intern ("many"); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3058 |
| 298 | 3059 Qcdr = intern ("cdr"); |
| 3060 | |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
3061 /* Handle automatic advice activation */ |
|
8448
b6335ce87e16
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
Richard M. Stallman <rms@gnu.org>
parents:
8415
diff
changeset
|
3062 Qad_advice_info = intern ("ad-advice-info"); |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
3063 Qad_activate_internal = intern ("ad-activate-internal"); |
|
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
3064 |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3065 error_tail = Fcons (Qerror, Qnil); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3066 |
| 298 | 3067 /* ERROR is used as a signaler for random errors for which nothing else is right */ |
| 3068 | |
| 3069 Fput (Qerror, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3070 error_tail); |
| 298 | 3071 Fput (Qerror, Qerror_message, |
| 3072 build_string ("error")); | |
| 3073 | |
| 3074 Fput (Qquit, Qerror_conditions, | |
| 3075 Fcons (Qquit, Qnil)); | |
| 3076 Fput (Qquit, Qerror_message, | |
| 3077 build_string ("Quit")); | |
| 3078 | |
| 3079 Fput (Qwrong_type_argument, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3080 Fcons (Qwrong_type_argument, error_tail)); |
| 298 | 3081 Fput (Qwrong_type_argument, Qerror_message, |
| 3082 build_string ("Wrong type argument")); | |
| 3083 | |
| 3084 Fput (Qargs_out_of_range, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3085 Fcons (Qargs_out_of_range, error_tail)); |
| 298 | 3086 Fput (Qargs_out_of_range, Qerror_message, |
| 3087 build_string ("Args out of range")); | |
| 3088 | |
| 3089 Fput (Qvoid_function, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3090 Fcons (Qvoid_function, error_tail)); |
| 298 | 3091 Fput (Qvoid_function, Qerror_message, |
| 3092 build_string ("Symbol's function definition is void")); | |
| 3093 | |
| 648 | 3094 Fput (Qcyclic_function_indirection, Qerror_conditions, |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3095 Fcons (Qcyclic_function_indirection, error_tail)); |
| 648 | 3096 Fput (Qcyclic_function_indirection, Qerror_message, |
| 3097 build_string ("Symbol's chain of function indirections contains a loop")); | |
| 3098 | |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3099 Fput (Qcyclic_variable_indirection, Qerror_conditions, |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3100 Fcons (Qcyclic_variable_indirection, error_tail)); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3101 Fput (Qcyclic_variable_indirection, Qerror_message, |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3102 build_string ("Symbol's chain of variable indirections contains a loop")); |
|
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3103 |
|
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3104 Qcircular_list = intern ("circular-list"); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3105 staticpro (&Qcircular_list); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3106 Fput (Qcircular_list, Qerror_conditions, |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3107 Fcons (Qcircular_list, error_tail)); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3108 Fput (Qcircular_list, Qerror_message, |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3109 build_string ("List contains a loop")); |
|
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3110 |
| 298 | 3111 Fput (Qvoid_variable, Qerror_conditions, |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3112 Fcons (Qvoid_variable, error_tail)); |
| 298 | 3113 Fput (Qvoid_variable, Qerror_message, |
| 3114 build_string ("Symbol's value as variable is void")); | |
| 3115 | |
| 3116 Fput (Qsetting_constant, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3117 Fcons (Qsetting_constant, error_tail)); |
| 298 | 3118 Fput (Qsetting_constant, Qerror_message, |
| 3119 build_string ("Attempt to set a constant symbol")); | |
| 3120 | |
| 3121 Fput (Qinvalid_read_syntax, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3122 Fcons (Qinvalid_read_syntax, error_tail)); |
| 298 | 3123 Fput (Qinvalid_read_syntax, Qerror_message, |
| 3124 build_string ("Invalid read syntax")); | |
| 3125 | |
| 3126 Fput (Qinvalid_function, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3127 Fcons (Qinvalid_function, error_tail)); |
| 298 | 3128 Fput (Qinvalid_function, Qerror_message, |
| 3129 build_string ("Invalid function")); | |
| 3130 | |
| 3131 Fput (Qwrong_number_of_arguments, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3132 Fcons (Qwrong_number_of_arguments, error_tail)); |
| 298 | 3133 Fput (Qwrong_number_of_arguments, Qerror_message, |
| 3134 build_string ("Wrong number of arguments")); | |
| 3135 | |
| 3136 Fput (Qno_catch, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3137 Fcons (Qno_catch, error_tail)); |
| 298 | 3138 Fput (Qno_catch, Qerror_message, |
| 3139 build_string ("No catch for tag")); | |
| 3140 | |
| 3141 Fput (Qend_of_file, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3142 Fcons (Qend_of_file, error_tail)); |
| 298 | 3143 Fput (Qend_of_file, Qerror_message, |
| 3144 build_string ("End of file during parsing")); | |
| 3145 | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3146 arith_tail = Fcons (Qarith_error, error_tail); |
| 298 | 3147 Fput (Qarith_error, Qerror_conditions, |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3148 arith_tail); |
| 298 | 3149 Fput (Qarith_error, Qerror_message, |
| 3150 build_string ("Arithmetic error")); | |
| 3151 | |
| 3152 Fput (Qbeginning_of_buffer, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3153 Fcons (Qbeginning_of_buffer, error_tail)); |
| 298 | 3154 Fput (Qbeginning_of_buffer, Qerror_message, |
| 3155 build_string ("Beginning of buffer")); | |
| 3156 | |
| 3157 Fput (Qend_of_buffer, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3158 Fcons (Qend_of_buffer, error_tail)); |
| 298 | 3159 Fput (Qend_of_buffer, Qerror_message, |
| 3160 build_string ("End of buffer")); | |
| 3161 | |
| 3162 Fput (Qbuffer_read_only, Qerror_conditions, | |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3163 Fcons (Qbuffer_read_only, error_tail)); |
| 298 | 3164 Fput (Qbuffer_read_only, Qerror_message, |
| 3165 build_string ("Buffer is read-only")); | |
| 3166 | |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3167 Fput (Qtext_read_only, Qerror_conditions, |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3168 Fcons (Qtext_read_only, error_tail)); |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3169 Fput (Qtext_read_only, Qerror_message, |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3170 build_string ("Text is read-only")); |
|
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3171 |
|
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3172 Qrange_error = intern ("range-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3173 Qdomain_error = intern ("domain-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3174 Qsingularity_error = intern ("singularity-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3175 Qoverflow_error = intern ("overflow-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3176 Qunderflow_error = intern ("underflow-error"); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3177 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3178 Fput (Qdomain_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3179 Fcons (Qdomain_error, arith_tail)); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3180 Fput (Qdomain_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3181 build_string ("Arithmetic domain error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3182 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3183 Fput (Qrange_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3184 Fcons (Qrange_error, arith_tail)); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3185 Fput (Qrange_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3186 build_string ("Arithmetic range error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3187 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3188 Fput (Qsingularity_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3189 Fcons (Qsingularity_error, Fcons (Qdomain_error, arith_tail))); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3190 Fput (Qsingularity_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3191 build_string ("Arithmetic singularity error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3192 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3193 Fput (Qoverflow_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3194 Fcons (Qoverflow_error, Fcons (Qdomain_error, arith_tail))); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3195 Fput (Qoverflow_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3196 build_string ("Arithmetic overflow error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3197 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3198 Fput (Qunderflow_error, Qerror_conditions, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3199 Fcons (Qunderflow_error, Fcons (Qdomain_error, arith_tail))); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3200 Fput (Qunderflow_error, Qerror_message, |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3201 build_string ("Arithmetic underflow error")); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3202 |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3203 staticpro (&Qrange_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3204 staticpro (&Qdomain_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3205 staticpro (&Qsingularity_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3206 staticpro (&Qoverflow_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3207 staticpro (&Qunderflow_error); |
|
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3208 |
| 298 | 3209 staticpro (&Qnil); |
| 3210 staticpro (&Qt); | |
| 3211 staticpro (&Qquote); | |
| 3212 staticpro (&Qlambda); | |
| 3213 staticpro (&Qsubr); | |
| 3214 staticpro (&Qunbound); | |
| 3215 staticpro (&Qerror_conditions); | |
| 3216 staticpro (&Qerror_message); | |
| 3217 staticpro (&Qtop_level); | |
| 3218 | |
| 3219 staticpro (&Qerror); | |
| 3220 staticpro (&Qquit); | |
| 3221 staticpro (&Qwrong_type_argument); | |
| 3222 staticpro (&Qargs_out_of_range); | |
| 3223 staticpro (&Qvoid_function); | |
| 648 | 3224 staticpro (&Qcyclic_function_indirection); |
|
61888
a0e6e458f2fc
(syms_of_data) Staticpro Qcyclic_variable_indirection.
Kim F. Storm <storm@cua.dk>
parents:
61686
diff
changeset
|
3225 staticpro (&Qcyclic_variable_indirection); |
| 298 | 3226 staticpro (&Qvoid_variable); |
| 3227 staticpro (&Qsetting_constant); | |
| 3228 staticpro (&Qinvalid_read_syntax); | |
| 3229 staticpro (&Qwrong_number_of_arguments); | |
| 3230 staticpro (&Qinvalid_function); | |
| 3231 staticpro (&Qno_catch); | |
| 3232 staticpro (&Qend_of_file); | |
| 3233 staticpro (&Qarith_error); | |
| 3234 staticpro (&Qbeginning_of_buffer); | |
| 3235 staticpro (&Qend_of_buffer); | |
| 3236 staticpro (&Qbuffer_read_only); | |
|
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3237 staticpro (&Qtext_read_only); |
|
4037
aecb99c65ab0
(syms_of_data): Staticpro Qmark_inactive.
Roland McGrath <roland@gnu.org>
parents:
4036
diff
changeset
|
3238 staticpro (&Qmark_inactive); |
| 298 | 3239 |
| 3240 staticpro (&Qlistp); | |
| 3241 staticpro (&Qconsp); | |
| 3242 staticpro (&Qsymbolp); | |
| 26931 | 3243 staticpro (&Qkeywordp); |
| 298 | 3244 staticpro (&Qintegerp); |
| 3245 staticpro (&Qnatnump); | |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3246 staticpro (&Qwholenump); |
| 298 | 3247 staticpro (&Qstringp); |
| 3248 staticpro (&Qarrayp); | |
| 3249 staticpro (&Qsequencep); | |
| 3250 staticpro (&Qbufferp); | |
| 3251 staticpro (&Qvectorp); | |
| 3252 staticpro (&Qchar_or_string_p); | |
| 3253 staticpro (&Qmarkerp); | |
| 1293 | 3254 staticpro (&Qbuffer_or_string_p); |
| 298 | 3255 staticpro (&Qinteger_or_marker_p); |
| 3256 staticpro (&Qfloatp); | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3257 staticpro (&Qnumberp); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3258 staticpro (&Qnumber_or_marker_p); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3259 staticpro (&Qchar_table_p); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3260 staticpro (&Qvector_or_char_table_p); |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3261 staticpro (&Qsubrp); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3262 staticpro (&Qmany); |
|
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3263 staticpro (&Qunevalled); |
| 298 | 3264 |
| 3265 staticpro (&Qboundp); | |
| 3266 staticpro (&Qfboundp); | |
| 3267 staticpro (&Qcdr); | |
|
8448
b6335ce87e16
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
Richard M. Stallman <rms@gnu.org>
parents:
8415
diff
changeset
|
3268 staticpro (&Qad_advice_info); |
|
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
3269 staticpro (&Qad_activate_internal); |
| 298 | 3270 |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3271 /* Types that type-of returns. */ |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3272 Qinteger = intern ("integer"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3273 Qsymbol = intern ("symbol"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3274 Qstring = intern ("string"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3275 Qcons = intern ("cons"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3276 Qmarker = intern ("marker"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3277 Qoverlay = intern ("overlay"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3278 Qfloat = intern ("float"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3279 Qwindow_configuration = intern ("window-configuration"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3280 Qprocess = intern ("process"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3281 Qwindow = intern ("window"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3282 /* Qsubr = intern ("subr"); */ |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3283 Qcompiled_function = intern ("compiled-function"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3284 Qbuffer = intern ("buffer"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3285 Qframe = intern ("frame"); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3286 Qvector = intern ("vector"); |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3287 Qchar_table = intern ("char-table"); |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3288 Qbool_vector = intern ("bool-vector"); |
| 26185 | 3289 Qhash_table = intern ("hash-table"); |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3290 |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3291 staticpro (&Qinteger); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3292 staticpro (&Qsymbol); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3293 staticpro (&Qstring); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3294 staticpro (&Qcons); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3295 staticpro (&Qmarker); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3296 staticpro (&Qoverlay); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3297 staticpro (&Qfloat); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3298 staticpro (&Qwindow_configuration); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3299 staticpro (&Qprocess); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3300 staticpro (&Qwindow); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3301 /* staticpro (&Qsubr); */ |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3302 staticpro (&Qcompiled_function); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3303 staticpro (&Qbuffer); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3304 staticpro (&Qframe); |
|
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3305 staticpro (&Qvector); |
|
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3306 staticpro (&Qchar_table); |
|
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3307 staticpro (&Qbool_vector); |
| 26185 | 3308 staticpro (&Qhash_table); |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3309 |
|
39575
f847e069b0f6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3310 defsubr (&Sindirect_variable); |
|
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
3311 defsubr (&Sinteractive_form); |
| 298 | 3312 defsubr (&Seq); |
| 3313 defsubr (&Snull); | |
|
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3314 defsubr (&Stype_of); |
| 298 | 3315 defsubr (&Slistp); |
| 3316 defsubr (&Snlistp); | |
| 3317 defsubr (&Sconsp); | |
| 3318 defsubr (&Satom); | |
| 3319 defsubr (&Sintegerp); | |
|
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3320 defsubr (&Sinteger_or_marker_p); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3321 defsubr (&Snumberp); |
|
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3322 defsubr (&Snumber_or_marker_p); |
| 298 | 3323 defsubr (&Sfloatp); |
| 3324 defsubr (&Snatnump); | |
| 3325 defsubr (&Ssymbolp); | |
| 26931 | 3326 defsubr (&Skeywordp); |
| 298 | 3327 defsubr (&Sstringp); |
|
20793
b2af60896559
(syms_of_data): Register multibyte-string-p as a Lisp
Kenichi Handa <handa@m17n.org>
parents:
20716
diff
changeset
|
3328 defsubr (&Smultibyte_string_p); |
| 298 | 3329 defsubr (&Svectorp); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3330 defsubr (&Schar_table_p); |
|
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3331 defsubr (&Svector_or_char_table_p); |
|
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3332 defsubr (&Sbool_vector_p); |
| 298 | 3333 defsubr (&Sarrayp); |
| 3334 defsubr (&Ssequencep); | |
| 3335 defsubr (&Sbufferp); | |
| 3336 defsubr (&Smarkerp); | |
| 3337 defsubr (&Ssubrp); | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
3338 defsubr (&Sbyte_code_function_p); |
| 298 | 3339 defsubr (&Schar_or_string_p); |
| 3340 defsubr (&Scar); | |
| 3341 defsubr (&Scdr); | |
| 3342 defsubr (&Scar_safe); | |
| 3343 defsubr (&Scdr_safe); | |
| 3344 defsubr (&Ssetcar); | |
| 3345 defsubr (&Ssetcdr); | |
| 3346 defsubr (&Ssymbol_function); | |
| 648 | 3347 defsubr (&Sindirect_function); |
| 298 | 3348 defsubr (&Ssymbol_plist); |
| 3349 defsubr (&Ssymbol_name); | |
| 3350 defsubr (&Smakunbound); | |
| 3351 defsubr (&Sfmakunbound); | |
| 3352 defsubr (&Sboundp); | |
| 3353 defsubr (&Sfboundp); | |
| 3354 defsubr (&Sfset); | |
|
2565
c1a1557bffde
(Fdefine_function): Changed name back to Fdefalias, so we get things
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2548
diff
changeset
|
3355 defsubr (&Sdefalias); |
| 298 | 3356 defsubr (&Ssetplist); |
| 3357 defsubr (&Ssymbol_value); | |
| 3358 defsubr (&Sset); | |
| 3359 defsubr (&Sdefault_boundp); | |
| 3360 defsubr (&Sdefault_value); | |
| 3361 defsubr (&Sset_default); | |
| 3362 defsubr (&Ssetq_default); | |
| 3363 defsubr (&Smake_variable_buffer_local); | |
| 3364 defsubr (&Smake_local_variable); | |
| 3365 defsubr (&Skill_local_variable); | |
|
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
3366 defsubr (&Smake_variable_frame_local); |
|
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
3367 defsubr (&Slocal_variable_p); |
|
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
3368 defsubr (&Slocal_variable_if_set_p); |
|
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
3369 defsubr (&Svariable_binding_locus); |
|
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
3370 defsubr (&Sterminal_local_value); |
|
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
3371 defsubr (&Sset_terminal_local_value); |
| 298 | 3372 defsubr (&Saref); |
| 3373 defsubr (&Saset); | |
|
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
3374 defsubr (&Snumber_to_string); |
|
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
3375 defsubr (&Sstring_to_number); |
| 298 | 3376 defsubr (&Seqlsign); |
| 3377 defsubr (&Slss); | |
| 3378 defsubr (&Sgtr); | |
| 3379 defsubr (&Sleq); | |
| 3380 defsubr (&Sgeq); | |
| 3381 defsubr (&Sneq); | |
| 3382 defsubr (&Szerop); | |
| 3383 defsubr (&Splus); | |
| 3384 defsubr (&Sminus); | |
| 3385 defsubr (&Stimes); | |
| 3386 defsubr (&Squo); | |
| 3387 defsubr (&Srem); | |
|
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
3388 defsubr (&Smod); |
| 298 | 3389 defsubr (&Smax); |
| 3390 defsubr (&Smin); | |
| 3391 defsubr (&Slogand); | |
| 3392 defsubr (&Slogior); | |
| 3393 defsubr (&Slogxor); | |
| 3394 defsubr (&Slsh); | |
| 3395 defsubr (&Sash); | |
| 3396 defsubr (&Sadd1); | |
| 3397 defsubr (&Ssub1); | |
| 3398 defsubr (&Slognot); | |
|
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3399 defsubr (&Sbyteorder); |
|
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3400 defsubr (&Ssubr_arity); |
|
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
3401 defsubr (&Ssubr_name); |
|
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3402 |
|
9954
18b408b05189
(syms_of_data): Set Qwholenump as function, not variable.
Karl Heuer <kwzh@gnu.org>
parents:
9895
diff
changeset
|
3403 XSYMBOL (Qwholenump)->function = XSYMBOL (Qnatnump)->function; |
|
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
39575
diff
changeset
|
3404 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3405 DEFVAR_LISP ("most-positive-fixnum", &Vmost_positive_fixnum, |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3406 doc: /* The largest value that is representable in a Lisp integer. */); |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3407 Vmost_positive_fixnum = make_number (MOST_POSITIVE_FIXNUM); |
|
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potort? <pot@gnu.org>
parents:
48723
diff
changeset
|
3408 |
|
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3409 DEFVAR_LISP ("most-negative-fixnum", &Vmost_negative_fixnum, |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3410 doc: /* The smallest value that is representable in a Lisp integer. */); |
|
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3411 Vmost_negative_fixnum = make_number (MOST_NEGATIVE_FIXNUM); |
| 298 | 3412 } |
| 3413 | |
| 490 | 3414 SIGTYPE |
| 298 | 3415 arith_error (signo) |
| 3416 int signo; | |
| 3417 { | |
|
16150
f388360fb59a
(arith_error) [POSIX_SIGNALS]: Don't reestablish handler.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3418 #if defined(USG) && !defined(POSIX_SIGNALS) |
| 298 | 3419 /* USG systems forget handlers when they are used; |
| 3420 must reestablish each time */ | |
| 3421 signal (signo, arith_error); | |
| 3422 #endif /* USG */ | |
| 3423 #ifdef VMS | |
| 3424 /* VMS systems are like USG. */ | |
| 3425 signal (signo, arith_error); | |
| 3426 #endif /* VMS */ | |
| 3427 #ifdef BSD4_1 | |
| 3428 sigrelse (SIGFPE); | |
| 3429 #else /* not BSD4_1 */ | |
| 638 | 3430 sigsetmask (SIGEMPTYMASK); |
| 298 | 3431 #endif /* not BSD4_1 */ |
| 3432 | |
|
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58733
diff
changeset
|
3433 SIGNAL_THREAD_CHECK (signo); |
| 298 | 3434 Fsignal (Qarith_error, Qnil); |
| 3435 } | |
| 3436 | |
| 21514 | 3437 void |
| 298 | 3438 init_data () |
| 3439 { | |
| 3440 /* Don't do this if just dumping out. | |
| 3441 We don't want to call `signal' in this case | |
| 3442 so that we don't have trouble with dumping | |
| 3443 signal-delivering routines in an inconsistent state. */ | |
| 3444 #ifndef CANNOT_DUMP | |
| 3445 if (!initialized) | |
| 3446 return; | |
| 3447 #endif /* CANNOT_DUMP */ | |
| 3448 signal (SIGFPE, arith_error); | |
|
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
3449 |
| 298 | 3450 #ifdef uts |
| 3451 signal (SIGEMT, arith_error); | |
| 3452 #endif /* uts */ | |
| 3453 } | |
| 52401 | 3454 |
| 3455 /* arch-tag: 25879798-b84d-479a-9c89-7d148e2109f7 | |
| 3456 (do not change this comment) */ |
