aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/character.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b95ac6cf34f..da49011d176 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12008-09-28 Martin Rudalics <rudalics@gmx.at>
2
3 * character.c (Fchar_resolve_modifiers): Rewrite Elisp function
4 name as char-resolve-modifiers.
5 Reported by: Markus Triska <markus.triska@gmx.at>
6
12008-09-28 Dan Nicolaescu <dann@ics.uci.edu> 72008-09-28 Dan Nicolaescu <dann@ics.uci.edu>
2 8
3 * dispnew.c (init_display): Return earlier when running as a 9 * dispnew.c (init_display): Return earlier when running as a
diff --git a/src/character.c b/src/character.c
index 7c0f38f96a5..ed1913e471a 100644
--- a/src/character.c
+++ b/src/character.c
@@ -1011,12 +1011,12 @@ usage: (unibyte-string &rest BYTES) */)
1011 return make_string_from_bytes ((char *) buf, n, p - buf); 1011 return make_string_from_bytes ((char *) buf, n, p - buf);
1012} 1012}
1013 1013
1014DEFUN ("char-resolve-modifers", Fchar_resolve_modifiers, 1014DEFUN ("char-resolve-modifiers", Fchar_resolve_modifiers,
1015 Schar_resolve_modifiers, 1, 1, 0, 1015 Schar_resolve_modifiers, 1, 1, 0,
1016 doc: /* Resolve modifiers in the character CHAR. 1016 doc: /* Resolve modifiers in the character CHAR.
1017The value is a character with modifiers resolved into the character 1017The value is a character with modifiers resolved into the character
1018code. Unresolved modifiers are kept in the value. 1018code. Unresolved modifiers are kept in the value.
1019usage: (char-resolve-modifers CHAR) */) 1019usage: (char-resolve-modifiers CHAR) */)
1020 (character) 1020 (character)
1021 Lisp_Object character; 1021 Lisp_Object character;
1022{ 1022{