diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-21 08:56:38 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-21 08:56:38 +0000 |
| commit | eeb7eaa88482114822730380196f4e7a3c0870dd (patch) | |
| tree | e8c3861b628ad53c6b8f158b74d1be8bd8590aeb /src/bytecode.c | |
| parent | b15d6f4265b10fbc413caca03246feff9c87d53e (diff) | |
| parent | a98d0b8e8948293de119c4cdd7a8c79318ad82fa (diff) | |
| download | emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 505-522)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: etc/TUTORIAL.cn: Updated.
- Merge from erc--emacs--22
* gnus--rel--5.10 (patch 164-167)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 3ee9b5576b4..6476070be5d 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -597,7 +597,7 @@ If the third argument is incorrect, Emacs may crash. */) if (SYMBOLP (sym) && !EQ (val, Qunbound) && !XSYMBOL (sym)->indirect_variable - && !XSYMBOL (sym)->constant + && !SYMBOL_CONSTANT_P (sym) && !MISCP (XSYMBOL (sym)->value)) XSYMBOL (sym)->value = val; else |