diff options
| author | Joakim Verona | 2011-07-15 04:39:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-15 04:39:29 +0200 |
| commit | 4f616a2e7ed1db28da98df90266e9751a8ae9ee1 (patch) | |
| tree | 74a9dcbe13e945e712ae04a4a94c2202ca720591 /src/character.c | |
| parent | ff2be00005c3aeda6e11d7ed264ce86f02b60958 (diff) | |
| parent | ec2bc542a4d0127425625e8cb458684bd825675a (diff) | |
| download | emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.tar.gz emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.zip | |
merge from upstream
Diffstat (limited to 'src/character.c')
| -rw-r--r-- | src/character.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/character.c b/src/character.c index 7fc5d647ff5..8e9b3e3775e 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -258,7 +258,8 @@ multibyte_char_to_unibyte_safe (int c) | |||
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0, | 260 | DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0, |
| 261 | doc: /* Return non-nil if OBJECT is a character. */) | 261 | doc: /* Return non-nil if OBJECT is a character. |
| 262 | usage: (characterp OBJECT) */) | ||
| 262 | (Lisp_Object object, Lisp_Object ignore) | 263 | (Lisp_Object object, Lisp_Object ignore) |
| 263 | { | 264 | { |
| 264 | return (CHARACTERP (object) ? Qt : Qnil); | 265 | return (CHARACTERP (object) ? Qt : Qnil); |