[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114504: * lisp/subr.el (decode-char, encode-char):
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r114504: * lisp/subr.el (decode-char, encode-char): Use advertised-calling-convention |
Date: |
Thu, 03 Oct 2013 04:41:39 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114504
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-03 00:41:23 -0400
message:
* 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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/subr.el subr.el-20091113204419-o5vbwnq5f7feedwu-151
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/charset.c charset.c-20091113204419-o5vbwnq5f7feedwu-1075
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-03 01:29:17 +0000
+++ b/lisp/ChangeLog 2013-10-03 04:41:23 +0000
@@ -1,3 +1,9 @@
+2013-10-03 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
* epg.el (epg-verify-file): Add a comment saying that it does not
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2013-09-29 06:16:45 +0000
+++ b/lisp/subr.el 2013-10-03 04:41:23 +0000
@@ -301,9 +301,9 @@
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 @@
'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.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-10-02 18:52:34 +0000
+++ b/src/ChangeLog 2013-10-03 04:41:23 +0000
@@ -1,7 +1,12 @@
+2013-10-03 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
- * 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 <address@hidden>
@@ -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.
=== modified file 'src/charset.c'
--- a/src/charset.c 2013-09-20 15:34:36 +0000
+++ b/src/charset.c 2013-10-03 04:41:23 +0000
@@ -1860,10 +1860,7 @@
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 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114504: * lisp/subr.el (decode-char, encode-char): Use advertised-calling-convention,
Stefan Monnier <=