From 4bd3503991e501690b30c3415d4641efb6e1de3a Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 30 Jun 2016 08:37:46 +0300 Subject: [PATCH] Cleanup around mature character manipulation functions * lisp/international/mule-diag.el (decode-codepage-char): Remove. * lisp/ldefs-boot.el (toplevel): Adjust accordingly. * lisp/subr.el (toplevel): Do not advertise calling conventions for 'decode-char' and 'encode-char'. * src/charset.c (Fdecode_char, Fencode_char): Remove unused 3rd arg. --- lisp/international/mule-diag.el | 7 ------- lisp/ldefs-boot.el | 2 +- lisp/subr.el | 2 -- src/charset.c | 8 ++++---- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index fbb0e0cb96f..731d6889ef5 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -204,13 +204,6 @@ Character sets for defining other charsets, or for backward compatibility "Obsolete.") (make-obsolete-variable 'non-iso-charset-alist "no longer relevant." "23.1") -(defun decode-codepage-char (codepage code) - "Decode a character that has code CODE in CODEPAGE. -Return a decoded character string. Each CODEPAGE corresponds to a -coding system cpCODEPAGE." - (declare (obsolete decode-char "23.1")) - (decode-char (intern (format "cp%d" codepage)) code)) - ;; A variable to hold charset input history. (defvar charset-history nil) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index bc5233c6662..710304158e3 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -21527,7 +21527,7 @@ The default is 20. If LIMIT is negative, do not limit the listing. \(fn &optional LIMIT)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "mule-diag" '("print-" "list-" "sort-listed-character-sets" "non-iso-charset-alist" "decode-codepage-char" "charset-history" "describe-font-internal" "insert-section"))) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "mule-diag" '("print-" "list-" "sort-listed-character-sets" "non-iso-charset-alist" "charset-history" "describe-font-internal" "insert-section"))) ;;;*** diff --git a/lisp/subr.el b/lisp/subr.el index 27b1c8aef92..cf84d8b6e4f 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1335,8 +1335,6 @@ is converted into a string by expressing it in decimal." (set-advertised-calling-convention 'unintern '(name obarray) "23.3") (set-advertised-calling-convention 'indirect-function '(object) "25.1") (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/charset.c b/src/charset.c index 688205245a9..95a9c577d52 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1839,12 +1839,12 @@ encode_char (struct charset *charset, int c) } -DEFUN ("decode-char", Fdecode_char, Sdecode_char, 2, 3, 0, +DEFUN ("decode-char", Fdecode_char, Sdecode_char, 2, 2, 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). */) - (Lisp_Object charset, Lisp_Object code_point, Lisp_Object restriction) + (Lisp_Object charset, Lisp_Object code_point) { int c, id; unsigned code; @@ -1858,10 +1858,10 @@ CODE-POINT may be a cons (HIGHER-16-BIT-VALUE . LOWER-16-BIT-VALUE). */) } -DEFUN ("encode-char", Fencode_char, Sencode_char, 2, 3, 0, +DEFUN ("encode-char", Fencode_char, Sencode_char, 2, 2, 0, doc: /* Encode the character CH into a code-point of CHARSET. Return nil if CHARSET doesn't include CH. */) - (Lisp_Object ch, Lisp_Object charset, Lisp_Object restriction) + (Lisp_Object ch, Lisp_Object charset) { int c, id; unsigned code; -- 2.39.2