aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2007-11-16 20:36:34 +0000
committerStefan Monnier2007-11-16 20:36:34 +0000
commit30f95089ed1c8b84dd111fc5edf07b8de07401b2 (patch)
tree51c9396421f9f5d06f781b792189681df4aac8e1 /src
parentde8ebf6226a1948e9df250abd9a42b4ccff2a5c7 (diff)
downloademacs-30f95089ed1c8b84dd111fc5edf07b8de07401b2.tar.gz
emacs-30f95089ed1c8b84dd111fc5edf07b8de07401b2.zip
* alloc.c (ALLOCATE_PSEUDOVECTOR): Move to lisp.h.
(allocate_pseudovector): Make non-static. * lisp.h (enum pvec_type): New tag PVEC_OTHER. (allocate_pseudovector): Declare. (ALLOCATE_PSEUDOVECTOR): Move from alloc.c
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog12
-rw-r--r--src/alloc.c6
-rw-r--r--src/lisp.h8
3 files changed, 18 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f0a2e29bfee..bdc58ad4639 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,15 @@
12007-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * alloc.c (ALLOCATE_PSEUDOVECTOR): Move to lisp.h.
4 (allocate_pseudovector): Make non-static.
5 * lisp.h (enum pvec_type): New tag PVEC_OTHER.
6 (allocate_pseudovector): Declare.
7 (ALLOCATE_PSEUDOVECTOR): Move from alloc.c
8
12007-11-15 Andreas Schwab <schwab@suse.de> 92007-11-15 Andreas Schwab <schwab@suse.de>
2 10
3 * editfns.c (Fformat): Correctly format EMACS_INT values. Also 11 * editfns.c (Fformat): Correctly format EMACS_INT values.
4 take precision into account when formatting an integer. 12 Also take precision into account when formatting an integer.
5 13
6 * keyboard.c (Fevent_symbol_parse_modifiers): Fix declaration. 14 * keyboard.c (Fevent_symbol_parse_modifiers): Fix declaration.
7 15
diff --git a/src/alloc.c b/src/alloc.c
index 12b7ac5e0bf..52565255a1d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2967,7 +2967,7 @@ allocate_vector (nslots)
2967 2967
2968/* Allocate other vector-like structures. */ 2968/* Allocate other vector-like structures. */
2969 2969
2970static struct Lisp_Vector * 2970struct Lisp_Vector *
2971allocate_pseudovector (memlen, lisplen, tag) 2971allocate_pseudovector (memlen, lisplen, tag)
2972 int memlen, lisplen; 2972 int memlen, lisplen;
2973 EMACS_INT tag; 2973 EMACS_INT tag;
@@ -2983,10 +2983,6 @@ allocate_pseudovector (memlen, lisplen, tag)
2983 XSETPVECTYPE (v, tag); /* Add the appropriate tag. */ 2983 XSETPVECTYPE (v, tag); /* Add the appropriate tag. */
2984 return v; 2984 return v;
2985} 2985}
2986#define ALLOCATE_PSEUDOVECTOR(typ,field,tag) \
2987 ((typ*) \
2988 allocate_pseudovector \
2989 (VECSIZE (typ), PSEUDOVECSIZE (typ, field), tag))
2990 2986
2991struct Lisp_Hash_Table * 2987struct Lisp_Hash_Table *
2992allocate_hash_table (void) 2988allocate_hash_table (void)
diff --git a/src/lisp.h b/src/lisp.h
index 89c26b4f1f9..0d351e92895 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -348,7 +348,8 @@ enum pvec_type
348 PVEC_BUFFER = 0x20000, 348 PVEC_BUFFER = 0x20000,
349 PVEC_HASH_TABLE = 0x40000, 349 PVEC_HASH_TABLE = 0x40000,
350 PVEC_TERMINAL = 0x80000, 350 PVEC_TERMINAL = 0x80000,
351 PVEC_TYPE_MASK = 0xffe00 351 PVEC_OTHER = 0x100000,
352 PVEC_TYPE_MASK = 0x1ffe00
352 353
353#if 0 /* This is used to make the value of PSEUDOVECTOR_FLAG available to 354#if 0 /* This is used to make the value of PSEUDOVECTOR_FLAG available to
354 GDB. It doesn't work on OS Alpha. Moved to a variable in 355 GDB. It doesn't work on OS Alpha. Moved to a variable in
@@ -2606,6 +2607,11 @@ EXFUN (Fmake_char_table, 2);
2606extern Lisp_Object make_sub_char_table P_ ((Lisp_Object)); 2607extern Lisp_Object make_sub_char_table P_ ((Lisp_Object));
2607extern Lisp_Object Qchar_table_extra_slots; 2608extern Lisp_Object Qchar_table_extra_slots;
2608extern struct Lisp_Vector *allocate_vector P_ ((EMACS_INT)); 2609extern struct Lisp_Vector *allocate_vector P_ ((EMACS_INT));
2610extern struct Lisp_Vector *allocate_pseudovector P_ ((int memlen, int lisplen, EMACS_INT tag));
2611#define ALLOCATE_PSEUDOVECTOR(typ,field,tag) \
2612 ((typ*) \
2613 allocate_pseudovector \
2614 (VECSIZE (typ), PSEUDOVECSIZE (typ, field), tag))
2609extern struct Lisp_Vector *allocate_other_vector P_ ((EMACS_INT)); 2615extern struct Lisp_Vector *allocate_other_vector P_ ((EMACS_INT));
2610extern struct Lisp_Hash_Table *allocate_hash_table P_ ((void)); 2616extern struct Lisp_Hash_Table *allocate_hash_table P_ ((void));
2611extern struct window *allocate_window P_ ((void)); 2617extern struct window *allocate_window P_ ((void));