Mercurial > hg > xemacs-beta
annotate lisp/term/wyse50.el @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 01:02:40 -0600 |
| parents | e29fcfd8df5f |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 0 | 1 ;;; wyse50.el --- terminal support code for Wyse 50 |
| 2 | |
| 3 ;; Copyright (C) 1989, 1993, 1994 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Author: Daniel Pfieffer <pfieffer@cix.cict.fr> January 1991 | |
| 6 ;; Jim Blandy <jimb@occs.cs.oberlin.edu> | |
| 7 ;; Keywords: terminals | |
| 8 | |
| 9 ;;; This file is part of GNU Emacs. | |
| 10 ;;; | |
| 11 ;;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 12 ;;; it under the terms of the GNU General Public License as published by | |
| 13 ;;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;;; any later version. | |
| 15 ;;; | |
| 16 ;;; GNU Emacs is distributed in the hope that it will be useful, | |
| 17 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 19 ;;; GNU General Public License for more details. | |
| 20 ;;; | |
| 21 ;;; You should have received a copy of the GNU General Public License | |
| 22 ;;; along with GNU Emacs; see the file COPYING. If not, write to | |
| 23 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 24 | |
| 25 ;;; Commentary: | |
| 26 | |
| 27 ;; Uses the Emacs 19 terminal initialization features --- won't work with 18. | |
| 28 ;; Rewritten for Emacs 19 by jimb, January 1992 | |
| 29 ;; Cleaned up for new terminal package conventions by esr, March 1993 | |
| 30 ;; Should work well for Televideo TVI 925 although it's overkill. | |
| 31 ;; | |
| 32 ;; The Wyse50 is ergonomically wonderful, but its escape-sequence design sucks | |
| 33 ;; rocks. The left-arrow key emits a backspace (!) and the down-arrow a line | |
| 34 ;; feed (!!). Thus, you have to unbind some commonly-used Emacs keys to | |
| 35 ;; enable the arrows. | |
| 36 | |
| 37 ;;; Code: | |
| 38 | |
| 39 (define-key function-key-map "\C-a" (make-keymap)) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
0
diff
changeset
|
40 (mapc (function (lambda (key-definition) |
| 0 | 41 (define-key function-key-map |
| 42 (car key-definition) (nth 1 key-definition)))) | |
| 43 '( | |
| 44 ;; These might be set up by termcap and terminfo | |
| 45 ("\C-k" [up]) | |
| 46 ("\C-j" [down]) | |
| 47 ("\C-l" [right]) | |
| 48 ("\C-h" [left]) | |
| 49 ("\^a@\^m" [f1]) | |
| 50 ("\^aA\^m" [f2]) | |
| 51 ("\^aB\^m" [f3]) | |
| 52 ("\^aC\^m" [f4]) | |
| 53 ("\^aD\^m" [f5]) | |
| 54 ("\^aE\^m" [f6]) | |
| 55 ("\^aF\^m" [f7]) | |
| 56 ("\^aG\^m" [f8]) | |
| 57 ("\^aH\^m" [f9]) | |
| 58 | |
| 59 ;; These might be set up by terminfo | |
| 60 ("\eK" [next]) | |
| 61 ("\eT" [clearline]) | |
| 62 ("\^^" [home]) | |
| 63 ("\e\^^" [end]) | |
| 64 ("\eQ" [insert]) | |
| 65 ("\eE" [insertline]) | |
| 66 ("\eR" [deleteline]) | |
| 67 ("\eP" [print]) | |
| 68 ("\er" [replace]) | |
| 69 ("\^aI\^m" [f10]) | |
| 70 ("\^aJ\^m" [f11]) | |
| 71 ("\^aK\^m" [f12]) | |
| 72 ("\^aL\^m" [f13]) | |
| 73 ("\^aM\^m" [f14]) | |
| 74 ("\^aN\^m" [f15]) | |
| 75 ("\^aO\^m" [f16]) | |
| 76 ("\^a`\^m" [f17]) | |
| 77 ("\^aa\^m" [f18]) | |
| 78 ("\^ab\^m" [f19]) | |
| 79 ("\^ac\^m" [f20]) | |
| 80 ("\^ad\^m" [f21]) | |
| 81 ("\^ae\^m" [f22]) | |
| 82 ("\^af\^m" [f23]) | |
| 83 ("\^ag\^m" [f24]) | |
| 84 ("\^ah\^m" [f25]) | |
| 85 ("\^ai\^m" [f26]) | |
| 86 ("\^aj\^m" [f27]) | |
| 87 ("\^ak\^m" [f28]) | |
| 88 ("\^al\^m" [f29]) | |
| 89 ("\^am\^m" [f30]) | |
| 90 ("\^an\^m" [f31]) | |
| 91 ("\^ao\^m" [f32]) | |
| 92 | |
| 93 ;; Terminfo may know about these, but X won't | |
| 94 ("\eI" [key-stab]) ;; Not an X keysym | |
| 95 ("\eJ" [key-snext]) ;; Not an X keysym | |
| 96 ("\eY" [key-clear]) ;; Not an X keysym | |
| 97 | |
| 98 ;; These are totally strange :-) | |
| 99 ("\eW" [?\C-?]) ;; Not an X keysym | |
| 100 ("\^a\^k\^m" [funct-up]) ;; Not an X keysym | |
| 101 ("\^a\^j\^m" [funct-down]) ;; Not an X keysym | |
| 102 ("\^a\^l\^m" [funct-right]) ;; Not an X keysym | |
| 103 ("\^a\^h\^m" [funct-left]) ;; Not an X keysym | |
| 104 ("\^a\^m\^m" [funct-return]) ;; Not an X keysym | |
| 105 ("\^a\^i\^m" [funct-tab]) ;; Not an X keysym | |
| 106 )) | |
| 107 | |
| 108 (defun enable-arrow-keys () | |
| 109 "To be called by term-setup-hook. Overrides 6 Emacs standard keys | |
| 110 whose functions are then typed as follows: | |
| 111 C-a Funct Left-arrow | |
| 112 C-h M-? | |
| 113 LFD Funct Return, some modes override down-arrow via LFD | |
| 114 C-k CLR Line | |
| 115 C-l Scrn CLR | |
| 116 M-r M-x move-to-window-line, Funct up-arrow or down-arrow are similar | |
| 117 " | |
| 118 (interactive) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
0
diff
changeset
|
119 (mapc (function (lambda (key-definition) |
| 0 | 120 (global-set-key (car key-definition) |
| 121 (nth 1 key-definition)))) | |
| 122 ;; By unsetting C-a and then binding it to a prefix, we | |
| 123 ;; allow the rest of the function keys which start with C-a | |
| 124 ;; to be recognized. | |
| 125 '(("\C-a" nil) | |
| 126 ("\C-k" nil) | |
| 127 ("\C-j" nil) | |
| 128 ("\C-l" nil) | |
| 129 ("\C-h" nil) | |
| 130 ("\er" nil))) | |
| 131 (fset 'enable-arrow-keys nil)) | |
| 132 | |
| 133 | |
| 134 ;;; Miscellaneous hacks | |
| 135 | |
| 136 ;;; This is an ugly hack for a nasty problem: | |
| 137 ;;; Wyse 50 takes one character cell to store video attributes (which seems to | |
| 138 ;;; explain width 79 rather than 80, column 1 is not used!!!). | |
| 139 ;;; On killing (C-x C-c) the end inverse code (on column 1 of line 24) | |
| 140 ;;; of the mode line is overwritten AFTER all the y-or-n questions. | |
| 141 ;;; This causes the attribute to remain in effect until the mode line has | |
| 142 ;;; scrolled of the screen. Suspending (C-z) does not cause this problem. | |
| 143 ;;; On such terminals, Emacs should sacrifice the first and last character of | |
| 144 ;;; each mode line, rather than a whole screen column! | |
| 145 (add-hook 'kill-emacs-hook | |
| 146 (function (lambda () (interactive) | |
| 147 (send-string-to-terminal | |
| 148 (concat "\ea23R" (1+ (frame-width)) "C\eG0"))))) | |
| 149 | |
| 150 ;;; wyse50.el ends here |