aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorStefan Monnier2017-11-24 16:15:09 -0500
committerStefan Monnier2017-11-24 16:15:09 -0500
commitd1000fb48bb941c5336051f20fe7d46e60260605 (patch)
treedc781dbf0fdc3f250aa091901ea798d14904358b /src/data.c
parent74b5103511dd41dbc0eda5ee848131eed6debc9a (diff)
downloademacs-d1000fb48bb941c5336051f20fe7d46e60260605.tar.gz
emacs-d1000fb48bb941c5336051f20fe7d46e60260605.zip
* src/data.c: Fix regression in last clone-buffer change
* src/data.c (Fmake_local_variable, Fmake_variable_buffer_local): Signal more precise error when applied to read-only variable.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/data.c b/src/data.c
index 4a3afed6f71..7ca1892f64a 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1852,7 +1852,7 @@ The function `default-value' gets the default value and `set-default' sets it.
1852 } 1852 }
1853 1853
1854 if (SYMBOL_CONSTANT_P (variable)) 1854 if (SYMBOL_CONSTANT_P (variable))
1855 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); 1855 xsignal1 (Qsetting_constant, variable);
1856 1856
1857 if (!blv) 1857 if (!blv)
1858 { 1858 {
@@ -1915,8 +1915,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */)
1915 } 1915 }
1916 1916
1917 if (sym->u.s.trapped_write == SYMBOL_NOWRITE) 1917 if (sym->u.s.trapped_write == SYMBOL_NOWRITE)
1918 error ("Symbol %s may not be buffer-local", 1918 xsignal1 (Qsetting_constant, variable);
1919 SDATA (SYMBOL_NAME (variable)));
1920 1919
1921 if (blv ? blv->local_if_set 1920 if (blv ? blv->local_if_set
1922 : (forwarded && BUFFER_OBJFWDP (valcontents.fwd))) 1921 : (forwarded && BUFFER_OBJFWDP (valcontents.fwd)))