[COMMIT] Remove a couple of unused file-level variables from doc.c, text.c
7 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1507926591 -3600
# Fri Oct 13 21:29:51 2017 +0100
# Node ID 222b2a338e9daa7f4b7c12efe00859c76058e946
# Parent 2870572bc49be089166437bb3fbaa800bcdf8d14
Remove a couple of unused file-level variables from doc.c, text.c
src/ChangeLog addition:
2017-10-13 Aidan Kehoe <kehoea(a)parhasard.net>
* doc.c:
* doc.c (vars_of_doc):
* text.c:
* text.c (syms_of_text):
Removed unused file-local C variables QSsubstitute,
Qsubstitute_negated from these files.
diff -r 2870572bc49b -r 222b2a338e9d src/ChangeLog
--- a/src/ChangeLog Thu Oct 12 20:27:07 2017 +0100
+++ b/src/ChangeLog Fri Oct 13 21:29:51 2017 +0100
＠＠ -1,3 +1,12 ＠＠
+2017-10-13 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * doc.c:
+ * doc.c (vars_of_doc):
+ * text.c:
+ * text.c (syms_of_text):
+ Removed unused file-local C variables QSsubstitute,
+ Qsubstitute_negated from these files.
+
2017-10-07 Aidan Kehoe <kehoea(a)parhasard.net>
* eval.c (Feval):
diff -r 2870572bc49b -r 222b2a338e9d src/doc.c
--- a/src/doc.c Thu Oct 12 20:27:07 2017 +0100
+++ b/src/doc.c Fri Oct 13 21:29:51 2017 +0100
＠＠ -36,10 +36,7 ＠＠
#include "elhash.h"
Lisp_Object Vinternal_doc_file_name;
-
-Lisp_Object QSsubstitute, Qdefvar;
-
-Lisp_Object Qfunction_documentation;
+Lisp_Object Qdefvar, Qfunction_documentation;
/* Work out what source file a function or variable came from, taking the
information from the documentation file. */
＠＠ -1399,7 +1396,4 ＠＠
Name of file containing documentation strings of built-in symbols.
*/ );
Vinternal_doc_file_name = Qnil;
-
- QSsubstitute = build_ascstring (" *substitute*");
- staticpro (&QSsubstitute);
}
diff -r 2870572bc49b -r 222b2a338e9d src/text.c
--- a/src/text.c Thu Oct 12 20:27:07 2017 +0100
+++ b/src/text.c Fri Oct 13 21:29:51 2017 +0100
＠＠ -1370,7 +1370,7 ＠＠
Lisp_Object QSin_char_byte_conversion, QSin_byte_char_conversion;
Lisp_Object QSin_internal_external_conversion, QSin_external_internal_conversion;
-Lisp_Object /* Qfail, Qsubstitute, */ Qsubstitute_negated, Quse_private;
+Lisp_Object /* Qfail, Qsubstitute, */ Quse_private;
Fixnum Vchar_code_limit;
＠＠ -6116,7 +6116,6 ＠＠
DEFSUBR (Fchar_width);
/* Qfail, Qsubstitute, Qsucceed in general.c */
- DEFSYMBOL (Qsubstitute_negated); /* #### what's this used for? */
DEFSYMBOL (Quse_private);
#ifdef ENABLE_COMPOSITE_CHARS
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Remove #'frame-utmost-window-2 from the global namespace.
7 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1507836427 -3600
# Thu Oct 12 20:27:07 2017 +0100
# Node ID 2870572bc49be089166437bb3fbaa800bcdf8d14
# Parent d986eee8b74633db8cfee3ded33cde9de38802e3
Remove #'frame-utmost-window-2 from the global namespace.
lisp/ChangeLog addition:
2017-10-12 Aidan Kehoe <kehoea(a)parhasard.net>
* frame.el (frame-utmost-window-2): Made into a label.
* frame.el (frame-utmost-window-1): Use the label.
Remove #'frame-utmost-window-2 from the global namespace.
diff -r d986eee8b746 -r 2870572bc49b lisp/ChangeLog
--- a/lisp/ChangeLog Mon Oct 09 08:30:37 2017 +0100
+++ b/lisp/ChangeLog Thu Oct 12 20:27:07 2017 +0100
＠＠ -1,3 +1,9 ＠＠
+2017-10-12 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * frame.el (frame-utmost-window-2): Made into a label.
+ * frame.el (frame-utmost-window-1): Use the label.
+ Remove #'frame-utmost-window-2 from the global namespace.
+
2017-10-06 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/chinese.el:
diff -r d986eee8b746 -r 2870572bc49b lisp/frame.el
--- a/lisp/frame.el Mon Oct 09 08:30:37 2017 +0100
+++ b/lisp/frame.el Thu Oct 12 20:27:07 2017 +0100
＠＠ -1913,81 +1913,76 ＠＠
;; new functions like this can be added without requiring C
;; additions.
-(defun frame-utmost-window-2 (window position left-right-p major-end-p
- minor-end-p)
- ;; LEFT-RIGHT-P means we're looking for the leftmost or rightmost
- ;; window, instead of the highest or lowest. In this case, we
- ;; say that the "major axis" goes left-to-right instead of top-to-
- ;; bottom. The "minor axis" always goes perpendicularly.
- ;;
- ;; If MAJOR-END-P is t, we're looking for a windows that abut the
- ;; end (i.e. right or bottom) of the major axis, instead of the
- ;; start.
- ;;
- ;; If MINOR-END-P is t, then we want to start counting from the
- ;; end of the minor axis instead of the beginning.
- ;;
- ;; Here's the general idea: Imagine we're trying to count the number
- ;; of windows that abut the top; call this function foo(). So, we
- ;; start with the root window. If this is a vertical combination
- ;; window, then foo() applied to the root window is the same as
- ;; foo() applied to the first child. If the root is a horizontal
- ;; combination window, then foo() applied to the root is the
- ;; same as the sum of foo() applied to each of the children.
- ;; Otherwise, the root window is a leaf window, and foo() is 1.
- ;; Now it's clear that, each time foo() encounters a leaf window,
- ;; it's encountering a different window that abuts the top.
- ;; With a little examining, you can see that foo encounters the
- ;; top-abutting windows in order from left to right. We can
- ;; modify foo() to return the nth top-abutting window by simply
- ;; keeping a global variable that is decremented each time
- ;; foo() encounters a leaf window and would return 1. If the
- ;; global counter gets to zero, we've encountered the window
- ;; we were looking for, so we exit right away using a `throw'.
- ;; Otherwise, we make sure that all normal paths return nil.
-
- (let (child)
- (cond ((setq child (if left-right-p
- (window-first-hchild window)
- (window-first-vchild window)))
- (if major-end-p
- (while (window-next-child child)
- (setq child (window-next-child child))))
- (frame-utmost-window-2 child position left-right-p major-end-p
- minor-end-p))
- ((setq child (if left-right-p
- (window-first-vchild window)
- (window-first-hchild window)))
- (if minor-end-p
- (while (window-next-child child)
- (setq child (window-next-child child))))
- (while child
- (frame-utmost-window-2 child position left-right-p major-end-p
- minor-end-p)
- (setq child (if minor-end-p
- (window-previous-child child)
- (window-next-child child))))
- nil)
- (t
- (setcar position (1- (car position)))
- (if (= (car position) 0)
- (throw 'fhw-exit window)
- nil)))))
-
-(defun frame-utmost-window-1 (frame position left-right-p major-end-p)
- (let (minor-end-p)
- (or frame (setq frame (selected-frame)))
- (or position (setq position 0))
- (if (>= position 0)
- (setq position (1+ position))
- (setq minor-end-p t)
- (setq position (- position)))
- (catch 'fhw-exit
+(defun* frame-utmost-window-1 (frame position left-right-p major-end-p)
+ (labels
+ ((frame-utmost-window-2 (window position left-right-p major-end-p
+ minor-end-p)
+ ;; LEFT-RIGHT-P means we're looking for the leftmost or rightmost
+ ;; window, instead of the highest or lowest. In this case, we say
+ ;; that the "major axis" goes left-to-right instead of top-to-
+ ;; bottom. The "minor axis" always goes perpendicularly.
+ ;;
+ ;; If MAJOR-END-P is t, we're looking for a windows that abut the end
+ ;; (i.e. right or bottom) of the major axis, instead of the start.
+ ;;
+ ;; If MINOR-END-P is t, then we want to start counting from the end
+ ;; of the minor axis instead of the beginning.
+ ;;
+ ;; Here's the general idea: Imagine we're trying to count the number
+ ;; of windows that abut the top; call this function foo(). So, we
+ ;; start with the root window. If this is a vertical combination
+ ;; window, then foo() applied to the root window is the same as foo()
+ ;; applied to the first child. If the root is a horizontal
+ ;; combination window, then foo() applied to the root is the same as
+ ;; the sum of foo() applied to each of the children. Otherwise, the
+ ;; root window is a leaf window, and foo() is 1. Now it's clear
+ ;; that, each time foo() encounters a leaf window, it's encountering
+ ;; a different window that abuts the top. With a little examining,
+ ;; you can see that foo encounters the top-abutting windows in order
+ ;; from left to right. We can modify foo() to return the nth
+ ;; top-abutting window by simply keeping a global variable that is
+ ;; decremented each time foo() encounters a leaf window and would
+ ;; return 1. If the global counter gets to zero, we've encountered
+ ;; the window we were looking for, so we exit right away using a
+ ;; `return-from'. Otherwise, we make sure that all normal paths
+ ;; return nil.
+ (let (child)
+ (cond ((setq child (if left-right-p
+ (window-first-hchild window)
+ (window-first-vchild window)))
+ (if major-end-p
+ (while (window-next-child child)
+ (setq child (window-next-child child))))
+ (frame-utmost-window-2 child position left-right-p
+ major-end-p minor-end-p))
+ ((setq child (if left-right-p
+ (window-first-vchild window)
+ (window-first-hchild window)))
+ (if minor-end-p
+ (while (window-next-child child)
+ (setq child (window-next-child child))))
+ (while child
+ (frame-utmost-window-2 child position left-right-p
+ major-end-p minor-end-p)
+ (setq child (if minor-end-p
+ (window-previous-child child)
+ (window-next-child child))))
+ nil)
+ (t
+ (setcar position (1- (car position)))
+ (if (eql (car position) 0)
+ (return-from frame-utmost-window-1 window)))))))
+ (let (minor-end-p)
+ (or frame (setq frame (selected-frame)))
+ (or position (setq position 0))
+ (if (>= position 0)
+ (setq position (1+ position))
+ (setq minor-end-p t)
+ (setq position (- position)))
;; we use a cons here as a simple form of call-by-reference.
;; scheme has "boxes" for the same purpose.
(frame-utmost-window-2 (frame-root-window frame) (list position)
- left-right-p major-end-p minor-end-p))))
-
+ left-right-p major-end-p minor-end-p))))
(defun frame-highest-window (&optional frame position)
"Return the highest window on FRAME which is at POSITION.
＠＠ -2036,7 +2031,6 ＠＠
If omitted, POSITION defaults to 0, i.e. the highest rightmost window.
If there is no window at the given POSITION, return nil."
(frame-utmost-window-1 frame position t t))
-
;; frame properties.
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
commit/skk: Jerry James: Migrate .cvsignore files to a single .hgignore file.
7 years, 2 months
Bitbucket
Bitbucket
1 new commit in skk:
https://bitbucket.org/xemacs/skk/commits/a286aeac29b5/
Changeset: a286aeac29b5
User: Jerry James
Date: 2014-05-13 21:54:02
Summary: Migrate .cvsignore files to a single .hgignore file.
In addition:
- Restore CVS keyword expansions that were lost during the switch to Mercurial
- Update texinfo sources for texinfo 5.x
See <CAHCOHQmqMvFtLqEt6M+w4vFyq9=e+i1Uy8zaQcUeAjeV3F9uWQ(a)mail.gmail.com> in
xemacs-patches and followups for details.
Affected #: 29 files
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b .hgignore
--- /dev/null
+++ b/.hgignore
＠＠ -0,0 +1,12 ＠＠
+^#\..*#$
+^\.#
+~$
+\.elc$
+\.html$
+\.info(-\d+)?$
+^_pkg\.el$
+^auto-autoloads\.el$
+^custom-defines\.el$
+^custom-load\.el$
+^package-info$
+^pdepends\.mk$
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,12 ＠＠
+2014-05-13 Jerry James <james(a)xemacs.org>
+
+ * .cvsignore: Remove.
+ * texi/.cvsignore: Remove.
+ * .hgignore: New file.
+ * etc/SKK*: Restore CVS keyword expansions.
+ * *.el: Ditto.
+ * texi/*.texi: Ditto. Update for texinfo 5.x.
+
2007-10-02 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.24 released.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b etc/SKK-JISYO.L
--- a/etc/SKK-JISYO.L
+++ b/etc/SKK-JISYO.L
＠＠ -9,9 +9,9 ＠＠
;; Katsushi Sato and Nobuhiro Yamagishi
;;
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: SKK-JISYO.L,v 1.2 2000-07-10 07:12:42 martin Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 07:12:42 $
;;
;; This dictionary is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b etc/SKK.tut
--- a/etc/SKK.tut
+++ b/etc/SKK.tut
＠＠ -4,9 +4,9 ＠＠
;;
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: SKK.tut,v 1.2 2000-07-10 04:17:01 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:17:01 $
;; This is the tutorial text for SKK version 10.46 and and later versions.
;;
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b etc/SKK.tut.E
--- a/etc/SKK.tut.E
+++ b/etc/SKK.tut.E
＠＠ -4,9 +4,9 ＠＠
;;
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: SKK.tut.E,v 1.3 2000-10-13 14:32:07 martinb Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-10-13 14:32:07 $
;;
;; This is the tutorial text for SKK version 10.46 and and later versions.
;;
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-auto.el
--- a/skk-auto.el
+++ b/skk-auto.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-auto.el,v 1.2 2000-07-10 04:33:59 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:33:59 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-comp.el
--- a/skk-comp.el
+++ b/skk-comp.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-comp.el,v 1.2 2000-07-10 04:34:00 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:34:00 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-cursor.el
--- a/skk-cursor.el
+++ b/skk-cursor.el
＠＠ -4,9 +4,9 ＠＠
;; Author: Masatake YAMATO <masata-y(a)is.aist-nara.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-cursor.el,v 1.2 2000-11-08 01:51:43 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-11-08 01:51:43 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-develop.el
--- a/skk-develop.el
+++ b/skk-develop.el
＠＠ -3,9 +3,9 ＠＠
;; Author: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-develop.el,v 1.2 2000-11-08 01:51:43 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-11-08 01:51:43 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-foreword.el
--- a/skk-foreword.el
+++ b/skk-foreword.el
＠＠ -5,9 +5,9 ＠＠
;; Maintainer: Hideki Sakurada <sakurada(a)kuis.kyoto-u.ac.jp>
;; Murata Shuuichirou <mrt(a)astec.co.jp>
;; Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-foreword.el,v 1.5 2002-04-28 07:12:27 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2002-04-28 07:12:27 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-gadget.el
--- a/skk-gadget.el
+++ b/skk-gadget.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Murata Shuuichirou <mrt(a)astec.co.jp>
;; Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-gadget.el,v 1.4 2000-11-08 01:51:43 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-11-08 01:51:43 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-isearch.el
--- a/skk-isearch.el
+++ b/skk-isearch.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Enami Tsugutomo <enami(a)ba2.so-net.or.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-isearch.el,v 1.4 2002-04-28 07:12:27 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2002-04-28 07:12:27 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-kakasi.el
--- a/skk-kakasi.el
+++ b/skk-kakasi.el
＠＠ -2,9 +2,9 ＠＠
;; Copyright (C) 1996, 1998, 1999 Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
;; Author: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-kakasi.el,v 1.3 2000-11-08 01:51:44 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-11-08 01:51:44 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-kcode.el
--- a/skk-kcode.el
+++ b/skk-kcode.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-kcode.el,v 1.2 2000-07-10 04:34:00 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:34:00 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-leim.el
--- a/skk-leim.el
+++ b/skk-leim.el
＠＠ -3,9 +3,9 ＠＠
;; Murata Shuuichirou <mrt(a)astec.co.jp>
;;
;; Author: Murata Shuuichirou <mrt(a)mickey.ai.kyutech.ac.jp>
-;; Version: $Id$
+;; Version: $Id: skk-leim.el,v 1.5 2007-10-01 17:30:29 aidan Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2007-10-01 17:30:29 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-look.el
--- a/skk-look.el
+++ b/skk-look.el
＠＠ -4,9 +4,9 ＠＠
;; Author: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-look.el,v 1.2 2000-11-08 01:51:44 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-11-08 01:51:44 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-num.el
--- a/skk-num.el
+++ b/skk-num.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-num.el,v 1.3 2000-11-08 01:51:44 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-11-08 01:51:44 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-obsolete.el
--- a/skk-obsolete.el
+++ b/skk-obsolete.el
＠＠ -3,9 +3,9 ＠＠
;; Author: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-obsolete.el,v 1.1 2000-07-10 04:34:01 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:34:01 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-server.el
--- a/skk-server.el
+++ b/skk-server.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-server.el,v 1.2 2000-07-10 04:34:01 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:34:01 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-tut.el
--- a/skk-tut.el
+++ b/skk-tut.el
＠＠ -5,9 +5,9 ＠＠
;; Author: Masahiko Sato <masahiko(a)kuis.kyoto-u.ac.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-tut.el,v 1.3 2000-11-08 01:51:44 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-11-08 01:51:44 $
;; This file is part of SKK.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-vars.el
--- a/skk-vars.el
+++ b/skk-vars.el
＠＠ -3,9 +3,9 ＠＠
;; Author: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-vars.el,v 1.2 2000-07-10 04:34:02 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:34:02 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk-viper.el
--- a/skk-viper.el
+++ b/skk-viper.el
＠＠ -6,9 +6,9 ＠＠
;; Murata Shuuichirou <mrt(a)notwork.org>
;; Maintainer: Murata Shuuichirou <mrt(a)notwork.org>
;; Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk-viper.el,v 1.2 2000-07-10 04:34:02 yoshiki Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:34:02 $
;; This file is not part of SKK yet.
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b skk.el
--- a/skk.el
+++ b/skk.el
＠＠ -7,9 +7,9 ＠＠
;; Maintainer: Hideki Sakurada <sakurada(a)kuis.kyoto-u.ac.jp>
;; Murata Shuuichirou <mrt(a)astec.co.jp>
;; Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
-;; Version: $Id$
+;; Version: $Id: skk.el,v 1.6 2002-04-28 07:12:27 youngs Exp $
;; Keywords: japanese
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2002-04-28 07:12:27 $
;; SKK is free software; you can redistribute it and/or modify it under
;; the terms of the GNU General Public License as published by the Free
＠＠ -60,7 +60,7 ＠＠
(if (not (interactive-p))
skk-version
(save-match-data
- (let* ((raw-date "$Date$")
+ (let* ((raw-date "$Date: 2002-04-28 07:12:27 $")
(year (substring raw-date 7 11))
(month (substring raw-date 12 14))
(date (substring raw-date 15 17)))
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b texi/.cvsignore
--- a/texi/.cvsignore
+++ /dev/null
＠＠ -1,1 +0,0 ＠＠
-skk*.html
\ No newline at end of file
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b texi/gpl.texi
--- a/texi/gpl.texi
+++ b/texi/gpl.texi
＠＠ -64,9 +64,9 ＠＠
＠iftex
＠unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
＠end iftex
-＠ifinfo
+＠ifnottex
＠center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-＠end ifinfo
+＠end ifnottex
＠enumerate
＠item
＠＠ -289,9 +289,9 ＠＠
＠iftex
＠heading NO WARRANTY
＠end iftex
-＠ifinfo
+＠ifnottex
＠center NO WARRANTY
-＠end ifinfo
+＠end ifnottex
＠item
BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
＠＠ -319,9 +319,9 ＠＠
＠iftex
＠heading END OF TERMS AND CONDITIONS
＠end iftex
-＠ifinfo
+＠ifnottex
＠center END OF TERMS AND CONDITIONS
-＠end ifinfo
+＠end ifnottex
＠page
＠unnumberedsec How to Apply These Terms to Your New Programs
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b texi/skk-faq.texi
--- a/texi/skk-faq.texi
+++ b/texi/skk-faq.texi
＠＠ -2,9 +2,9 ＠＠
＠c
＠c Author: Tsukamoto Tetsuo <czkmt(a)remus.dti.ne.jp>
＠c Maintainer: SKK Development Team <skk(a)ring.gr.jp>
-＠c Version: $Id$
+＠c Version: $Id: skk-faq.texi,v 1.1 2000-11-08 01:50:17 youngs Exp $
＠c Keywords: japanese
-＠c Last Modified: $Date$
+＠c Last Modified: $Date: 2000-11-08 01:50:17 $
＠c
＠setfilename skk-faq.info
＠c ＠settitle Frequently Asked Questions (SKK)
＠＠ -817,7 +817,7 ＠＠
＠example
＠kbd{$B"&(Bis} ＠key{SPC}
- ＠expansion ＠samp{$B%$%s%/%j%a%s%?%k!&%5!<%A(B}
+ ＠expansion{} ＠samp{$B%$%s%/%j%a%s%?%k!&%5!<%A(B}
＠end example
＠noindent
＠＠ -854,7 +854,7 ＠＠
$B1QC18l$rJd40$,$G$-$^$9!#(B
＠example
- $B"&(Babstr(＠key{TAB}) ＠expansion $B"&(Babstract
+ $B"&(Babstr(＠key{TAB}) ＠expansion{} $B"&(Babstract
＠end example
$BDL>o$NJd405!G=F1MM!"(B(a)kbd{.} $B$G<!$NJd408uJd!"(B＠kbd{,} $B$G$R$H$DA0$NJd408uJd(B
＠＠ -865,7 +865,7 ＠＠
(2)$B1QC18l$r$"$$$^$$$KJQ49$7$F<h$j=P$9$3$H$,$G$-$^$9!#(B
＠example
- $B"&(Babstr* (＠key{SPC}) ＠expansion $B"'(Babstract
+ $B"&(Babstr* (＠key{SPC}) ＠expansion{} $B"'(Babstract
＠end example
$B8+=P$78l$K(B ＠samp{*} $B$rF~$l$k$N$r$*K:$l$J$/!#(B
＠＠ -878,11 +878,11 ＠＠
＠example
$B"&(Babstr* (＠key{SPC})
- ＠expansion $B"'(Babstract (＠key{SPC})
- ＠expansion $B"'%"%V%9%H%i%/%H(B (＠key{SPC})
- ＠expansion $B"'Cj>](B (＠key{SPC})
- ＠expansion $B"'(Babstraction (＠key{SPC})
- ＠expansion $B"'%"%V%9%H%i%/%7%g%s(B
+ ＠expansion{} $B"'(Babstract (＠key{SPC})
+ ＠expansion{} $B"'%"%V%9%H%i%/%H(B (＠key{SPC})
+ ＠expansion{} $B"'Cj>](B (＠key{SPC})
+ ＠expansion{} $B"'(Babstraction (＠key{SPC})
+ ＠expansion{} $B"'%"%V%9%H%i%/%7%g%s(B
＠end example
$B$3$N$h$&$K1QC18l(B + $B$=$N1QC18l$r8+=P$78l$K$7$?8uJd$N!V%;%C%H!W$rJQ497k2L(B
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b texi/skk.texi
--- a/texi/skk.texi
+++ b/texi/skk.texi
＠＠ -7,13 +7,13 ＠＠
＠c Yukiyoshi Kameyama <kameyama＠(a)kuis.kyoto-u.ac.jp>
＠c Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
＠c Maintainer: SKK Development Team <skk(a)ring.gr.jp>
-＠c Version: $Id$
+＠c Version: $Id: skk.texi,v 1.3 2000-11-08 01:50:14 youngs Exp $
＠c Keywords: japanese
-＠c Last Modified: $Date$
+＠c Last Modified: $Date: 2000-11-08 01:50:14 $
＠c
＠set EDITION 1.5
＠set SKK-VERSION 10.62
-＠set UPDATED $Date$
+＠set UPDATED $Date: 2000-11-08 01:50:14 $
＠c ＠set UPDATED-MONTH Oct 1998
＠direntry
＠＠ -43,7 +43,7 ＠＠
＠iftex
＠afourpaper
＠end iftex
-＠ifinfo
+＠ifnottex
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
are preserved on all copies.
＠＠ -64,7 +64,7 ＠＠
into another language, under the above conditions for modified versions,
except that this permission notice may be stated in a translation approved
by the author.
-＠end ifinfo
+＠end ifnottex
＠titlepage
＠sp 10
＠comment The title is printed in a large font.
＠＠ -97,7 +97,7 ＠＠
＠end titlepage
＠page
-＠ifinfo
+＠ifnottex
＠node Top, $B$O$8$a$K(B, (dir), (dir)
＠top SKK
＠＠ -126,7 +126,7 ＠＠
* $B4X?t:w0z(B::
* $B%-!<:w0z(B::
＠end menu
-＠end ifinfo
+＠end ifnottex
＠node $B$O$8$a$K(B, $B%$%s%9%H!<%k(B, Top, Top
＠comment node-name, next, previous, up
＠＠ -2843,7 +2843,7 ＠＠
＠lisp
＠group
-(("$B!V(B" . "$B!W(B") ("$B!X(B" . "$B!Y(B") ("(" . ")") ("$B!J(B" . "$B!K(B") ("{" . "}")
+(("$B!V(B" . "$B!W(B") ("$B!X(B" . "$B!Y(B") ("(" . ")") ("$B!J(B" . "$B!K(B") ("＠{" . "＠}")
("$B!P(B" . "$B!Q(B") ("$B!R(B" . "$B!S(B") ("$B!T(B" . "$B!U(B") ("[" . "]") ("$B!N(B" . "$B!O(B")
("$B!L(B" . "$B!M(B") ("$B!Z(B" . "$B![(B") ("\"" . "\"") ("$B!H(B" . "$B!I(B") ("`" . "'"))
＠end group
＠＠ -7440,7 +7440,7 ＠＠
＠comment node-name, next, previous, up
＠chapter $B$h$/$"$k<ALd$H$=$N2sEz(B(FAQ)
-(a)include{skk-faq.texi}
+＠include skk-faq.texi
＠node $B;v9`:w0z(B, $BJQ?t:w0z(B, $B$h$/$"$k<ALd$H$=$N2sEz(B(FAQ), Top
＠comment node-name, next, previous, up
diff -r dcf5ea49bb3b7dd32df3597e1553d6165666dc55 -r a286aeac29b5d95f0e175b7141ec2715d08a7a9b vip.el
--- a/vip.el
+++ b/vip.el
＠＠ -4,7 +4,7 ＠＠
;; Maintainer: Mikio Nakajima <minakaji(a)osaka.email.ne.jp>
;; Version: 3.7
;; Keywords: emulations
-;; Last Modified: $Date$
+;; Last Modified: $Date: 2000-07-10 04:34:03 $
;; Previous versions:
;; Version 3.5: September 15, 1987
Repository URL: https://bitbucket.org/xemacs/skk/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 3 participants
- 2 comments
[COMMIT] Correct the sense of an assertion, old_mule_ichar_to_unicode()
7 years, 2 months
Aidan Kehoe
Aidan Kehoe
Ar an t-ochtú lá de mí Deireadh Fómhair, scríobh Michael Sperber:
> This one:
>
> changeset: 6311:19876e056bb7
> user: Aidan Kehoe <kehoea(a)parhasard.net>
> date: Thu Oct 05 00:08:17 2017 +0100
> summary: Be more realistic, #'char-to-unicode, #'make-char
>
> ... breaks the build for me:
>
> Compiling /afs/deinprogramm.de/home/sperber/build/xemacs-beta/lisp/mule/mule-category.el...
>
> Fatal error: assertion failed, file text.c, line 1706, chr < 256
>
> Fatal error (6).
> [...]
> Any ideas?
Whoops, the sense of an assertion was the wrong way around. Thanks, Mike.
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1507534237 -3600
# Mon Oct 09 08:30:37 2017 +0100
# Node ID d986eee8b74633db8cfee3ded33cde9de38802e3
# Parent 4ae34c21a927f5fc72839592ed99e960d7538d10
Correct the sense of an assertion, old_mule_ichar_to_unicode()
2017-10-09 Aidan Kehoe <kehoea(a)parhasard.net>
* text.c (old_mule_ichar_to_unicode):
Correct the sense of an assertion here, thank you Mike Sperber!
diff -r 4ae34c21a927 -r d986eee8b746 src/ChangeLog
--- a/src/ChangeLog Sat Oct 07 09:30:37 2017 +0100
+++ b/src/ChangeLog Mon Oct 09 08:30:37 2017 +0100
＠＠ -4,6 +4,11 ＠＠
Qunbound isn't a symbol, don't check for it once we've verified
ORIGINAL_FUN is a symbol.
+2017-10-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * text.c (old_mule_ichar_to_unicode):
+ Correct the sense of an assertion here, thank you Mike Sperber!
+
2017-10-06 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.h:
diff -r 4ae34c21a927 -r d986eee8b746 src/text.c
--- a/src/text.c Sat Oct 07 09:30:37 2017 +0100
+++ b/src/text.c Mon Oct 09 08:30:37 2017 +0100
＠＠ -1703,7 +1703,8 ＠＠
old_mule_ichar_to_unicode (Ichar chr, enum converr fail)
{
ASSERT_VALID_ICHAR (chr);
- text_checking_assert (chr < 256);
+ text_checking_assert (chr >= 256); /* The inline function should handle
+ ASCII, control-1, Latin 1. */
{
int c1, c2;
Lisp_Object charset;
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Don't check whether original_fun is Qunbound, we know it's a symbol, Feval()
7 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1507365037 -3600
# Sat Oct 07 09:30:37 2017 +0100
# Node ID 4ae34c21a927f5fc72839592ed99e960d7538d10
# Parent e3925877abce049cee4c83fcfd8a78a875ee813b
Don't check whether original_fun is Qunbound, we know it's a symbol, Feval()
src/ChangeLog addition:
2017-10-07 Aidan Kehoe <kehoea(a)parhasard.net>
* eval.c (Feval):
Qunbound isn't a symbol, don't check for it once we've verified
ORIGINAL_FUN is a symbol.
diff -r e3925877abce -r 4ae34c21a927 src/ChangeLog
--- a/src/ChangeLog Fri Oct 06 21:09:22 2017 +0100
+++ b/src/ChangeLog Sat Oct 07 09:30:37 2017 +0100
＠＠ -1,3 +1,9 ＠＠
+2017-10-07 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * eval.c (Feval):
+ Qunbound isn't a symbol, don't check for it once we've verified
+ ORIGINAL_FUN is a symbol.
+
2017-10-06 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.h:
diff -r e3925877abce -r 4ae34c21a927 src/eval.c
--- a/src/eval.c Fri Oct 06 21:09:22 2017 +0100
+++ b/src/eval.c Sat Oct 07 09:30:37 2017 +0100
＠＠ -3899,10 +3899,9 ＠＠
retry:
/* Optimise for no indirection. */
fun = original_fun;
- if (SYMBOLP (fun) && !EQ (fun, Qunbound)
- && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
- {
- fun = indirect_function(original_fun, 1);
+ if (SYMBOLP (fun) && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
+ {
+ fun = indirect_function (original_fun, 1);
}
if (SUBRP (fun))
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Drop Ben's attempt to make Big5 into one charset, unicode-internal.
7 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1507320562 -3600
# Fri Oct 06 21:09:22 2017 +0100
# Node ID e3925877abce049cee4c83fcfd8a78a875ee813b
# Parent 19876e056bb7630f1854719c8b037a1f2fb691e8
Drop Ben's attempt to make Big5 into one charset, unicode-internal.
src/ChangeLog addition:
2017-10-06 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.h:
* mule-charset.c:
* mule-charset.c (syms_of_mule_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-charset.c (init_mule_charset):
* mule-coding.c:
* mule-coding.c (byte_big5_two_byte_1_p):
* mule-coding.c (big5_decode):
* mule-coding.c (big5_encode):
* mule-coding.c (decode_big5_char):
* mule-coding.c (big5_char_to_fake_codepoint):
* mule-coding.c (Fencode_big5_char):
* mule-coding.c (init_mule_coding):
* text.c:
* unicode.c (verify_load_unicode_args):
Remove the attempt to implement Big5 as one charset under
unicode-internal; this makes unicode-internal builds incompatible
with byte-code compiled by 21.4 and even source code,
e.g. leim/quail/Punct-B5.el.
lisp/ChangeLog addition:
2017-10-06 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/chinese.el:
* mule/chinese.el (for):
* mule/chinese.el (chinese-big5/list):
* mule/chinese.el (find-charset):
* mule/mule-category.el (predefined-category-list):
* mule/mule-charset.el:
Remove Ben's attempt under unicode-internal to make Big5 into one
charset. This is incompatible with byte-compiled code from 21.4,
which uses the hackish chinese-big5-1, chinese-big5-2 charsets
with ISO-2022 escapes to encode these characters.
If at some point in the future where we use UTF-8 for compiled
code this could be revisited.
diff -r 19876e056bb7 -r e3925877abce lisp/ChangeLog
--- a/lisp/ChangeLog Thu Oct 05 00:08:17 2017 +0100
+++ b/lisp/ChangeLog Fri Oct 06 21:09:22 2017 +0100
＠＠ -1,3 +1,18 ＠＠
+2017-10-06 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * mule/chinese.el:
+ * mule/chinese.el (for):
+ * mule/chinese.el (chinese-big5/list):
+ * mule/chinese.el (find-charset):
+ * mule/mule-category.el (predefined-category-list):
+ * mule/mule-charset.el:
+ Remove Ben's attempt under unicode-internal to make Big5 into one
+ charset. This is incompatible with byte-compiled code from 21.4,
+ which uses the hackish chinese-big5-1, chinese-big5-2 charsets
+ with ISO-2022 escapes to encode these characters.
+ If at some point in the future where we use UTF-8 for compiled
+ code this could be revisited.
+
2017-09-30 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/thai.el:
diff -r 19876e056bb7 -r e3925877abce lisp/mule/chinese.el
--- a/lisp/mule/chinese.el Thu Oct 05 00:08:17 2017 +0100
+++ b/lisp/mule/chinese.el Fri Oct 06 21:09:22 2017 +0100
＠＠ -37,11 +37,8 ＠＠
;; Setup auto-fill-chars for charsets that should invoke auto-filling.
;; SPACE and NEWLINE are already set.
-(loop for l in `(chinese-gb2312
- ,＠(if (find-charset 'chinese-big5-1)
- '(chinese-big5-1 chinese-big5-2)
- '(chinese-big5)))
- do (put-char-table l t auto-fill-chars))
+(loop for l in '(chinese-gb2312 chinese-big5-1 chinese-big5-2)
+ do (put-char-table l t auto-fill-chars))
;; CNS11643 Plane3 thru Plane7
;; These represent more and more obscure Chinese characters.
＠＠ -111,11 +108,9 ＠＠
:list '(chinese-cns11643-1 chinese-cns11643-2 chinese-cns11643-3
chinese-cns11643-4 chinese-cns11643-5 chinese-cns11643-6
chinese-cns11643-7))
-(define-charset-tag 'chinese-big5/list
- :list (if (featurep 'unicode-internal) '(chinese-big5)
- '(chinese-big5-1 chinese-big5-2)))
-(define-charset-tag 'chinese-gb/list
- :list '(chinese-gb2312 chinese-sisheng))
+(define-charset-tag 'chinese-big5/list :list '(chinese-big5-1 chinese-big5-2))
+
+(define-charset-tag 'chinese-gb/list :list '(chinese-gb2312 chinese-sisheng))
(define-charset-tag 'chinese-gb-env/list
:list '(chinese-gb/list chinese-big5/list chinese-cns/list chinese/language))
＠＠ -302,13 +297,8 ＠＠
(define-coding-system-alias 'cn-big5 'big5)
-;; Need to use `compiled-when' because otherwise we will get an error when
-;; compiling this file under Unicode-internal because (charset-id
-;; 'chinese-big5-2) gets evaluated at compile time and fails.
-(compiled-when (find-charset 'chinese-big5-1)
- ;; Big5 font requires special encoding. But under Unicode-internal we
- ;; have one single charset `chinese-big5', with no special encoding
- ;; needed.
+(when (find-charset 'chinese-big5-1)
+ ;; Big5 font requires special encoding.
(define-ccl-program ccl-encode-big5-font
`(0
;; In: R0:chinese-big5-1 or chinese-big5-2
diff -r 19876e056bb7 -r e3925877abce lisp/mule/mule-category.el
--- a/lisp/mule/mule-category.el Thu Oct 05 00:08:17 2017 +0100
+++ b/lisp/mule/mule-category.el Fri Oct 06 21:09:22 2017 +0100
＠＠ -238,10 +238,8 ＠＠
;;much better category definitions.
;;(chinese-cns11643-1 ?t "Chinese Taiwan (CNS or Big5) 2-byte character set")
(chinese-cns11643-2 ?t "Chinese Taiwan (CNS or Big5) 2-byte character set")
- ,＠(if (find-charset 'chinese-big5-1)
- '((chinese-big5-1 ?t)
- (chinese-big5-2 ?t))
- '((chinese-big5 ?t)))
+ (chinese-big5-1 ?t)
+ (chinese-big5-2 ?t)
(korean-ksc5601 ?h "Hangul (Korean) 2-byte character set")
(jit-ucs-charset-0 ?J "Just-in-time-allocated Unicode character")
)
diff -r 19876e056bb7 -r e3925877abce lisp/mule/mule-charset.el
--- a/lisp/mule/mule-charset.el Thu Oct 05 00:08:17 2017 +0100
+++ b/lisp/mule/mule-charset.el Fri Oct 06 21:09:22 2017 +0100
＠＠ -1254,73 +1254,64 ＠＠
tags (cns kanji traditional-chinese chinese/language)
))
-(if (featurep 'unicode-internal)
- ;; We can support Big5 directly.
- (make-charset
- 'chinese-big5
- "Big5 (Chinese traditional)"
- '(dimension 2
- ;; Big5 claims to be a 94x157 charset, but with gaps in the middle.
- ;; In particular, the rows are (theoretically) indexed from A1 - FE
- ;; and the columns from 40 - 7E and A1 - FE. In fact, there are gaps
- ;; in the rows as well (rows C7 and C8 are missing, as well as rows
- ;; FA - FE), but that appears to be due to accident -- i.e. they just
- ;; ran out of chars and/or wanted to make room for expansion. Note
- ;; also that the gap at C7 and C8 is due to the Level-1/Level-2
- ;; division of Big5 (see below). The 94 rows are those between
- ;; A1 and FE, inclusive. The 157 columns count the sum of the columns
- ;; in each disjoint set. For us, we need to use the size of the range
- ;; [40, FE], which is 191.
- chars (94 191)
- offset (161 64)
- short-name "Chinese traditional (Big5)"
- long-name "Chinese traditional (Big5)"
- registries ["big5.eten-0"]
- unicode-map ("unicode/unicode-consortium/EASTASIA/OBSOLETE/BIG5.TXT")
- tags (kanji traditional-chinese chinese/language)
- ))
- ;; Old Mule situation; we can only handle up to 96x96 charsets.
- ;; So we split it into two charsets. According to Ken Lunde's CJKV
- ;; book, Big5 itself is split into "Big Five Level 1" (rows A1-C6)
- ;; and "Big Five Level 2" (rows C9-F9), with the latter containing
- ;; less used characters. We split the same way then coerce the
- ;; result into a 94x94 block.
- (make-charset
- 'chinese-big5-1
- "Frequently used part (A141-C67F) of Big5 (Chinese traditional)"
- '(dimension 2
- chars 94
- final ?0
- graphic 0
- short-name "Chinese traditional (Big5), L1"
- long-name "Chinese traditional (Big5) (Level-1) A141-C67F"
- registries ["big5.eten-0"]
- ;; no unicode map, see chinese-big5-2
- tags (kanji traditional-chinese chinese/language)
- ))
- (make-charset
- 'chinese-big5-2
- "Less frequently used part (C940-FEFE) of Big5 (Chinese traditional)"
- '(dimension 2
- chars 94
- final ?1
- graphic 0
- short-name "Chinese traditional (Big5), L2"
- long-name "Chinese traditional (Big5) (Level-2) C940-FEFE"
- registries ["big5.eten-0"]
- ;; HACK HACK HACK! The `big5' special flag tells the internal code
- ;; in Fload_unicode_mapping_table() to take codepoints out of the
- ;; Big5 table, convert them to a codepoint in a "fake" chinese-big5-1
- ;; or chinese-big5-2, and store appropriately. Hence, it actually
- ;; ignores the name of the charset on which the property is set and
- ;; always stores in the "right" place. Correspondingly, we must set
- ;; the property on big5-2, not 1, so that both charsets will be
- ;; created by the time we initialize the map.
- unicode-map ("unicode/unicode-consortium/EASTASIA/OBSOLETE/BIG5.TXT"
- nil nil nil big5)
- tags (kanji traditional-chinese chinese/language)
- ))
- )
+;; Big5 claims to be a 94x157 charset, but with gaps in the middle.
+;; In particular, the rows are (theoretically) indexed from A1 - FE
+;; and the columns from 40 - 7E and A1 - FE. In fact, there are gaps
+;; in the rows as well (rows C7 and C8 are missing, as well as rows
+;; FA - FE), but that appears to be due to accident -- i.e. they just
+;; ran out of chars and/or wanted to make room for expansion. Note
+;; also that the gap at C7 and C8 is due to the Level-1/Level-2
+;; division of Big5 (see below). The 94 rows are those between
+;; A1 and FE, inclusive. The 157 columns count the sum of the columns
+;; in each disjoint set. For us, we need to use the size of the range
+;; [40, FE], which is 191.
+
+;; Old Mule situation; we can only handle up to 96x96 charsets.
+;; we split it into two charsets. According to Ken Lunde's CJKV
+;; book, Big5 itself is split into "Big Five Level 1" (rows A1-C6)
+;; and "Big Five Level 2" (rows C9-F9), with the latter containing
+;; less used characters. We split the same way then coerce the
+;; result into a 94x94 block.
+
+;; Since escape-quoted, used for byte-compiled files and auto-saves even on
+;; unicode-internal, is ISO 2022-based, it's not practical to switch, as Ben
+;; attempted to do, to a single Big5 charset for unicode-internal; doing this
+;; would mean byte-complied code from 21.4 would error on 21.5.
+
+(make-charset
+ 'chinese-big5-1
+ "Frequently used part (A141-C67F) of Big5 (Chinese traditional)"
+ '(dimension 2
+ chars 94
+ final ?0
+ graphic 0
+ short-name "Chinese traditional (Big5), L1"
+ long-name "Chinese traditional (Big5) (Level-1) A141-C67F"
+ registries ["big5.eten-0"]
+ ;; no unicode map, see chinese-big5-2
+ tags (kanji traditional-chinese chinese/language)))
+
+(make-charset
+ 'chinese-big5-2
+ "Less frequently used part (C940-FEFE) of Big5 (Chinese traditional)"
+ '(dimension 2
+ chars 94
+ final ?1
+ graphic 0
+ short-name "Chinese traditional (Big5), L2"
+ long-name "Chinese traditional (Big5) (Level-2) C940-FEFE"
+ registries ["big5.eten-0"]
+ ;; HACK HACK HACK! The `big5' special flag tells the internal code
+ ;; in Fload_unicode_mapping_table() to take codepoints out of the
+ ;; Big5 table, convert them to a codepoint in a "fake" chinese-big5-1
+ ;; or chinese-big5-2, and store appropriately. Hence, it actually
+ ;; ignores the name of the charset on which the property is set and
+ ;; always stores in the "right" place. Correspondingly, we must set
+ ;; the property on big5-2, not 1, so that both charsets will be
+ ;; created by the time we initialize the map.
+ unicode-map ("unicode/unicode-consortium/EASTASIA/OBSOLETE/BIG5.TXT"
+ nil nil nil big5)
+ tags (kanji traditional-chinese chinese/language)))
;;;;;;;;;;;;;;;;;;;;; Korean ;;;;;;;;;;;;;;;;;;;;
diff -r 19876e056bb7 -r e3925877abce src/ChangeLog
--- a/src/ChangeLog Thu Oct 05 00:08:17 2017 +0100
+++ b/src/ChangeLog Fri Oct 06 21:09:22 2017 +0100
＠＠ -1,3 +1,25 ＠＠
+2017-10-06 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * lisp.h:
+ * mule-charset.c:
+ * mule-charset.c (syms_of_mule_charset):
+ * mule-charset.c (complex_vars_of_mule_charset):
+ * mule-charset.c (init_mule_charset):
+ * mule-coding.c:
+ * mule-coding.c (byte_big5_two_byte_1_p):
+ * mule-coding.c (big5_decode):
+ * mule-coding.c (big5_encode):
+ * mule-coding.c (decode_big5_char):
+ * mule-coding.c (big5_char_to_fake_codepoint):
+ * mule-coding.c (Fencode_big5_char):
+ * mule-coding.c (init_mule_coding):
+ * text.c:
+ * unicode.c (verify_load_unicode_args):
+ Remove the attempt to implement Big5 as one charset under
+ unicode-internal; this makes unicode-internal builds incompatible
+ with byte-code compiled by 21.4 and even source code,
+ e.g. leim/quail/Punct-B5.el.
+
2017-10-04 Aidan Kehoe <kehoea(a)parhasard.net>
* text.c (old_mule_ichar_to_unicode):
diff -r 19876e056bb7 -r e3925877abce src/lisp.h
--- a/src/lisp.h Thu Oct 05 00:08:17 2017 +0100
+++ b/src/lisp.h Fri Oct 06 21:09:22 2017 +0100
＠＠ -5824,12 +5824,10 ＠＠
Qchinese_cns11643_1,
Qchinese_cns11643_2,
#ifdef UNICODE_INTERNAL
- Qchinese_big5,
Qjapanese_shift_jis,
-#else /* not UNICODE_INTERNAL */
+#endif /* UNICODE_INTERNAL */
Qchinese_big5_1,
Qchinese_big5_2,
-#endif /* UNICODE_INTERNAL */
Qchinese_sisheng,
Qcomposite;
diff -r 19876e056bb7 -r e3925877abce src/mule-charset.c
--- a/src/mule-charset.c Thu Oct 05 00:08:17 2017 +0100
+++ b/src/mule-charset.c Fri Oct 06 21:09:22 2017 +0100
＠＠ -60,12 +60,10 ＠＠
Lisp_Object Vcharset_japanese_jisx0212;
Lisp_Object Vcharset_chinese_cns11643_1;
Lisp_Object Vcharset_chinese_cns11643_2;
-#ifdef UNICODE_INTERNAL
-Lisp_Object Vcharset_chinese_big5;
-Lisp_Object Vcharset_japanese_shift_jis;
-#else
Lisp_Object Vcharset_chinese_big5_1;
Lisp_Object Vcharset_chinese_big5_2;
+#ifdef UNICODE_INTERNAL
+Lisp_Object Vcharset_japanese_shift_jis;
#endif /* UNICODE_INTERNAL */
Lisp_Object Vcharset_composite;
＠＠ -197,12 +195,10 ＠＠
Qjapanese_jisx0212,
Qchinese_cns11643_1,
Qchinese_cns11643_2,
-#ifdef UNICODE_INTERNAL
- Qchinese_big5,
- Qjapanese_shift_jis,
-#else /* not UNICODE_INTERNAL */
Qchinese_big5_1,
Qchinese_big5_2,
+#ifdef UNICODE_INTERNAL
+ Qjapanese_shift_jis,
#endif /* UNICODE_INTERNAL */
Qchinese_sisheng,
Qcomposite;
＠＠ -1838,12 +1834,10 ＠＠
DEFSYMBOL (Qjapanese_jisx0212);
DEFSYMBOL (Qchinese_cns11643_1);
DEFSYMBOL (Qchinese_cns11643_2);
-#ifdef UNICODE_INTERNAL
- DEFSYMBOL (Qchinese_big5);
- DEFSYMBOL (Qjapanese_shift_jis);
-#else /* not UNICODE_INTERNAL */
DEFSYMBOL (Qchinese_big5_1);
DEFSYMBOL (Qchinese_big5_2);
+#ifdef UNICODE_INTERNAL
+ DEFSYMBOL (Qjapanese_shift_jis);
#endif /* UNICODE_INTERNAL */
DEFSYMBOL (Qcomposite);
＠＠ -2021,17 +2015,14 ＠＠
Vcharset_chinese_cns11643_1 = Qnil;
staticpro (&Vcharset_chinese_cns11643_2);
Vcharset_chinese_cns11643_2 = Qnil;
-#ifdef UNICODE_INTERNAL
- /* We can support Shift-JIS and Big5 directly.*/
- staticpro (&Vcharset_japanese_shift_jis);
- Vcharset_japanese_shift_jis = Qnil;
- staticpro (&Vcharset_chinese_big5);
- Vcharset_chinese_big5 = Qnil;
-#else
staticpro (&Vcharset_chinese_big5_1);
Vcharset_chinese_big5_1 = Qnil;
staticpro (&Vcharset_chinese_big5_2);
Vcharset_chinese_big5_2 = Qnil;
+#ifdef UNICODE_INTERNAL
+ /* We can support Shift-JIS directly.*/
+ staticpro (&Vcharset_japanese_shift_jis);
+ Vcharset_japanese_shift_jis = Qnil;
#endif /* UNICODE_INTERNAL */
#ifdef ENABLE_COMPOSITE_CHARS
＠＠ -2144,12 +2135,10 ＠＠
Vcharset_japanese_jisx0212 = Fget_charset (Qjapanese_jisx0212);
Vcharset_chinese_cns11643_1 = Fget_charset (Qchinese_cns11643_1);
Vcharset_chinese_cns11643_2 = Fget_charset (Qchinese_cns11643_2);
-#ifdef UNICODE_INTERNAL
- /* We can support Shift-JIS and Big5 directly.*/
- Vcharset_japanese_shift_jis = Fget_charset (Qjapanese_shift_jis);
- Vcharset_chinese_big5 = Fget_charset (Qchinese_big5);
-#else
Vcharset_chinese_big5_1 = Fget_charset (Qchinese_big5_1);
Vcharset_chinese_big5_2 = Fget_charset (Qchinese_big5_2);
+#ifdef UNICODE_INTERNAL
+ /* We can support Shift-JIS directly.*/
+ Vcharset_japanese_shift_jis = Fget_charset (Qjapanese_shift_jis);
#endif /* UNICODE_INTERNAL */
}
diff -r 19876e056bb7 -r e3925877abce src/mule-coding.c
--- a/src/mule-coding.c Thu Oct 05 00:08:17 2017 +0100
+++ b/src/mule-coding.c Fri Oct 06 21:09:22 2017 +0100
＠＠ -898,8 +898,6 ＠＠
/* BIG5 (used for Mandarin in Taiwan). */
DEFINE_CODING_SYSTEM_TYPE_WITH_DATA (big5);
-#ifndef UNICODE_INTERNAL
-
/* BIG5 is a coding system encoding two character sets: ASCII and
Big5. An ASCII character is encoded as is. Big5 is a two-byte
character set and is encoded in two-byte.
＠＠ -991,8 +989,6 ＠＠
b2 += b2 < 0x3F ? 0x40 : 0x62; \
} while (0)
-#endif /* not UNICODE_INTERNAL */
-
inline static int
byte_big5_two_byte_1_p (int c)
{
＠＠ -1024,17 +1020,11 ＠＠
/* Previous character was first byte of Big5 char. */
if (byte_big5_two_byte_2_p (c))
{
-#ifdef UNICODE_INTERNAL
- non_ascii_charset_codepoint_to_dynarr
- (Vcharset_chinese_big5, data->ch, c, dst,
- CONVERR_USE_PRIVATE);
-#else /* not UNICODE_INTERNAL */
Lisp_Object charset;
int b1, b2;
DECODE_BIG5 (data->ch, c, charset, b1, b2);
non_ascii_charset_codepoint_to_dynarr
(charset, b1, b2, dst, CONVERR_USE_PRIVATE);
-#endif /* UNICODE_INTERNAL */
}
else
{
＠＠ -1084,13 +1074,6 ＠＠
}
ichar_to_charset_codepoint
(ich, Vbig5_precedence, &charset, &c1, &c2, CONVERR_FAIL);
-#ifdef UNICODE_INTERNAL
- if (EQ (charset, Vcharset_chinese_big5))
- {
- Dynarr_add (dst, c1);
- Dynarr_add (dst, c2);
- }
-#else /* not UNICODE_INTERNAL */
if (EQ (charset, Vcharset_chinese_big5_1) ||
EQ (charset, Vcharset_chinese_big5_2))
{
＠＠ -1099,7 +1082,6 ＠＠
Dynarr_add (dst, b1);
Dynarr_add (dst, b2);
}
-#endif /* UNICODE_INTERNAL */
else
{
handle_standard_encoding_error (str, src, dst);
＠＠ -1131,10 +1113,6 ＠＠
static Ichar
decode_big5_char (int b1, int b2)
{
-#ifdef UNICODE_INTERNAL
- return charset_codepoint_to_ichar (Vcharset_chinese_big5, b1, b2,
- CONVERR_FAIL);
-#else /* not UNICODE_INTERNAL */
if (byte_big5_two_byte_1_p (b1) &&
byte_big5_two_byte_2_p (b2))
{
＠＠ -1146,11 +1124,8 ＠＠
}
else
return -1;
-#endif /* UNICODE_INTERNAL */
}
-#ifndef UNICODE_INTERNAL
-
void
big5_char_to_fake_codepoint (int b1, int b2, Lisp_Object *charset, int *c1,
int *c2)
＠＠ -1168,8 +1143,6 ＠＠
}
}
-#endif /* not UNICODE_INTERNAL */
-
DEFUN ("decode-big5-char", Fdecode_big5_char, 1, 1, 0, /*
Convert Big Five character codes in CODE into a character.
CODE is a cons of two integers specifying the codepoints in Big Five.
＠＠ -1208,12 +1181,6 ＠＠
CHECK_CHAR_COERCE_INT (character);
ichar_to_charset_codepoint (XCHAR (character), Vbig5_precedence,
&charset, &c1, &c2, CONVERR_FAIL);
-#ifdef UNICODE_INTERNAL
- if (EQ (charset, Vcharset_chinese_big5))
- {
- return Fcons (make_fixnum (c1), make_fixnum (c2));
- }
-#else /* not UNICODE_INTERNAL */
if (EQ (charset, Vcharset_chinese_big5_1) ||
EQ (charset, Vcharset_chinese_big5_2))
{
＠＠ -1221,7 +1188,6 ＠＠
ENCODE_BIG5 (charset, c1, c2, b1, b2);
return Fcons (make_fixnum (b1), make_fixnum (b2));
}
-#endif /* UNICODE_INTERNAL */
else
return Qnil;
}
＠＠ -4187,14 +4153,7 ＠＠
simple_convert_predence_list_to_array
(list3 (Vcharset_japanese_jisx0208, Vcharset_japanese_jisx0208_1978,
Vcharset_katakana_jisx0201));
-
-#ifdef UNICODE_INTERNAL
- Vbig5_precedence =
- simple_convert_predence_list_to_array
- (list1 (Vcharset_chinese_big5));
-#else /* not UNICODE_INTERNAL */
Vbig5_precedence =
simple_convert_predence_list_to_array
(list2 (Vcharset_chinese_big5_1, Vcharset_chinese_big5_2));
-#endif /* UNICODE_INTERNAL */
}
diff -r 19876e056bb7 -r e3925877abce src/text.c
--- a/src/text.c Thu Oct 05 00:08:17 2017 +0100
+++ b/src/text.c Fri Oct 06 21:09:22 2017 +0100
＠＠ -5521,14 +5521,11 ＠＠
All codes above are two decimal numbers except for Big Five and ANSI
Z39.64, which we don't support. We add 32 to each of the decimal numbers.
-Note that in an old-Mule world (see below), Big Five is split in a rather
-hackish fashion into two charsets, `chinese-big5-1' and `chinese-big5-2',
-due to its excessive size (94x157), with the first codepoint in the range
-0xA1 to 0xFE and the second in the range 0x40 to 0x7E or 0xA1 to 0xFE.
-`decode-big5-char' is used to generate the char from its codes, and
-`encode-big5-char' extracts the codes. This hack doesn't exist with
-Unicode-internal, and hence the expression (make-char 'chinese-big5 164 116)
-could be used.
+Big Five is split in a rather hackish fashion into two charsets,
+`chinese-big5-1' and `chinese-big5-2', due to its excessive size (94x157),
+with the first codepoint in the range 0xA1 to 0xFE and the second in the range
+0x40 to 0x7E or 0xA1 to 0xFE. `decode-big5-char' is used to generate the char
+from its codes, and `encode-big5-char' extracts the codes.
Note that there are three different internal formats for characters:
diff -r 19876e056bb7 -r e3925877abce src/unicode.c
--- a/src/unicode.c Thu Oct 05 00:08:17 2017 +0100
+++ b/src/unicode.c Fri Oct 06 21:09:22 2017 +0100
＠＠ -2248,10 +2248,8 ＠＠
{
if (EQ (elt, Qignore_first_column))
*flags_out |= LOAD_UNICODE_IGNORE_FIRST_COLUMN;
-#ifndef UNICODE_INTERNAL
else if (EQ (elt, Qbig5))
*flags_out |= LOAD_UNICODE_BIG5;
-#endif /* not UNICODE_INTERNAL */
else
invalid_constant
("Unrecognized `load-unicode-mapping-table' flag", elt);
＠＠ -2324,9 +2322,7 ＠＠
int flgs;
int stage;
int to_unicode_min_val[256], to_unicode_max_val[256];
-#ifndef UNICODE_INTERNAL
int big5_other_unicode_min_val[256], big5_other_unicode_max_val[256];
-#endif
int i;
/* This may be called to autoload the Unicode tables, from a function
＠＠ -2338,7 +2334,6 ＠＠
verify_load_unicode_args (filename, start, end, offset, flags,
&st, &en, &of, &flgs);
-#ifndef UNICODE_INTERNAL
if (flgs & LOAD_UNICODE_BIG5)
{
/* At this point the charsets haven't been initialized
＠＠ -2353,7 +2348,6 ＠＠
big5_other_unicode_max_val[i] = 0;
}
}
-#endif /* not UNICODE_INTERNAL */
for (i = 0; i < 256; i++)
{
＠＠ -2482,7 +2476,6 ＠＠
cp1high = cp1 >> 8;
cp1low = cp1 & 255;
-#ifndef UNICODE_INTERNAL
if (flgs & LOAD_UNICODE_BIG5)
{
big5_char_to_fake_codepoint (cp1high, cp1low,
＠＠ -2509,7 +2502,6 ＠＠
set_unicode_conversion (cp2, charset, c1, c2);
}
else
-#endif /* not UNICODE_INTERNAL */
{
int l1, l2, h1, h2;
c1 = cp1high, c2 = cp1low;
＠＠ -2520,9 +2512,7 ＠＠
goto out_of_range;
}
-#ifndef UNICODE_INTERNAL
do_it:
-#endif
if (stage == 0)
{
if (c2 < to_unicode_min_val[c1])
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Be more realistic, #'char-to-unicode, #'make-char
7 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1507158497 -3600
# Thu Oct 05 00:08:17 2017 +0100
# Node ID 19876e056bb7630f1854719c8b037a1f2fb691e8
# Parent 8df05e6e201fbbd618c7127c762bf954028ceec3
Be more realistic, #'char-to-unicode, #'make-char
2017-10-04 Aidan Kehoe <kehoea(a)parhasard.net>
* text.c (old_mule_ichar_to_unicode):
Assert we haven't been handed an Ichar less than 256 in value.
* text.c (unicode_internal_handle_bad_ichar_to_unicode): New.
Handle a value passed to the inline ichar_to_unicode(), if CHR is
not an official Unicode character and FAIL is not
CONVERR_USE_PRIVATE.
* text.c (Fmake_char):
Make this API compatible with GNU and with pre-unicode-internal,
return a private character by default if HANDLE-ERROR is nil.
* text.c (Fchar_to_unicode):
Return nil if HANDLE-ERROR is FAIL or nil here.
* text.c (Funicode_to_char):
* text.c (Fchar_to_charset_codepoint):
* text.c (Fchar_charset):
* text.c (Fsplit_char):
Update the docstrings in this three functions.
* text.h (ichar_to_unicode):
Make the implementation of this a bit more realistic with
UNICODE_INTERNAL, use the new
unicode_internal_handle_bad_ichar_to_unicode().
diff -r 8df05e6e201f -r 19876e056bb7 src/ChangeLog
--- a/src/ChangeLog Sat Sep 30 16:16:08 2017 +0100
+++ b/src/ChangeLog Thu Oct 05 00:08:17 2017 +0100
＠＠ -1,3 +1,26 ＠＠
+2017-10-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * text.c (old_mule_ichar_to_unicode):
+ Assert we haven't been handed an Ichar less than 256 in value.
+ * text.c (unicode_internal_handle_bad_ichar_to_unicode): New.
+ Handle a value passed to the inline ichar_to_unicode(), if CHR is
+ not an official Unicode character and FAIL is not
+ CONVERR_USE_PRIVATE.
+ * text.c (Fmake_char):
+ Make this API compatible with GNU and with pre-unicode-internal,
+ return a private character by default if HANDLE-ERROR is nil.
+ * text.c (Fchar_to_unicode):
+ Return nil if HANDLE-ERROR is FAIL or nil here.
+ * text.c (Funicode_to_char):
+ * text.c (Fchar_to_charset_codepoint):
+ * text.c (Fchar_charset):
+ * text.c (Fsplit_char):
+ Update the docstrings in this three functions.
+ * text.h (ichar_to_unicode):
+ Make the implementation of this a bit more realistic with
+ UNICODE_INTERNAL, use the new
+ unicode_internal_handle_bad_ichar_to_unicode().
+
2017-09-30 Aidan Kehoe <kehoea(a)parhasard.net>
* text.c (old_mule_non_ascii_valid_ichar_p):
diff -r 8df05e6e201f -r 19876e056bb7 src/text.c
--- a/src/text.c Sat Sep 30 16:16:08 2017 +0100
+++ b/src/text.c Thu Oct 05 00:08:17 2017 +0100
＠＠ -1703,11 +1703,7 ＠＠
old_mule_ichar_to_unicode (Ichar chr, enum converr fail)
{
ASSERT_VALID_ICHAR (chr);
-
- /* This shortcut depends on the representation of an Ichar, see text.c. */
- if (chr < 256)
- return (int) chr;
-
+ text_checking_assert (chr < 256);
{
int c1, c2;
Lisp_Object charset;
＠＠ -1862,6 +1858,39 ＠＠
#endif /* not UNICODE_INTERNAL */
+int
+unicode_internal_handle_bad_ichar_to_unicode (Ichar chr, enum converr fail)
+{
+ ASSERT_VALID_ICHAR (chr);
+ text_checking_assert (fail != CONVERR_USE_PRIVATE);
+ text_checking_assert (!valid_unicode_codepoint_p (chr,
+ UNICODE_OFFICIAL_ONLY));
+ switch (fail)
+ {
+ case CONVERR_FAIL:
+ return -1;
+ case CONVERR_ERROR:
+ if (chr > UNICODE_OFFICIAL_MAX)
+ {
+ args_out_of_range_3 (make_fixnum (chr), Qzero,
+ make_fixnum (UNICODE_OFFICIAL_MAX));
+ }
+ if (chr >= FIRST_UTF_16_SURROGATE)
+ {
+ args_out_of_range_3 (make_fixnum (chr), Qzero,
+ make_fixnum (FIRST_UTF_16_SURROGATE));
+ }
+ /* FALLTHROUGH */
+ case CONVERR_ABORT:
+ case CONVERR_USE_PRIVATE:
+ default:
+ ABORT ();
+ case CONVERR_SUCCEED:
+ case CONVERR_SUBSTITUTE:
+ return 0xFFFD;
+ }
+}
+
#endif /* MULE */
/* Take a possibly invalid Ichar value (must be >= 0) and move upwards as
＠＠ -5422,11 +5451,11 ＠＠
to translate. Currently, this happens only with Unicode-internal (see
below):
-nil or `fail' Return nil
-`abort' Signal an error
-`succeed' Same as `substitute'
-`substitute' Substitute the Unicode replacement char (0xFFFD)
-`use-private' Encode using private Unicode space
+`use-private' or `nil' Encode using private Unicode space
+`fail' Return nil
+`error' Signal an error
+`succeed' Same as `substitute'
+`substitute' Substitute the Unicode replacement char (0xFFFD)
Each octet should be in the range corresponding to the offset and size
for that dimension, as defined in the charset. For a typical one-dimensional
＠＠ -5602,10 +5631,16 ＠＠
*/
(charset, octet1, octet2, handle_error))
{
- enum converr fail = decode_handle_error (handle_error, 1);
+ enum converr fail;
int a1, a2;
Ichar ch;
+ if (NILP (handle_error))
+ {
+ handle_error = Quse_private;
+ }
+
+ fail = decode_handle_error (handle_error, 1);
charset = get_external_charset_codepoint (charset, octet1, octet2,
&a1, &a2, 1);
ch = charset_codepoint_to_ichar (charset, a1, a2, fail);
＠＠ -5622,7 +5657,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute the Unicode replacement char (0xFFFD)
`use-private' Encode using private Unicode space
＠＠ -5630,9 +5665,18 ＠＠
(character, handle_error))
{
enum converr fail = decode_handle_error (handle_error, 1);
+ INT_32_BIT result;
CHECK_CHAR_COERCE_INT (character);
- return make_fixnum (ichar_to_unicode (XCHAR (character), fail));
+
+ result = ichar_to_unicode (XCHAR (character), fail);
+
+ if (result < 0)
+ {
+ return Qnil;
+ }
+
+ return make_fixnum (result);
}
DEFUN ("unicode-to-char", Funicode_to_char, 1, 3, 0, /*
＠＠ -5684,7 +5728,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5727,7 +5771,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5761,7 +5805,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute the Unicode replacement char (0xFFFD)
`use-private' Encode using private Unicode space
＠＠ -5799,7 +5843,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5849,7 +5893,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5928,7 +5972,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
diff -r 8df05e6e201f -r 19876e056bb7 src/text.h
--- a/src/text.h Sat Sep 30 16:16:08 2017 +0100
+++ b/src/text.h Thu Oct 05 00:08:17 2017 +0100
＠＠ -522,15 +522,17 ＠＠
#define LAST_TRAILING_BYTE 0xFF
#endif
-#ifndef UNICODE_INTERNAL
-MODULE_API int old_mule_non_ascii_valid_ichar_p (Ichar ch);
+#ifdef UNICODE_INTERNAL
+MODULE_API INT_32_BIT unicode_internal_handle_bad_ichar_to_unicode (Ichar,
+ enum
+ converr);
+#elif defined (MULE)
+MODULE_API INT_32_BIT old_mule_non_ascii_valid_ichar_p (Ichar ch);
#endif
-/* Return whether the given Ichar is valid.
- */
-
+/* Return whether the given Ichar is valid. */
DECLARE_INLINE_HEADER (
-int
+Boolint
valid_ichar_p (Ichar ch)
)
{
＠＠ -826,12 +828,30 ＠＠
Return value will be -1 if cannot convert. */
DECLARE_INLINE_HEADER (
int
-ichar_to_unicode (Ichar chr, enum converr USED_IF_OLD_MULE (fail))
+ichar_to_unicode (Ichar chr, enum converr USED_IF_MULE (fail))
)
{
ASSERT_VALID_ICHAR (chr);
-#if defined (MULE) && !defined (UNICODE_INTERNAL)
+ /* This shortcut depends on the representation of an Ichar, see text.c. */
+ if (chr < 256)
+ {
+ return (int) chr;
+ }
+
+#ifdef UNICODE_INTERNAL
+ if (fail == CONVERR_USE_PRIVATE)
+ {
+ return (int) chr;
+ }
+
+ if (valid_unicode_codepoint_p (chr, UNICODE_OFFICIAL_ONLY))
+ {
+ return (int) chr;
+ }
+
+ return unicode_internal_handle_bad_ichar_to_unicode (chr, fail);
+#elif defined (MULE)
return old_mule_ichar_to_unicode (chr, fail);
#else
/* Unicode-internal or non-Mule */
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Be more realistic, #'char-to-unicode, #'make-char
7 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1507158497 -3600
# Thu Oct 05 00:08:17 2017 +0100
# Node ID 19876e056bb7630f1854719c8b037a1f2fb691e8
# Parent 8df05e6e201fbbd618c7127c762bf954028ceec3
Be more realistic, #'char-to-unicode, #'make-char
2017-10-04 Aidan Kehoe <kehoea(a)parhasard.net>
* text.c (old_mule_ichar_to_unicode):
Assert we haven't been handed an Ichar less than 256 in value.
* text.c (unicode_internal_handle_bad_ichar_to_unicode): New.
Handle a value passed to the inline ichar_to_unicode(), if CHR is
not an official Unicode character and FAIL is not
CONVERR_USE_PRIVATE.
* text.c (Fmake_char):
Make this API compatible with GNU and with pre-unicode-internal,
return a private character by default if HANDLE-ERROR is nil.
* text.c (Fchar_to_unicode):
Return nil if HANDLE-ERROR is FAIL or nil here.
* text.c (Funicode_to_char):
* text.c (Fchar_to_charset_codepoint):
* text.c (Fchar_charset):
* text.c (Fsplit_char):
Update the docstrings in this three functions.
* text.h (ichar_to_unicode):
Make the implementation of this a bit more realistic with
UNICODE_INTERNAL, use the new
unicode_internal_handle_bad_ichar_to_unicode().
diff -r 8df05e6e201f -r 19876e056bb7 src/ChangeLog
--- a/src/ChangeLog Sat Sep 30 16:16:08 2017 +0100
+++ b/src/ChangeLog Thu Oct 05 00:08:17 2017 +0100
＠＠ -1,3 +1,26 ＠＠
+2017-10-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * text.c (old_mule_ichar_to_unicode):
+ Assert we haven't been handed an Ichar less than 256 in value.
+ * text.c (unicode_internal_handle_bad_ichar_to_unicode): New.
+ Handle a value passed to the inline ichar_to_unicode(), if CHR is
+ not an official Unicode character and FAIL is not
+ CONVERR_USE_PRIVATE.
+ * text.c (Fmake_char):
+ Make this API compatible with GNU and with pre-unicode-internal,
+ return a private character by default if HANDLE-ERROR is nil.
+ * text.c (Fchar_to_unicode):
+ Return nil if HANDLE-ERROR is FAIL or nil here.
+ * text.c (Funicode_to_char):
+ * text.c (Fchar_to_charset_codepoint):
+ * text.c (Fchar_charset):
+ * text.c (Fsplit_char):
+ Update the docstrings in this three functions.
+ * text.h (ichar_to_unicode):
+ Make the implementation of this a bit more realistic with
+ UNICODE_INTERNAL, use the new
+ unicode_internal_handle_bad_ichar_to_unicode().
+
2017-09-30 Aidan Kehoe <kehoea(a)parhasard.net>
* text.c (old_mule_non_ascii_valid_ichar_p):
diff -r 8df05e6e201f -r 19876e056bb7 src/text.c
--- a/src/text.c Sat Sep 30 16:16:08 2017 +0100
+++ b/src/text.c Thu Oct 05 00:08:17 2017 +0100
＠＠ -1703,11 +1703,7 ＠＠
old_mule_ichar_to_unicode (Ichar chr, enum converr fail)
{
ASSERT_VALID_ICHAR (chr);
-
- /* This shortcut depends on the representation of an Ichar, see text.c. */
- if (chr < 256)
- return (int) chr;
-
+ text_checking_assert (chr < 256);
{
int c1, c2;
Lisp_Object charset;
＠＠ -1862,6 +1858,39 ＠＠
#endif /* not UNICODE_INTERNAL */
+int
+unicode_internal_handle_bad_ichar_to_unicode (Ichar chr, enum converr fail)
+{
+ ASSERT_VALID_ICHAR (chr);
+ text_checking_assert (fail != CONVERR_USE_PRIVATE);
+ text_checking_assert (!valid_unicode_codepoint_p (chr,
+ UNICODE_OFFICIAL_ONLY));
+ switch (fail)
+ {
+ case CONVERR_FAIL:
+ return -1;
+ case CONVERR_ERROR:
+ if (chr > UNICODE_OFFICIAL_MAX)
+ {
+ args_out_of_range_3 (make_fixnum (chr), Qzero,
+ make_fixnum (UNICODE_OFFICIAL_MAX));
+ }
+ if (chr >= FIRST_UTF_16_SURROGATE)
+ {
+ args_out_of_range_3 (make_fixnum (chr), Qzero,
+ make_fixnum (FIRST_UTF_16_SURROGATE));
+ }
+ /* FALLTHROUGH */
+ case CONVERR_ABORT:
+ case CONVERR_USE_PRIVATE:
+ default:
+ ABORT ();
+ case CONVERR_SUCCEED:
+ case CONVERR_SUBSTITUTE:
+ return 0xFFFD;
+ }
+}
+
#endif /* MULE */
/* Take a possibly invalid Ichar value (must be >= 0) and move upwards as
＠＠ -5422,11 +5451,11 ＠＠
to translate. Currently, this happens only with Unicode-internal (see
below):
-nil or `fail' Return nil
-`abort' Signal an error
-`succeed' Same as `substitute'
-`substitute' Substitute the Unicode replacement char (0xFFFD)
-`use-private' Encode using private Unicode space
+`use-private' or `nil' Encode using private Unicode space
+`fail' Return nil
+`error' Signal an error
+`succeed' Same as `substitute'
+`substitute' Substitute the Unicode replacement char (0xFFFD)
Each octet should be in the range corresponding to the offset and size
for that dimension, as defined in the charset. For a typical one-dimensional
＠＠ -5602,10 +5631,16 ＠＠
*/
(charset, octet1, octet2, handle_error))
{
- enum converr fail = decode_handle_error (handle_error, 1);
+ enum converr fail;
int a1, a2;
Ichar ch;
+ if (NILP (handle_error))
+ {
+ handle_error = Quse_private;
+ }
+
+ fail = decode_handle_error (handle_error, 1);
charset = get_external_charset_codepoint (charset, octet1, octet2,
&a1, &a2, 1);
ch = charset_codepoint_to_ichar (charset, a1, a2, fail);
＠＠ -5622,7 +5657,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute the Unicode replacement char (0xFFFD)
`use-private' Encode using private Unicode space
＠＠ -5630,9 +5665,18 ＠＠
(character, handle_error))
{
enum converr fail = decode_handle_error (handle_error, 1);
+ INT_32_BIT result;
CHECK_CHAR_COERCE_INT (character);
- return make_fixnum (ichar_to_unicode (XCHAR (character), fail));
+
+ result = ichar_to_unicode (XCHAR (character), fail);
+
+ if (result < 0)
+ {
+ return Qnil;
+ }
+
+ return make_fixnum (result);
}
DEFUN ("unicode-to-char", Funicode_to_char, 1, 3, 0, /*
＠＠ -5684,7 +5728,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5727,7 +5771,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5761,7 +5805,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute the Unicode replacement char (0xFFFD)
`use-private' Encode using private Unicode space
＠＠ -5799,7 +5843,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5849,7 +5893,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
＠＠ -5928,7 +5972,7 ＠＠
HANDLE-ERROR controls error behavior:
nil or `fail' Return nil
-`abort' Signal an error
+`error' Signal an error
`succeed' Same as `substitute'
`substitute' Substitute a '?' character
*/
diff -r 8df05e6e201f -r 19876e056bb7 src/text.h
--- a/src/text.h Sat Sep 30 16:16:08 2017 +0100
+++ b/src/text.h Thu Oct 05 00:08:17 2017 +0100
＠＠ -522,15 +522,17 ＠＠
#define LAST_TRAILING_BYTE 0xFF
#endif
-#ifndef UNICODE_INTERNAL
-MODULE_API int old_mule_non_ascii_valid_ichar_p (Ichar ch);
+#ifdef UNICODE_INTERNAL
+MODULE_API INT_32_BIT unicode_internal_handle_bad_ichar_to_unicode (Ichar,
+ enum
+ converr);
+#elif defined (MULE)
+MODULE_API INT_32_BIT old_mule_non_ascii_valid_ichar_p (Ichar ch);
#endif
-/* Return whether the given Ichar is valid.
- */
-
+/* Return whether the given Ichar is valid. */
DECLARE_INLINE_HEADER (
-int
+Boolint
valid_ichar_p (Ichar ch)
)
{
＠＠ -826,12 +828,30 ＠＠
Return value will be -1 if cannot convert. */
DECLARE_INLINE_HEADER (
int
-ichar_to_unicode (Ichar chr, enum converr USED_IF_OLD_MULE (fail))
+ichar_to_unicode (Ichar chr, enum converr USED_IF_MULE (fail))
)
{
ASSERT_VALID_ICHAR (chr);
-#if defined (MULE) && !defined (UNICODE_INTERNAL)
+ /* This shortcut depends on the representation of an Ichar, see text.c. */
+ if (chr < 256)
+ {
+ return (int) chr;
+ }
+
+#ifdef UNICODE_INTERNAL
+ if (fail == CONVERR_USE_PRIVATE)
+ {
+ return (int) chr;
+ }
+
+ if (valid_unicode_codepoint_p (chr, UNICODE_OFFICIAL_ONLY))
+ {
+ return (int) chr;
+ }
+
+ return unicode_internal_handle_bad_ichar_to_unicode (chr, fail);
+#elif defined (MULE)
return old_mule_ichar_to_unicode (chr, fail);
#else
/* Unicode-internal or non-Mule */
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments