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;