Mercurial > emacs

comparison src/data.c @ 108058:5e867bd030c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 21 Apr 2010 23:03:28 +0000
parents 150fd3d78f5a
children ee0a08d8887e
comparison
equal deleted inserted replaced
108057:92bb32f41a3a 108058:5e867bd030c8
1556 static struct Lisp_Buffer_Local_Value * 1556 static struct Lisp_Buffer_Local_Value *
1557 make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents) 1557 make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents)
1558 { 1558 {
1559 struct Lisp_Buffer_Local_Value *blv 1559 struct Lisp_Buffer_Local_Value *blv
1560 = xmalloc (sizeof (struct Lisp_Buffer_Local_Value)); 1560 = xmalloc (sizeof (struct Lisp_Buffer_Local_Value));
1561 Lisp_Object symbol; XSETSYMBOL (symbol, sym); 1561 Lisp_Object symbol;
1562 Lisp_Object tem = Fcons (symbol, (forwarded 1562 Lisp_Object tem;
1563 ? do_symval_forwarding (valcontents.fwd) 1563
1564 : valcontents.value)); 1564 XSETSYMBOL (symbol, sym);
1565 tem = Fcons (symbol, (forwarded
1566 ? do_symval_forwarding (valcontents.fwd)
1567 : valcontents.value));
1568
1565 /* Buffer_Local_Values cannot have as realval a buffer-local 1569 /* Buffer_Local_Values cannot have as realval a buffer-local
1566 or keyboard-local forwarding. */ 1570 or keyboard-local forwarding. */
1567 eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd))); 1571 eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd)));
1568 eassert (!(forwarded && KBOARD_OBJFWDP (valcontents.fwd))); 1572 eassert (!(forwarded && KBOARD_OBJFWDP (valcontents.fwd)));
1569 blv->fwd = forwarded ? valcontents.fwd : NULL; 1573 blv->fwd = forwarded ? valcontents.fwd : NULL;