diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-03 00:41:23 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-03 00:41:23 -0400 |
| commit | 328a8179fec33f5a75e2cfe22e43f4ec0df770b7 (patch) | |
| tree | 1c58ada4da59ca904b6afba923eb6159665a1655 /src | |
| parent | 15a1e936a0c2bf239d71239bb9899a9177599973 (diff) | |
| download | emacs-328a8179fec33f5a75e2cfe22e43f4ec0df770b7.tar.gz | |
* lisp/subr.el (decode-char, encode-char): Use advertised-calling-convention
instead of the docstring to discourage use of the `restriction' arg.
(error): Use `declare'.
* src/charset.c (Fdecode_char, Fencode_char): Remove description of
`restriction' arg. now that it's hidden by advertised-calling-convention.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 15 | ||||
| -rw-r--r-- | src/charset.c | 10 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6af5b2ee086..c201df19851 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,12 @@ +2013-10-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * charset.c (Fdecode_char, Fencode_char): Remove description of + `restriction' arg. now that it's hidden by advertised-calling-convention. + 2013-10-02 Jan Djärv <jan.h.d@swipnet.se> - * macfont.m (mac_ctfont_create_preferred_family_for_attributes): Remove - unised variable (from mac-port). + * macfont.m (mac_ctfont_create_preferred_family_for_attributes): + Remove unused variable (from mac-port). (macfont_draw): Use s->ybase for correct y position. 2013-10-02 Dmitry Antipov <dmantipov@yandex.ru> @@ -52,7 +57,7 @@ (ns_term_init): Remove assignment of ns_selection_color, logic moved to ns_get_color. - * nsterm.h (NS_SELECTION_BG_COLOR_DEFAULT): Renamed from + * nsterm.h (NS_SELECTION_BG_COLOR_DEFAULT): Rename from NS_SELECTION_COLOR_DEFAULT. (NS_SELECTION_FG_COLOR_DEFAULT): New. @@ -240,8 +245,8 @@ (vroundup_ct): New macro. (vroundup): Assume argument >= 0; invoke vroundup_ct. * casetab.c (shuffle,set_identity): Change lint_assume to assume. - * composite.c (composition_gstring_put_cache): Change - lint_assume to assume. + * composite.c (composition_gstring_put_cache): + Change lint_assume to assume. * conf_post.h (assume): New macro. (lint_assume): Remove. * dispnew.c (update_frame_1): Change lint_assume to assume. diff --git a/src/charset.c b/src/charset.c index ef040a94605..4a36f8059ae 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1860,10 +1860,7 @@ DEFUN ("decode-char", Fdecode_char, Sdecode_char, 2, 3, 0, doc: /* Decode the pair of CHARSET and CODE-POINT into a character. Return nil if CODE-POINT is not valid in CHARSET. -CODE-POINT may be a cons (HIGHER-16-BIT-VALUE . LOWER-16-BIT-VALUE). - -Optional argument RESTRICTION specifies a way to map the pair of CCS -and CODE-POINT to a character. Currently not supported and just ignored. */) +CODE-POINT may be a cons (HIGHER-16-BIT-VALUE . LOWER-16-BIT-VALUE). */) (Lisp_Object charset, Lisp_Object code_point, Lisp_Object restriction) { int c, id; @@ -1880,10 +1877,7 @@ and CODE-POINT to a character. Currently not supported and just ignored. */) DEFUN ("encode-char", Fencode_char, Sencode_char, 2, 3, 0, doc: /* Encode the character CH into a code-point of CHARSET. -Return nil if CHARSET doesn't include CH. - -Optional argument RESTRICTION specifies a way to map CH to a -code-point in CCS. Currently not supported and just ignored. */) +Return nil if CHARSET doesn't include CH. */) (Lisp_Object ch, Lisp_Object charset, Lisp_Object restriction) { int c, id; |