Mercurial > emacs
annotate leim/leim-ext.el @ 107984:bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Basically, this makes the structure of buffer-local values and object
forwarding explicit in the type of Lisp_Symbols rather than use
special Lisp_Objects for that. This tends to lead to slightly more
verbose code, but is more C-like, simpler, and makes it easier to make
sure we handled all cases, among other things by letting the compiler
help us check it.
* lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
Removing forwarding objects.
(enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
(struct Lisp_Symbol): Make the various forms of variable-forwarding
explicit rather than hiding them inside Lisp_Object "values".
(XFWDTYPE): New macro.
(XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
(XBUFFER_LOCAL_VALUE): Remove.
(SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
(SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
(SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
(struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
(struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
Remove the Lisp_Misc_* header.
(struct Lisp_Buffer_Local_Value): Redefine.
(BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
(struct Lisp_Misc_Any): Add filler to get the right size.
(struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
Lisp_Intfwd.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_KBOARD): Allocate a forwarding object.
* data.c (do_blv_forwarding, store_blv_forwarding): New macros.
(let_shadows_global_binding_p): New function.
(union Lisp_Val_Fwd): New type.
(make_blv): New function.
(swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
(store_symval_forwarding, swap_in_global_binding, Fboundp)
(swap_in_symval_forwarding, find_symbol_value, Fset)
(let_shadows_buffer_binding_p, set_internal, default_value)
(Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local)
(Flocal_variable_p, Flocal_variable_if_set_p)
(Fvariable_binding_locus):
* xdisp.c (select_frame_for_redisplay):
* lread.c (Fintern, Funintern, init_obarray, defvar_int)
(defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
* frame.c (store_frame_param):
* eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
* bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
value structure.
* buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
(clone_per_buffer_values): Only adjust markers into the current buffer.
(reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
(Fbuffer_local_value, set_buffer_internal_1)
(swap_out_buffer_local_variables):
Adapt to the new symbol value structure.
(DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
(defvar_per_buffer): Take a new arg for the fwd object.
(buffer_lisp_local_variables): Return a proper alist (different fix
for bug#4138).
* alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
(Fgarbage_collect): Don't handle buffer_defaults specially.
(mark_object): Handle new symbol value structure rather than the old
special Lisp_Misc_* objects.
(gc_sweep) <symbols>: Free also the buffer-local-value objects.
* term.c (set_tty_color_mode):
* bidi.c (bidi_initialize): Don't access the ->value field directly.
* buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
a buffer_local_flags.
* print.c (print_object): Get rid of impossible forwarding objects.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 19 Apr 2010 21:50:52 -0400 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
rev | line source |
---|---|
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
1 ;; leim-ext.el -- extra leim configuration -*- coding:utf-8; -*- |
55917 | 2 |
106815 | 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
55917 | 4 ;; Free Software Foundation, Inc. |
106815 | 5 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
55917 | 6 ;; National Institute of Advanced Industrial Science and Technology (AIST) |
7 ;; Registration Number H13PRO009 | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
94711
234b6de33fa7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79728
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
55917 | 12 ;; it under the terms of the GNU General Public License as published by |
94711
234b6de33fa7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79728
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
234b6de33fa7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79728
diff
changeset
|
14 ;; (at your option) any later version. |
55917 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94711
234b6de33fa7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79728
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
55917 | 23 |
24 ;;; Commentary: | |
25 | |
26 ;; Makefile in this directory appends the contents of this file (only | |
55921 | 27 ;; such non-empty lines that don't begin with ';') to the generated |
28 ;; file leim-list.el. | |
55917 | 29 |
30 ;;; Code: | |
31 | |
32 (eval-after-load "quail/PY-b5" | |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
33 '(quail-defrule "ling2" ?○ nil t)) |
55930
5ad72ade5450
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
55921
diff
changeset
|
34 |
63808
8db64e24d5dc
Add rules for inserting full-width space for
Kenichi Handa <handa@m17n.org>
parents:
57179
diff
changeset
|
35 ;; Enable inputting full-width space (U+3000). |
8db64e24d5dc
Add rules for inserting full-width space for
Kenichi Handa <handa@m17n.org>
parents:
57179
diff
changeset
|
36 (eval-after-load "quail/Punct" |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
37 '(quail-defrule " " ? nil t)) |
63808
8db64e24d5dc
Add rules for inserting full-width space for
Kenichi Handa <handa@m17n.org>
parents:
57179
diff
changeset
|
38 (eval-after-load "quail/Punct-b5" |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
39 '(quail-defrule " " ? nil t)) |
63808
8db64e24d5dc
Add rules for inserting full-width space for
Kenichi Handa <handa@m17n.org>
parents:
57179
diff
changeset
|
40 |
57179
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
41 (autoload 'ucs-input-activate "quail/uni-input" |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
42 "Activate UCS input method. |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
43 With arg, activate UCS input method if and only if arg is positive. |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
44 |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
45 While this input method is active, the variable |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
46 `input-method-function' is bound to the function `ucs-input-method'.") |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
47 |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
48 (register-input-method "ucs" "UTF-8" 'ucs-input-activate "U+" |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
49 "Unicode input as hex in the form Uxxxx.") |
9f1b3f7445fb
Add autoload for 'ucs-input-activate and
Kenichi Handa <handa@m17n.org>
parents:
55930
diff
changeset
|
50 |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
51 (autoload 'hangul-input-method-activate "quail/hangul" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
52 "Activate Hangul input method INPUT-METHOD. |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
53 FUNC is a function to handle input key. |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
54 HELP-TEXT is a text set in `hangul-input-method-help-text'.") |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
55 |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
56 (register-input-method |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
57 "korean-hangul" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
58 "UTF-8" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
59 'hangul-input-method-activate |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
60 "한2" |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
61 "Hangul 2-Bulsik Input" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
62 'hangul2-input-method |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
63 "Input method: korean-hangul2 (mode line indicator:한2)\n\nHangul 2-Bulsik input method.") |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
64 |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
65 (register-input-method |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
66 "korean-hangul3f" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
67 "UTF-8" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
68 'hangul-input-method-activate |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
69 "한3f" |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
70 "Hangul 3-Bulsik final Input" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
71 'hangul3-input-method |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
72 "Input method: korean-hangul3 (mode line indicator:한3f)\n\nHangul 3-Bulsik final input method.") |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
73 |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
74 (register-input-method |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
75 "korean-hangul390" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
76 "UTF-8" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
77 'hangul-input-method-activate |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
78 "한390" |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
79 "Hangul 3-Bulsik 390 Input" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
80 'hangul390-input-method |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
81 "Input method: korean-hangul390 (mode line indicator:한390)\n\nHangul 3-Bulsik 390 input method.") |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
82 |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
83 (register-input-method |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
84 "korean-hangul3" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
85 "UTF-8" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
86 'hangul-input-method-activate |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
87 "한390" |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
88 "Hangul 3-Bulsik 390 Input" |
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
89 'hangul390-input-method |
102646
faa5a24c0872
Change the encoding to utf-8.
Kenichi Handa <handa@m17n.org>
parents:
100963
diff
changeset
|
90 "Input method: korean-hangul390 (mode line indicator:한390)\n\nHangul 3-Bulsik 390 input method.") |
95501
eb08bb46487b
Register input methods "korean-hangul",
Kenichi Handa <handa@m17n.org>
parents:
94711
diff
changeset
|
91 |
55930
5ad72ade5450
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
55921
diff
changeset
|
92 ;; arch-tag: 75cfdfc7-de85-44f9-b408-ff67d1ec664e |