mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 13:40:36 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk

Browse source
This commit is contained in:
Stefan Monnier 2011-03-21 12:42:16 -04:00
commit cafdcef32d
250 changed files with 7207 additions and 3869 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/data.c
View file

@ -807,7 +807,10 @@ variable chain of symbols. */)
(Lisp_Object object)
{
if (SYMBOLP (object))
XSETSYMBOL (object, indirect_variable (XSYMBOL (object)));
{
struct Lisp_Symbol *sym = indirect_variable (XSYMBOL (object));
XSETSYMBOL (object, sym);
}
return object;
}
@ -817,9 +820,6 @@ variable chain of symbols. */)
This does not handle buffer-local variables; use
swap_in_symval_forwarding for that. */
#define do_blv_forwarding(blv) \
((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv))
Lisp_Object
do_symval_forwarding (register union Lisp_Fwd *valcontents)
{
@ -866,14 +866,6 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents)
BUF non-zero means set the value in buffer BUF instead of the
current buffer. This only plays a role for per-buffer variables. */
#define store_blv_forwarding(blv, newval, buf) \
do { \
if ((blv)->forwarded) \
store_symval_forwarding (BLV_FWD (blv), (newval), (buf)); \
else \
SET_BLV_VALUE (blv, newval); \
} while (0)
static void
store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf)
{
@ -909,12 +901,12 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object buf;
Lisp_Object lbuf;
struct buffer *b;
buf = Fcdr (XCAR (tail));
if (!BUFFERP (buf)) continue;
b = XBUFFER (buf);
lbuf = Fcdr (XCAR (tail));
if (!BUFFERP (lbuf)) continue;
b = XBUFFER (lbuf);
if (! PER_BUFFER_VALUE_P (b, idx))
PER_BUFFER_VALUE (b, offset) = newval;
@ -1271,7 +1263,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
/* Return the default value of SYMBOL, but don't check for voidness.
Return Qunbound if it is void. */
Lisp_Object
static Lisp_Object
default_value (Lisp_Object symbol)
{
struct Lisp_Symbol *sym;
@ -1505,8 +1497,8 @@ The function `default-value' gets the default value and `set-default' sets it.
{
struct Lisp_Symbol *sym;
struct Lisp_Buffer_Local_Value *blv = NULL;
union Lisp_Val_Fwd valcontents;
int forwarded;
union Lisp_Val_Fwd valcontents IF_LINT (= {0});
int forwarded IF_LINT (= 0);
CHECK_SYMBOL (variable);
sym = XSYMBOL (variable);
@ -1581,8 +1573,8 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */)
(register Lisp_Object variable)
{
register Lisp_Object tem;
int forwarded;
union Lisp_Val_Fwd valcontents;
int forwarded IF_LINT (= 0);
union Lisp_Val_Fwd valcontents IF_LINT (= {0});
struct Lisp_Symbol *sym;
struct Lisp_Buffer_Local_Value *blv = NULL;
@ -2218,7 +2210,7 @@ bool-vector. IDX starts at 0. */)
enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal };
Lisp_Object
static Lisp_Object
arithcompare (Lisp_Object num1, Lisp_Object num2, enum comparison comparison)
{
double f1 = 0, f2 = 0;
@ -2486,7 +2478,7 @@ enum arithop
static Lisp_Object float_arith_driver (double, int, enum arithop,
int, Lisp_Object *);
Lisp_Object
static Lisp_Object
arith_driver (enum arithop code, int nargs, register Lisp_Object *args)
{
register Lisp_Object val;
@ -3310,7 +3302,7 @@ syms_of_data (void)
XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1;
}
SIGTYPE
static SIGTYPE
arith_error (int signo)
{
sigsetmask (SIGEMPTYMASK);