* 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.

4 files changed, 21 insertions, 14 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fa9d0c5076..a0eeb4a47bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* subr.el (error): Use `declare'.
+	(decode-char, encode-char): Use advertised-calling-convention instead
+	of the docstring to discourage use of the `restriction' arg.
+
 2013-10-03  Daiki Ueno  <ueno@gnu.org>
 
 	* epg.el (epg-verify-file): Add a comment saying that it does not
diff --git a/lisp/subr.el b/lisp/subr.el
index ba240a27064..ba953656b81 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -301,9 +301,9 @@ This function accepts any number of arguments, but ignores them."
 In Emacs, the convention is that error messages start with a capital
 letter but *do not* end with a period.  Please follow this convention
 for the sake of consistency."
+  (declare (advertised-calling-convention (string &rest args) "23.1"))
   (while t
     (signal 'error (list (apply 'format args)))))
-(set-advertised-calling-convention 'error '(string &rest args) "23.1")
 
 (defun user-error (format &rest args)
   "Signal a pilot error, making error message by passing all args to `format'.
@@ -1246,6 +1246,8 @@ is converted into a string by expressing it in decimal."
  'all-completions '(string collection &optional predicate) "23.1")
 (set-advertised-calling-convention 'unintern '(name obarray) "23.3")
 (set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3")
+(set-advertised-calling-convention 'decode-char '(ch charset) "21.4")
+(set-advertised-calling-convention 'encode-char '(ch charset) "21.4")
 
 ;;;; Obsolescence declarations for variables, and aliases.
 
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;