Mercurial > hg > xemacs-beta
view lisp/mule/cyril-util.el @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | 1f0aa40cafe0 |
| children |
line wrap: on
line source
;;; cyril-util.el --- utilities for Cyrillic scripts -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 2002 Ben Wing. ;; Keywords: mule, multilingual, Cyrillic ;; This file is part of XEmacs. ;; XEmacs 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 Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Emacs 21.1 (language/cyril-util.el). ;;; Commentary: ;;; #### Remove this, use the one in packages instead, but with the below ;;; standard-display-cyrillic-translit. This file is unfortunately shadowed ;;; if you have the Mule packages installed! ;;; Code: ;; Display ;; Written by Valery Alexeev <valery@math.uga.edu>. (defvar cyrillic-language-alist '(("Belorussian") ("Bulgarian") ("Macedonian") ("Russian") ("Serbian") ("Ukrainian")) "*List of known Cyrillic languages") ;;;###autoload (defun standard-display-cyrillic-translit (&optional cyrillic-language disable) "Display a cyrillic buffer using a transliteration. For readability, the table is slightly different from the one used for the input method `cyrillic-translit'. The argument is a string which specifies which language you are using; that affects the choice of transliterations slightly. Possible values are listed in 'cyrillic-language-alist'. Specifying a prefix arg, by preceding \\[standard-display-cyrillic-translit] with \\[universal-argument] turns off Cyrillic display. Noninteractively, the DISABLE argument does the same thing. " (interactive (list (let* ((completion-ignore-case t) (default-language (if (assoc-ignore-case current-language-environment cyrillic-language-alist) current-language-environment "Russian"))) (or current-prefix-arg (completing-read (format "Cyrillic language (default %s): " default-language) cyrillic-language-alist nil t nil nil default-language))))) (frob-display-table (lambda (display-table) (if (or disable current-prefix-arg) (if (char-table-p display-table) (remove-char-table 'cyrillic-iso8859-5 display-table)) (put-display-table ?,LP(B "a" display-table) (put-display-table ?,LQ(B "b" display-table) (put-display-table ?,LR(B "v" display-table) (put-display-table ?,LS(B "g" display-table) (put-display-table ?,LT(B "d" display-table) (put-display-table ?,LU(B "e" display-table) (put-display-table ?,Lq(B "yo" display-table) (put-display-table ?,LV(B "zh" display-table) (put-display-table ?,LW(B "z" display-table) (put-display-table ?,LX(B "i" display-table) (put-display-table ?,LY(B "j" display-table) (put-display-table ?,LZ(B "k" display-table) (put-display-table ?,L[(B "l" display-table) (put-display-table ?,L\(B "m" display-table) (put-display-table ?,L](B "n" display-table) (put-display-table ?,L^(B "o" display-table) (put-display-table ?,L_(B "p" display-table) (put-display-table ?,L`(B "r" display-table) (put-display-table ?,La(B "s" display-table) (put-display-table ?,Lb(B "t" display-table) (put-display-table ?,Lc(B "u" display-table) (put-display-table ?,Ld(B "f" display-table) (put-display-table ?,Le(B "kh" display-table) (put-display-table ?,Lf(B "ts" display-table) (put-display-table ?,Lg(B "ch" display-table) (put-display-table ?,Lh(B "sh" display-table) (put-display-table ?,Li(B "sch" display-table) (put-display-table ?,Lj(B "~" display-table) (put-display-table ?,Lk(B "y" display-table) (put-display-table ?,Ll(B "'" display-table) (put-display-table ?,Lm(B "e'" display-table) (put-display-table ?,Ln(B "yu" display-table) (put-display-table ?,Lo(B "ya" display-table) (put-display-table ?,L0(B "A" display-table) (put-display-table ?,L1(B "B" display-table) (put-display-table ?,L2(B "V" display-table) (put-display-table ?,L3(B "G" display-table) (put-display-table ?,L4(B "D" display-table) (put-display-table ?,L5(B "E" display-table) (put-display-table ?,L!(B "Yo" display-table) (put-display-table ?,L6(B "Zh" display-table) (put-display-table ?,L7(B "Z" display-table) (put-display-table ?,L8(B "I" display-table) (put-display-table ?,L9(B "J" display-table) (put-display-table ?,L:(B "K" display-table) (put-display-table ?,L;(B "L" display-table) (put-display-table ?,L<(B "M" display-table) (put-display-table ?,L=(B "N" display-table) (put-display-table ?,L>(B "O" display-table) (put-display-table ?,L?(B "P" display-table) (put-display-table ?,L@(B "R" display-table) (put-display-table ?,LA(B "S" display-table) (put-display-table ?,LB(B "T" display-table) (put-display-table ?,LC(B "U" display-table) (put-display-table ?,LD(B "F" display-table) (put-display-table ?,LE(B "Kh" display-table) (put-display-table ?,LF(B "Ts" display-table) (put-display-table ?,LG(B "Ch" display-table) (put-display-table ?,LH(B "Sh" display-table) (put-display-table ?,LI(B "Sch" display-table) (put-display-table ?,LJ(B "~" display-table) (put-display-table ?,LK(B "Y" display-table) (put-display-table ?,LL(B "'" display-table) (put-display-table ?,LM(B "E'" display-table) (put-display-table ?,LN(B "Yu" display-table) (put-display-table ?,LO(B "Ya" display-table) (put-display-table ?,Lt(B "ie" display-table) (put-display-table ?,Lw(B "i" display-table) (put-display-table ?,L~(B "u" display-table) (put-display-table ?,Lr(B "dj" display-table) (put-display-table ?,L{(B "chj" display-table) (put-display-table ?,Ls(B "gj" display-table) (put-display-table ?,Lu(B "s" display-table) (put-display-table ?,L|(B "k" display-table) (put-display-table ?,Lv(B "i" display-table) (put-display-table ?,Lx(B "j" display-table) (put-display-table ?,Ly(B "lj" display-table) (put-display-table ?,Lz(B "nj" display-table) (put-display-table ?,L(B "dz" display-table) (put-display-table ?,L$(B "Ye" display-table) (put-display-table ?,L'(B "Yi" display-table) (put-display-table ?,L.(B "U" display-table) (put-display-table ?,L"(B "Dj" display-table) (put-display-table ?,L+(B "Chj" display-table) (put-display-table ?,L#(B "Gj" display-table) (put-display-table ?,L%(B "S" display-table) (put-display-table ?,L,(B "K" display-table) (put-display-table ?,L&(B "I" display-table) (put-display-table ?,L((B "J" display-table) (put-display-table ?,L)(B "Lj" display-table) (put-display-table ?,L*(B "Nj" display-table) (put-display-table ?,L/(B "Dj" display-table) (when (equal cyrillic-language "Bulgarian") (put-display-table ?,Li(B "sht" display-table) (put-display-table ?,LI(B "Sht" display-table) (put-display-table ?,Ln(B "iu" display-table) (put-display-table ?,LN(B "Iu" display-table) (put-display-table ?,Lo(B "ia" display-table) (put-display-table ?,LO(B "Ia" display-table)) (when (equal cyrillic-language "Ukrainian") ; based on the official ; transliteration table (put-display-table ?,LX(B "y" display-table) (put-display-table ?,L8(B "Y" display-table) (put-display-table ?,LY(B "i" display-table) (put-display-table ?,L9(B "Y" display-table) (put-display-table ?,Ln(B "iu" display-table) (put-display-table ?,Lo(B "ia" display-table)))) nil)) ;; (provide 'cyril-util) ;; Local Variables: ;; coding: iso-2022-7bit ;; End: ;;; cyril-util.el ends here