diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/subr.el | 4 |
2 files changed, 9 insertions, 1 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. |