aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2011-07-12 23:17:39 +0200
committerAndreas Schwab2011-07-12 23:17:39 +0200
commitbc985c877c5b4d8cc87976a834cede666edc0ed5 (patch)
tree6cd3df1c4bbbf9beaa9603b7625610d1e3dfd776 /src
parentb3dadd7683d3d66630d5be72b222f3931381dad0 (diff)
downloademacs-bc985c877c5b4d8cc87976a834cede666edc0ed5.tar.gz
emacs-bc985c877c5b4d8cc87976a834cede666edc0ed5.zip
* src/character.c (Fcharacterp): Don't advertise optional ignored
argument. (Bug#4026)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/character.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index abd373dbc3e..07c707eacdc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-07-12 Andreas Schwab <schwab@linux-m68k.org>
2
3 * character.c (Fcharacterp): Don't advertise optional ignored
4 argument. (Bug#4026)
5
12011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * keymap.c (syms_of_keymap): Clarify that "modifier" is "modifier 8 * keymap.c (syms_of_keymap): Clarify that "modifier" is "modifier
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
260DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0, 260DEFUN ("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.
262usage: (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);