[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/gnus-cloud 0d58111 56/61: Merge branch 'master' of
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] scratch/gnus-cloud 0d58111 56/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Fri, 1 Jul 2016 17:37:57 +0000 (UTC) |
branch: scratch/gnus-cloud
commit 0d58111f7a75f2a27051dae51e815a28cd743b9a
Merge: 0703c56 4bd3503
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
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 fbb0e0c..731d688 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 bc5233c..7103041 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 27b1c8a..cf84d8b 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 6882052..95a9c57 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;
- [Emacs-diffs] scratch/gnus-cloud f4ddee5 23/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, (continued)
- [Emacs-diffs] scratch/gnus-cloud f4ddee5 23/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud 7222ca6 33/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud dde06db 41/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud 2518519 32/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud cfd6a26 39/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud 1c37f18 38/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud de3eb76 51/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud ed55b4c 45/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud 0456139 46/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud cb3beec 61/61: Protect from null gnus-cloud-sequence, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud 0d58111 56/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Teodor Zlatanov <=
- [Emacs-diffs] scratch/gnus-cloud 5945c52 47/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud 204ce6f 57/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud 5574136 44/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud ece27ed 01/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01
- [Emacs-diffs] scratch/gnus-cloud fda47c9 59/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/01