summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-12-10 18:58:24 -0800
committerGlenn Morris <rgm@gnu.org>2016-12-10 18:58:24 -0800
commitba8e883fa30f1267c27751c1ee9df25a5dde4c0c (patch)
treedb838795f653937c63996857babbe636b1d106d6 /src
parent010733616543f86aed9e351d5754d02864c2ea26 (diff)
downloademacs-ba8e883fa30f1267c27751c1ee9df25a5dde4c0c.tar.gz
emacs-ba8e883fa30f1267c27751c1ee9df25a5dde4c0c.tar.bz2
emacs-ba8e883fa30f1267c27751c1ee9df25a5dde4c0c.zip
Do not allow nil to be defined as a function
* lisp/emacs-lisp/byte-run.el (defun): * src/data.c (Ffset): Do not allow "nil". (Bug#25110)
Diffstat (limited to 'src')
-rw-r--r--src/data.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/data.c b/src/data.c
index 09d94f57a8e..52cfe4ae4a3 100644
--- a/src/data.c
+++ b/src/data.c
@@ -733,6 +733,9 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
{
register Lisp_Object function;
CHECK_SYMBOL (symbol);
+ /* Perhaps not quite the right error signal, but seems good enough. */
+ if (NILP (symbol))
+ xsignal1 (Qsetting_constant, symbol);
function = XSYMBOL (symbol)->function;