annotate lisp/x-compose.el @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents 3ecd8885ac67
children a25c824ed558
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 ;;; x-compose.el --- Compose-key processing in XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 ;; Author: Jamie Zawinski <jwz@jwz.org>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 ;; Maintainer: XEmacs Development Team
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 ;; Rewritten by Martin Buchholz far too many times.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 ;; Changed: 11 Jun 1997 by Heiko Muenkel <muenkel@tnt.uni-hannover.de>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 ;; The degree sign couldn't be inserted with the old version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 ;; Keywords: i18n
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 ;; This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 ;; XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 ;; under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 ;; the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 ;; any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 ;; XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 ;; General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 ;; You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 ;; along with XEmacs; see the file COPYING. If not, write to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 ;; Boston, MA 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ;;; Synched up with: Not in FSF.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ;;; Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 ;; created by jwz, 14-jun-92.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 ;;; changed by Jan Vroonhof, July 1997: Use function-key-map instead
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 ;;; of global map.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 ;;; Preliminary support for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 ;;; XFree86 deadkeys
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 ;; This file implements DEC-, OpenWindows-, and HP-compatible "Compose"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 ;; processing for XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 ;; If you are running a version of X which already does compose processing,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 ;; then you don't need this file. But the MIT R4 and R5 distributions don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 ;; do compose processing, so you may want to fake it by using this code.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 ;; The basic idea is that there are several ways to generate keysyms which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 ;; do not have keys devoted to them on your keyboard.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 ;; The first method is by using "dead" keys. A dead key is a key which,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 ;; when typed, does not insert a character. Instead it modifies the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 ;; following character typed. So if you typed "dead-tilde" followed by "A",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53 ;; then "A-tilde" would be inserted. Of course, this requires you to modify
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 ;; your keyboard to include a "dead-tilde" key on it somewhere.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 ;; The second method is by using a "Compose" key. With a Compose key, you
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 ;; would type "Compose" then "tilde" then "A" to insert "A-tilde".
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 ;; There are a small number of dead keys: acute, grave, cedilla, diaeresis,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 ;; circumflex, tilde, and ring. There are a larger number of accented and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 ;; other characters accessible via the Compose key, so both are useful.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 ;; To use this code, you will need to have a Compose key on your keyboard.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 ;; The default configuration of most X keyboards doesn't contain one. You
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 ;; can, for example, turn the right "Meta" key into a "Compose" key with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 ;; this command:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 ;; xmodmap -e "remove mod1 = Meta_R" -e "keysym Meta_R = Multi_key"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 ;; Multi-key is the name that X (and emacs) know the "Compose" key by.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 ;; The "remove..." command is necessary because the "Compose" key must not
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 ;; have any modifier bits associated with it. This exact command may not
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 ;; work, depending on what system and keyboard you are using. If it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 ;; doesn't, you'll have to read the man page for xmodmap. You might want
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 ;; to get the "xkeycaps" program from
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 ;; <URL:http://www.jwz.org/xkeycaps/>,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 ;; which is a graphical front end to xmodmap
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 ;; that hides xmodmap's arcane syntax from you.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 ;; If for some reason you don't want to have a dedicated compose key on your
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 ;; keyboard, you can use some other key as the prefix. For example, to make
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 ;; "Meta-Shift-C" act as a compose key (so that "M-C , c" would insert the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 ;; character "ccedilla") you could do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
85 ;; (global-set-key "\M-C" compose-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 ;; I believe the bindings encoded in this file are the same as those used
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 ;; by OpenWindows versions 2 and 3, and DEC VT320 terminals. Please let me
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 ;; know if you think otherwise.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91 ;; Much thanks to Justin Bur <justin@crim.ca> for helping me understand how
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 ;; this stuff is supposed to work.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 ;; You also might want to consider getting Justin's patch for the MIT Xlib
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 ;; that implements compose processing in the library. This will enable
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 ;; compose processing in applications other than emacs as well. You can
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 ;; get it from export.lcs.mit.edu in contrib/compose.tar.Z.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 ;; This code has one feature that a more "builtin" Compose mechanism could
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 ;; not have: at any point you can type C-h to get a list of the possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 ;; completions of what you have typed so far.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 ;;; Code:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105 (require 'x-iso8859-1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107 (macrolet
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108 ((define-compose-map (keymap-symbol)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 `(progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 (defconst ,keymap-symbol (make-sparse-keymap ',keymap-symbol))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 ;; Required to tell XEmacs the keymaps were actually autoloaded.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 ;; #### Make this unnecessary!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113 (fset ',keymap-symbol ,keymap-symbol))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
115 (define-compose-map compose-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
116 (define-compose-map compose-acute-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
117 (define-compose-map compose-grave-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
118 (define-compose-map compose-cedilla-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
119 (define-compose-map compose-diaeresis-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120 (define-compose-map compose-circumflex-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121 (define-compose-map compose-tilde-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 (define-compose-map compose-ring-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
124 (define-key compose-map 'acute compose-acute-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125 (define-key compose-map 'grave compose-grave-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126 (define-key compose-map 'cedilla compose-cedilla-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127 (define-key compose-map 'diaeresis compose-diaeresis-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 (define-key compose-map 'circumflex compose-circumflex-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129 (define-key compose-map 'tilde compose-tilde-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
130 (define-key compose-map 'degree compose-ring-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
132 ;;(define-key function-key-map [multi-key] compose-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
133
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
134 ;; The following is necessary, because one can't rebind [degree]
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
135 ;; and use it to insert the degree sign!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
136 ;;(defun compose-insert-degree ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
137 ;; "Inserts a degree sign."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
138 ;; (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139 ;; (insert ?\260))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
140
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
141 (define-key compose-map [acute] compose-acute-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
142 (define-key compose-map [?'] compose-acute-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
143 (define-key compose-map [grave] compose-grave-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
144 (define-key compose-map [?`] compose-grave-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
145 (define-key compose-map [cedilla] compose-cedilla-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
146 (define-key compose-map [?,] compose-cedilla-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
147 (define-key compose-map [diaeresis] compose-diaeresis-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
148 (define-key compose-map [?\"] compose-diaeresis-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
149 (define-key compose-map [circumflex] compose-circumflex-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
150 (define-key compose-map [?^] compose-circumflex-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
151 (define-key compose-map [tilde] compose-tilde-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
152 (define-key compose-map [~] compose-tilde-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
153 (define-key compose-map [degree] compose-ring-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
154 (define-key compose-map [?*] compose-ring-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
155
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
156
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
157 ;;; The contents of the "dead key" maps. These are shared by the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
158 ;;; compose-map.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
159
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160 (define-key compose-acute-map [space] "'")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161 (define-key compose-acute-map [?'] [acute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
162 (define-key compose-acute-map [?A] [Aacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
163 (define-key compose-acute-map [E] [Eacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
164 (define-key compose-acute-map [I] [Iacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
165 (define-key compose-acute-map [O] [Oacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
166 (define-key compose-acute-map [U] [Uacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
167 (define-key compose-acute-map [Y] [Yacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
168 (define-key compose-acute-map [a] [aacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
169 (define-key compose-acute-map [e] [eacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
170 (define-key compose-acute-map [i] [iacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
171 (define-key compose-acute-map [o] [oacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
172 (define-key compose-acute-map [u] [uacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
173 (define-key compose-acute-map [y] [yacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
174
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
175 (define-key compose-grave-map [space] "`")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176 (define-key compose-grave-map [?`] [grave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
177 (define-key compose-grave-map [A] [Agrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
178 (define-key compose-grave-map [E] [Egrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
179 (define-key compose-grave-map [I] [Igrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
180 (define-key compose-grave-map [O] [Ograve])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
181 (define-key compose-grave-map [U] [Ugrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
182 (define-key compose-grave-map [a] [agrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
183 (define-key compose-grave-map [e] [egrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
184 (define-key compose-grave-map [i] [igrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
185 (define-key compose-grave-map [o] [ograve])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
186 (define-key compose-grave-map [u] [ugrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
188 (define-key compose-cedilla-map [space] ",")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
189 (define-key compose-cedilla-map [?,] [cedilla])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
190 (define-key compose-cedilla-map [C] [Ccedilla])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
191 (define-key compose-cedilla-map [c] [ccedilla])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
192
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
193 (define-key compose-diaeresis-map [space] [diaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
194 (define-key compose-diaeresis-map [?\"] [diaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
195 (define-key compose-diaeresis-map [A] [Adiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
196 (define-key compose-diaeresis-map [E] [Ediaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
197 (define-key compose-diaeresis-map [I] [Idiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
198 (define-key compose-diaeresis-map [O] [Odiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
199 (define-key compose-diaeresis-map [U] [Udiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200 (define-key compose-diaeresis-map [a] [adiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
201 (define-key compose-diaeresis-map [e] [ediaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
202 (define-key compose-diaeresis-map [i] [idiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 (define-key compose-diaeresis-map [o] [odiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 (define-key compose-diaeresis-map [u] [udiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
205 (define-key compose-diaeresis-map [y] [ydiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
207 (define-key compose-circumflex-map [space] "^")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
208 (define-key compose-circumflex-map [?/] "|")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
209 (define-key compose-circumflex-map [?!] [brokenbar])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
210 (define-key compose-circumflex-map [?-] [macron])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
211 (define-key compose-circumflex-map [?_] [macron])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
212 (define-key compose-circumflex-map [?0] [degree])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
213 (define-key compose-circumflex-map [?1] [onesuperior])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
214 (define-key compose-circumflex-map [?2] [twosuperior])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
215 (define-key compose-circumflex-map [?3] [threesuperior])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
216 (define-key compose-circumflex-map [?.] [periodcentered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
217 (define-key compose-circumflex-map [A] [Acircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218 (define-key compose-circumflex-map [E] [Ecircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
219 (define-key compose-circumflex-map [I] [Icircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
220 (define-key compose-circumflex-map [O] [Ocircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
221 (define-key compose-circumflex-map [U] [Ucircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
222 (define-key compose-circumflex-map [a] [acircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
223 (define-key compose-circumflex-map [e] [ecircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
224 (define-key compose-circumflex-map [i] [icircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
225 (define-key compose-circumflex-map [o] [ocircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
226 (define-key compose-circumflex-map [u] [ucircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
227
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
228 (define-key compose-tilde-map [space] "~")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
229 (define-key compose-tilde-map [A] [Atilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
230 (define-key compose-tilde-map [N] [Ntilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
231 (define-key compose-tilde-map [O] [Otilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
232 (define-key compose-tilde-map [a] [atilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
233 (define-key compose-tilde-map [n] [ntilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
234 (define-key compose-tilde-map [o] [otilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
235
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
236 (define-key compose-ring-map [space] [degree])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
237 (define-key compose-ring-map [A] [Aring])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 (define-key compose-ring-map [a] [aring])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
240
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
241 ;;; The rest of the compose-map. These are the composed characters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
242 ;;; that are not accessible via "dead" keys.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
243
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
244 (define-key compose-map " '" "'")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
245 (define-key compose-map " ^" "^")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
246 (define-key compose-map " `" "`")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
247 (define-key compose-map " ~" "~")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
248 (define-key compose-map " " [nobreakspace])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
249 (define-key compose-map " \"" [diaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
250 (define-key compose-map " :" [diaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
251 (define-key compose-map " *" [degree])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
252
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
253 (define-key compose-map "!!" [exclamdown])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
254 (define-key compose-map "!^" [brokenbar])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
255 (define-key compose-map "!S" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
256 (define-key compose-map "!s" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
257 (define-key compose-map "!P" [paragraph])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
258 (define-key compose-map "!p" [paragraph])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
259
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
260 (define-key compose-map "((" "[")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
261 (define-key compose-map "(-" "{")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
262
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
263 (define-key compose-map "))" "]")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
264 (define-key compose-map ")-" "}")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
265
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
266 (define-key compose-map "++" "#")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
267 (define-key compose-map "+-" [plusminus])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
268
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
269 (define-key compose-map "-(" "{")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
270 (define-key compose-map "-)" "}")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
271 (define-key compose-map "--" "-")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
272 (define-key compose-map "-L" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
273 (define-key compose-map "-l" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
274 (define-key compose-map "-Y" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 (define-key compose-map "-y" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 (define-key compose-map "-," [notsign])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277 (define-key compose-map "-|" [notsign])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
278 (define-key compose-map "-^" [macron])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
279 (define-key compose-map "-+" [plusminus])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
280 (define-key compose-map "-:" [division])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
281 (define-key compose-map "-D" [ETH])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
282 (define-key compose-map "-d" [eth])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
283 (define-key compose-map "-a" [ordfeminine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
284
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
285 (define-key compose-map ".^" [periodcentered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
286
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
287 (define-key compose-map "//" "\\")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
288 (define-key compose-map "/<" "\\")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
289 (define-key compose-map "/^" "|")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
290 (define-key compose-map "/C" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
291 (define-key compose-map "/c" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
292 (define-key compose-map "/U" [mu])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
293 (define-key compose-map "/u" [mu])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
294 (define-key compose-map "/O" [Ooblique])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
295 (define-key compose-map "/o" [oslash])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
296
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
297 (define-key compose-map "0X" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
298 (define-key compose-map "0x" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
299 (define-key compose-map "0S" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
300 (define-key compose-map "0s" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
301 (define-key compose-map "0C" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
302 (define-key compose-map "0c" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
303 (define-key compose-map "0R" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
304 (define-key compose-map "0r" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
305 (define-key compose-map "0^" [degree])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
306
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
307 (define-key compose-map "1^" [onesuperior])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
308 (define-key compose-map "14" [onequarter])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
309 (define-key compose-map "12" [onehalf])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
310
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
311 (define-key compose-map "2^" [twosuperior])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
312
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
313 (define-key compose-map "3^" [threesuperior])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
314 (define-key compose-map "34" [threequarters])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
315
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
316 (define-key compose-map ":-" [division])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
317
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
318 (define-key compose-map "</" "\\")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
319 (define-key compose-map "<<" [guillemotleft])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
320
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
321 (define-key compose-map "=L" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
322 (define-key compose-map "=l" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
323 (define-key compose-map "=Y" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
324 (define-key compose-map "=y" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
325
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
326 (define-key compose-map ">>" [guillemotright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
327
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
328 (define-key compose-map "??" [questiondown])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
329
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
330 (define-key compose-map "AA" "@")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 (define-key compose-map "Aa" "@")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
332 (define-key compose-map "A_" [ordfeminine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
333 (define-key compose-map "A`" [Agrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
334 (define-key compose-map "A'" [Aacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
335 (define-key compose-map "A^" [Acircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
336 (define-key compose-map "A~" [Atilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
337 (define-key compose-map "A\"" [Adiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
338 (define-key compose-map "A*" [Aring])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
339 (define-key compose-map "AE" [AE])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
340
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
341 (define-key compose-map "C/" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
342 (define-key compose-map "C|" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
343 (define-key compose-map "C0" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
344 (define-key compose-map "CO" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
345 (define-key compose-map "Co" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
346 (define-key compose-map "C," [Ccedilla])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
347
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
348 (define-key compose-map "D-" [ETH])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
349
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
350 (define-key compose-map "E`" [Egrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
351 (define-key compose-map "E'" [Eacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
352 (define-key compose-map "E^" [Ecircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
353 (define-key compose-map "E\"" [Ediaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
354
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
355 (define-key compose-map "I`" [Igrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
356 (define-key compose-map "I'" [Iacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
357 (define-key compose-map "I^" [Icircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
358 (define-key compose-map "I\"" [Idiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
359
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
360 (define-key compose-map "L-" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
361 (define-key compose-map "L=" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
362
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
363 (define-key compose-map "N~" [Ntilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
364
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
365 (define-key compose-map "OX" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
366 (define-key compose-map "Ox" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
367 (define-key compose-map "OS" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
368 (define-key compose-map "Os" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
369 (define-key compose-map "OC" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
370 (define-key compose-map "Oc" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
371 (define-key compose-map "OR" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
372 (define-key compose-map "Or" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
373 (define-key compose-map "O_" [masculine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
374 (define-key compose-map "O`" [Ograve])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
375 (define-key compose-map "O'" [Oacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
376 (define-key compose-map "O^" [Ocircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
377 (define-key compose-map "O~" [Otilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
378 (define-key compose-map "O\"" [Odiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
379 (define-key compose-map "O/" [Ooblique])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
380
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
381 (define-key compose-map "P!" [paragraph])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
382
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
383 (define-key compose-map "R0" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
384 (define-key compose-map "RO" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
385 (define-key compose-map "Ro" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
386
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
387 (define-key compose-map "S!" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
388 (define-key compose-map "S0" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
389 (define-key compose-map "SO" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
390 (define-key compose-map "So" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
391 (define-key compose-map "SS" [ssharp])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
392
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
393 (define-key compose-map "TH" [THORN])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
394
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
395 (define-key compose-map "U`" [Ugrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
396 (define-key compose-map "U'" [Uacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
397 (define-key compose-map "U^" [Ucircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
398 (define-key compose-map "U\"" [Udiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
399
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
400 (define-key compose-map "X0" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
401 (define-key compose-map "XO" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
402 (define-key compose-map "Xo" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
403
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
404 (define-key compose-map "Y-" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
405 (define-key compose-map "Y=" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
406 (define-key compose-map "Y'" [Yacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
407
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
408 (define-key compose-map "_A" [ordfeminine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
409 (define-key compose-map "_a" [ordfeminine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
410 (define-key compose-map "_^" [macron])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
411 (define-key compose-map "_O" [masculine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
412 (define-key compose-map "_o" [masculine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
413
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
414 (define-key compose-map "aA" "@")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
415 (define-key compose-map "aa" "@")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
416 (define-key compose-map "a_" [ordfeminine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
417 (define-key compose-map "a-" [ordfeminine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
418 (define-key compose-map "a`" [agrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
419 (define-key compose-map "a'" [aacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
420 (define-key compose-map "a^" [acircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
421 (define-key compose-map "a~" [atilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
422 (define-key compose-map "a\"" [adiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
423 (define-key compose-map "a*" [aring])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
424 (define-key compose-map "ae" [ae])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
425
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
426 (define-key compose-map "c/" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
427 (define-key compose-map "c|" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
428 (define-key compose-map "c0" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
429 (define-key compose-map "cO" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
430 (define-key compose-map "co" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
431 (define-key compose-map "c," [ccedilla])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
432
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
433 (define-key compose-map "d-" [eth])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
434
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
435 (define-key compose-map "e`" [egrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
436 (define-key compose-map "e'" [eacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
437 (define-key compose-map "e^" [ecircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
438 (define-key compose-map "e\"" [ediaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
439
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
440 (define-key compose-map "i`" [igrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
441 (define-key compose-map "i'" [iacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
442 (define-key compose-map "i^" [icircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
443 (define-key compose-map "i\"" [idiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
444 (define-key compose-map "i:" [idiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
445
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
446 (define-key compose-map "l-" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
447 (define-key compose-map "l=" [sterling])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
448
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
449 (define-key compose-map "n~" [ntilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
450
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
451 (define-key compose-map "oX" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
452 (define-key compose-map "ox" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
453 (define-key compose-map "oC" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
454 (define-key compose-map "oc" [copyright])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
455 (define-key compose-map "oR" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
456 (define-key compose-map "or" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
457 (define-key compose-map "oS" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
458 (define-key compose-map "os" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
459 (define-key compose-map "o_" [masculine])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
460 (define-key compose-map "o`" [ograve])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
461 (define-key compose-map "o'" [oacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
462 (define-key compose-map "o^" [ocircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
463 (define-key compose-map "o~" [otilde])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
464 (define-key compose-map "o\"" [odiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
465 (define-key compose-map "o/" [oslash])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
466
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
467 (define-key compose-map "p!" [paragraph])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
468
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
469 (define-key compose-map "r0" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
470 (define-key compose-map "rO" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
471 (define-key compose-map "ro" [registered])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
472
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
473 (define-key compose-map "s!" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
474 (define-key compose-map "s0" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
475 (define-key compose-map "sO" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
476 (define-key compose-map "so" [section])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
477 (define-key compose-map "ss" [ssharp])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
478
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
479 (define-key compose-map "th" [thorn])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
481 (define-key compose-map "u`" [ugrave])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
482 (define-key compose-map "u'" [uacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
483 (define-key compose-map "u^" [ucircumflex])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
484 (define-key compose-map "u\"" [udiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
485 (define-key compose-map "u/" [mu])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
486
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
487 (define-key compose-map "x0" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
488 (define-key compose-map "xO" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
489 (define-key compose-map "xo" [currency])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
490 (define-key compose-map "xx" [multiply])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
491
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
492 (define-key compose-map "y-" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
493 (define-key compose-map "y=" [yen])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
494 (define-key compose-map "y'" [yacute])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
495 (define-key compose-map "y\"" [ydiaeresis])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
496
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
497 (define-key compose-map "|C" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
498 (define-key compose-map "|c" [cent])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
499 (define-key compose-map "||" [brokenbar])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
501
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
502 ;; Suppose we type these three physical keys: [Multi_key " a]
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
503 ;; Xlib can deliver these keys as the following sequences of keysyms:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
504 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
505 ;; - [Multi_key " a] (no surprise here)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
506 ;; - [adiaeresis] (OK, Xlib is doing compose processing for us)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
507 ;; - [Multi_key " adiaeresis] (Huh?)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
508 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
509 ;; It is the last possibility that is arguably a bug. Xlib can't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
510 ;; decide whether it's really doing compose processing or not (or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
511 ;; actually, different parts of Xlib disagree).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
512 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
513 ;; So we'll just convert [Multi_key " adiaeresis] to [adiaeresis]
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
514 (defun xlib-input-method-bug-workaround (keymap)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
515 (map-keymap
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
516 (lambda (key value)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
517 (cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
518 ((keymapp value)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
519 (xlib-input-method-bug-workaround value))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
520 ((and (sequencep value)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
521 (eq 1 (length value))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
522 (null (lookup-key keymap value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
523 (define-key keymap value value))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
524 keymap))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
525 (xlib-input-method-bug-workaround compose-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
526 (unintern 'xlib-input-method-bug-workaround)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
527
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
528 ;; While we're at it, a similar mechanism will make colon equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
529 ;; to doublequote for diaeresis processing. Some Xlibs do this.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
530 (defun alias-colon-to-doublequote (keymap)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
531 (map-keymap
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
532 (lambda (key value)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
533 (when (keymapp value)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
534 (alias-colon-to-doublequote value))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
535 (when (eq key '\")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
536 (define-key keymap ":" value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
537 keymap))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
538 (alias-colon-to-doublequote compose-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
539 (unintern 'alias-colon-to-doublequote)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
540
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
541 ;;; Electric dead keys: making a' mean a-acute.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
542
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
543
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
544 (defun electric-diacritic (&optional count)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
545 "Modify the previous character with an accent.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
546 For example, if `:' is bound to this command, then typing `a:'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
547 will first insert `a' and then turn it into `\344' (adiaeresis).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
548 The keys to which this command may be bound (and the accents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
549 which it understands) are:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
550
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
551 ' (acute) \301\311\315\323\332\335 \341\351\355\363\372\375
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
552 ` (grave) \300\310\314\322\331 \340\350\354\362\371
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
553 : (diaeresis) \304\313\317\326\334 \344\353\357\366\374\377
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
554 ^ (circumflex) \302\312\316\324\333 \342\352\356\364\373
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
555 , (cedilla) \307\347
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
556 . (ring) \305\345"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
557 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
558 (or count (setq count 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
559
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
560 (if (not (eq last-command 'self-insert-command))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
561 ;; Only do the magic if the two chars were typed in succession.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
562 (self-insert-command count)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
563
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
564 ;; This is so that ``a : C-x u'' will transform `adiaeresis' back into `a:'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
565 (self-insert-command count)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
566 (undo-boundary)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
567 (delete-char (- count))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
568
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
569 (let* ((c last-command-char)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
570 (map (cond ((eq c ?') compose-acute-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
571 ((eq c ?`) compose-grave-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
572 ((eq c ?,) compose-cedilla-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
573 ((eq c ?:) compose-diaeresis-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
574 ((eq c ?^) compose-circumflex-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
575 ((eq c ?~) compose-tilde-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
576 ((eq c ?.) compose-ring-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
577 (t (error "unknown diacritic: %s (%c)" c c))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
578 (base-char (preceding-char))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
579 (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
580 (<= (downcase base-char) ?z)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
581 (lookup-key map (make-string 1 base-char)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
582 (if (and (vectorp mod-char) (= (length mod-char) 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
583 (setq mod-char (aref mod-char 0)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
584 (if (and mod-char (symbolp mod-char))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
585 (setq mod-char (or (get mod-char character-set-property) mod-char)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
586 (if (and mod-char (> count 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
587 (delete-char -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
588 (setq mod-char c))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
589 (while (> count 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
590 (insert mod-char)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
591 (setq count (1- count))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
592
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
593 ;; should "::" mean "¨" and ": " mean ":"?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
594 ;; should we also do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
595 ;; (?~
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
596 ;; (?A "\303")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
597 ;; (?C "\307")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
598 ;; (?D "\320")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
599 ;; (?N "\321")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
600 ;; (?O "\325")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
601 ;; (?a "\343")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
602 ;; (?c "\347")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
603 ;; (?d "\360")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
604 ;; (?n "\361")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
605 ;; (?o "\365")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
606 ;; (?> "\273")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
607 ;; (?< "\253")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
608 ;; (? "~")) ; no special code
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
609 ;; (?\/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
610 ;; (?A "\305") ;; A-with-ring (Norwegian and Danish)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
611 ;; (?E "\306") ;; AE-ligature (Norwegian and Danish)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
612 ;; (?O "\330")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
613 ;; (?a "\345") ;; a-with-ring (Norwegian and Danish)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
614 ;; (?e "\346") ;; ae-ligature (Norwegian and Danish)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
615 ;; (?o "\370")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
616 ;; (? "/")) ; no special code
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
617
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
618
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
619 ;;; Providing help in the middle of a compose sequence. (Way cool.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
620
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
621 (eval-when-compile
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
622 (defsubst next-composable-event ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
623 (let (event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
624 (while (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
625 (setq event (next-command-event))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
626 (not (or (key-press-event-p event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
627 (button-press-event-p event))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
628 (dispatch-event event))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
629 event)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
630
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
631 (defun compose-help (ignore-prompt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
632 (let* ((keys (apply 'vector (nbutlast (append (this-command-keys) nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
633 (map (or (lookup-key function-key-map keys)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
634 (error "can't find map? %s %s" keys (this-command-keys))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
635 binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
636 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
637 (with-output-to-temp-buffer "*Help*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
638 (set-buffer "*Help*")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
639 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
640 (message "Working...")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
641 (setq ctl-arrow 'compose) ; non-t-non-nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
642 (insert "You are typing a compose sequence. So far you have typed: ")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
643 (insert (key-description keys))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
644 (insert "\nCompletions from here are:\n\n")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
645 (map-keymap 'compose-help-mapper map t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
646 (message "? ")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
647 (while (keymapp map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
648 (setq binding (lookup-key map (vector (next-composable-event))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
649 (if (null binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
650 (message "No such key in keymap. Try again.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
651 (setq map binding)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
652 binding))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
653
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
654 (put 'compose-help 'isearch-command t) ; so that it doesn't terminate isearch
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
655
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
656 (defun compose-help-mapper (key binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
657 (if (and (symbolp key)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
658 (get key character-set-property))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
659 (setq key (get key character-set-property)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
660 (if (eq binding 'compose-help) ; suppress that...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
661 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
662 (if (keymapp binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
663 (let ((p (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
664 (map-keymap 'compose-help-mapper binding t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
665 (goto-char p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
666 (while (not (eobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
667 (if (characterp key)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
668 (insert (make-string 1 key))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
669 (insert (single-key-description key)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
670 (insert " ")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
671 (forward-line 1)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
672 (if (characterp key)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
673 (insert (make-string 1 key))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
674 (insert (single-key-description key)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
675 (indent-to 16)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
676 (let ((code (and (vectorp binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
677 (= 1 (length binding))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
678 (get (aref binding 0) character-set-property))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
679 (if code
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
680 (insert (make-string 1 code))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
681 (if (stringp binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
682 (insert binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
683 (insert (prin1-to-string binding)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
684 (when (and (vectorp binding) (= 1 (length binding)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
685 (indent-to 32)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
686 (insert (symbol-name (aref binding 0)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
687 (insert "\n")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
688
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
689 ;; define it at top-level in the compose map...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
690 ;;(define-key compose-map [(control h)] 'compose-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
691 ;;(define-key compose-map [help] 'compose-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
692 ;; and then define it in each sub-map of the compose map.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
693 (map-keymap
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
694 (lambda (key binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
695 (when (keymapp binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
696 ;; (define-key binding [(control h)] 'compose-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
697 ;; (define-key binding [help] 'compose-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
698 ))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
699 compose-map nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
700
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
701 ;; Make redisplay display the accented letters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
702 (if (memq (default-value 'ctl-arrow) '(t nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
703 (setq-default ctl-arrow 'iso-8859/1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
704
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
705
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
706 (provide 'x-compose)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
707
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
708 ;;; x-compose.el ends here