HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/alloc.c (free_save_value): Now static.
[bpt/emacs.git]
/
src
/
data.c
diff --git
a/src/data.c
b/src/data.c
index
5fc6afa
..
6622088
100644
(file)
--- a/
src/data.c
+++ b/
src/data.c
@@
-1,6
+1,6
@@
/* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter.
/* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter.
- Copyright (C) 1985-1986, 1988, 1993-1995, 1997-201
2
-
Free Software
Foundation, Inc.
+ Copyright (C) 1985-1986, 1988, 1993-1995, 1997-201
3 Free Software
+ Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-506,7
+506,9
@@
DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0,
/* Extract and set components of symbols. */
DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
/* Extract and set components of symbols. */
DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
- doc: /* Return t if SYMBOL's value is not void. */)
+ doc: /* Return t if SYMBOL's value is not void.
+Note that if `lexical-binding' is in effect, this refers to the
+global value outside of any lexical scope. */)
(register Lisp_Object symbol)
{
Lisp_Object valcontents;
(register Lisp_Object symbol)
{
Lisp_Object valcontents;
@@
-581,7
+583,7
@@
DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0,
(register Lisp_Object symbol)
{
CHECK_SYMBOL (symbol);
(register Lisp_Object symbol)
{
CHECK_SYMBOL (symbol);
-
return XSYMBOL (symbol)->function;
+ return XSYMBOL (symbol)->function;
}
DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
}
DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
@@
-912,13
+914,11
@@
store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
case Lisp_Fwd_Buffer_Obj:
{
int offset = XBUFFER_OBJFWD (valcontents)->offset;
case Lisp_Fwd_Buffer_Obj:
{
int offset = XBUFFER_OBJFWD (valcontents)->offset;
- Lisp_Object
type = XBUFFER_OBJFWD (valcontents)->slottyp
e;
+ Lisp_Object
predicate = XBUFFER_OBJFWD (valcontents)->predicat
e;
- if (!(NILP (type) || NILP (newval)
- || (XINT (type) == Lisp_Int0
- ? INTEGERP (newval)
- : XTYPE (newval) == XINT (type))))
- buffer_slot_type_mismatch (newval, XINT (type));
+ if (!NILP (predicate) && !NILP (newval)
+ && NILP (call1 (predicate, newval)))
+ wrong_type_argument (predicate, newval);
if (buf == NULL)
buf = current_buffer;
if (buf == NULL)
buf = current_buffer;
@@
-1047,7
+1047,9
@@
find_symbol_value (Lisp_Object symbol)
}
DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0,
}
DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0,
- doc: /* Return SYMBOL's value. Error if that is void. */)
+ doc: /* Return SYMBOL's value. Error if that is void.
+Note that if `lexical-binding' is in effect, this returns the
+global value outside of any lexical scope. */)
(Lisp_Object symbol)
{
Lisp_Object val;
(Lisp_Object symbol)
{
Lisp_Object val;