diff options
| author | Kenichi Handa | 2009-07-13 01:03:28 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-07-13 01:03:28 +0000 |
| commit | fb6b6049d8e787691e859a43f41ec85741f042fb (patch) | |
| tree | 00d02b744263c5958d577c29e48a024a09ddd514 /src | |
| parent | 7b607b7356756158f971497e7066e365c52bd664 (diff) | |
| download | emacs-fb6b6049d8e787691e859a43f41ec85741f042fb.tar.gz emacs-fb6b6049d8e787691e859a43f41ec85741f042fb.zip | |
(internal_self_insert): Check sym by SYMBOLP before
calling XSYMBOL (sym).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/cmds.c | 2 |
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 @@ | |||
| 1 | 2009-07-13 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * cmds.c (internal_self_insert): Check sym by SYMBOLP before | ||
| 4 | calling XSYMBOL (sym). | ||
| 5 | |||
| 1 | 2009-07-11 Eli Zaretskii <eliz@gnu.org> | 6 | 2009-07-11 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * dired.c (directory_files_internal_w32_unwind) [WINDOWSNT]: New | 8 | * 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) | |||
| 492 | /* If we expanded an abbrev which has a hook, | 492 | /* If we expanded an abbrev which has a hook, |
| 493 | and the hook has a non-nil `no-self-insert' property, | 493 | and the hook has a non-nil `no-self-insert' property, |
| 494 | return right away--don't really self-insert. */ | 494 | return right away--don't really self-insert. */ |
| 495 | if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function) | 495 | if (SYMBOLP (sym) && ! NILP (sym) && ! NILP (XSYMBOL (sym)->function) |
| 496 | && SYMBOLP (XSYMBOL (sym)->function)) | 496 | && SYMBOLP (XSYMBOL (sym)->function)) |
| 497 | { | 497 | { |
| 498 | Lisp_Object prop; | 498 | Lisp_Object prop; |