summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2009-07-13 01:03:28 +0000
committerKenichi Handa <handa@m17n.org>2009-07-13 01:03:28 +0000
commitfb6b6049d8e787691e859a43f41ec85741f042fb (patch)
tree00d02b744263c5958d577c29e48a024a09ddd514
parent7b607b7356756158f971497e7066e365c52bd664 (diff)
downloademacs-fb6b6049d8e787691e859a43f41ec85741f042fb.tar.gz
emacs-fb6b6049d8e787691e859a43f41ec85741f042fb.tar.bz2
emacs-fb6b6049d8e787691e859a43f41ec85741f042fb.zip
(internal_self_insert): Check sym by SYMBOLP before
calling XSYMBOL (sym).
-rw-r--r--src/ChangeLog5
-rw-r--r--src/cmds.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3d952982237..e9caf7f29e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-13 Kenichi Handa <handa@m17n.org>
+
+ * cmds.c (internal_self_insert): Check sym by SYMBOLP before
+ calling XSYMBOL (sym).
+
2009-07-11 Eli Zaretskii <eliz@gnu.org>
* dired.c (directory_files_internal_w32_unwind) [WINDOWSNT]: New
diff --git a/src/cmds.c b/src/cmds.c
index 60916705c97..33472b5710b 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -492,7 +492,7 @@ internal_self_insert (c, noautofill)
/* If we expanded an abbrev which has a hook,
and the hook has a non-nil `no-self-insert' property,
return right away--don't really self-insert. */
- if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function)
+ if (SYMBOLP (sym) && ! NILP (sym) && ! NILP (XSYMBOL (sym)->function)
&& SYMBOLP (XSYMBOL (sym)->function))
{
Lisp_Object prop;