Mercurial > hg > xemacs-beta
view lisp/term/scoansi.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 | 74fd4e045ea6 |
| children | 697ef44129c6 308d34e9f07d |
line wrap: on
line source
;; scoansi.el --- set up key names for SCO ansi console ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. ;; Author: Kean Johnston <jkj@paradigm.co.za> ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;; HISTORY ;; jkj - Jan 18, 1993: Created. ;; jkj - Nov 18, 1993: Modified to work with Emacs 19.21 ;; ;; First of all, the normal cursor movement keys. Some of these, if not ;; all, should be set up my termcap/terminfo. We reset them anyway for ;; the sake of completeness. ;; (define-key function-key-map "\e[A" [up]) (define-key function-key-map "\e[B" [down]) (define-key function-key-map "\e[C" [right]) (define-key function-key-map "\e[D" [left]) (define-key function-key-map "\e[E" [center]) (define-key function-key-map "\e[F" [end]) (define-key function-key-map "\e[G" [next]) (define-key function-key-map "\e[H" [home]) (define-key function-key-map "\e[I" [prior]) (define-key function-key-map "\e[L" [insert]) (define-key function-key-map "\e[-" [kp-subtract]) (define-key function-key-map "\e[+" [kp-add]) ;; ;; And now all the function keys ;; ;; Normal, unshifted keys (define-key function-key-map "\e[M" [f1]) (define-key function-key-map "\e[N" [f2]) (define-key function-key-map "\e[O" [f3]) (define-key function-key-map "\e[P" [f4]) (define-key function-key-map "\e[Q" [f5]) (define-key function-key-map "\e[R" [f6]) (define-key function-key-map "\e[S" [f7]) (define-key function-key-map "\e[T" [f8]) (define-key function-key-map "\e[U" [f9]) (define-key function-key-map "\e[V" [f10]) (define-key function-key-map "\e[W" [f11]) (define-key function-key-map "\e[X" [f12]) ;; Shift-function keys (define-key function-key-map "\e[Y" [(shift f1)]) (define-key function-key-map "\e[Z" [(shift f2)]) (define-key function-key-map "\e[a" [(shift f3)]) (define-key function-key-map "\e[b" [(shift f4)]) (define-key function-key-map "\e[c" [(shift f5)]) (define-key function-key-map "\e[d" [(shift f6)]) (define-key function-key-map "\e[e" [(shift f7)]) (define-key function-key-map "\e[f" [(shift f8)]) (define-key function-key-map "\e[g" [(shift f9)]) (define-key function-key-map "\e[h" [(shift f10)]) (define-key function-key-map "\e[i" [(shift f11)]) (define-key function-key-map "\e[j" [(shift f12)]) ;; Control function keys (define-key function-key-map "\e[k" [(control f1)]) (define-key function-key-map "\e[l" [(control f2)]) (define-key function-key-map "\e[m" [(control f3)]) (define-key function-key-map "\e[n" [(control f4)]) (define-key function-key-map "\e[o" [(control f5)]) (define-key function-key-map "\e[p" [(control f6)]) (define-key function-key-map "\e[q" [(control f7)]) (define-key function-key-map "\e[r" [(control f8)]) (define-key function-key-map "\e[s" [(control f9)]) (define-key function-key-map "\e[t" [(control f10)]) (define-key function-key-map "\e[u" [(control f11)]) (define-key function-key-map "\e[v" [(control f12)]) ;; Shift-control function keys (define-key function-key-map "\e[w" [(control shift f1)]) (define-key function-key-map "\e[x" [(control shift f2)]) (define-key function-key-map "\e[y" [(control shift f3)]) (define-key function-key-map "\e[z" [(control shift f4)]) (define-key function-key-map "\e[@" [(control shift f5)]) (define-key function-key-map "\e[[" [(control shift f6)]) (define-key function-key-map "\e[\\" [(control shift f7)]) (define-key function-key-map "\e[]" [(control shift f8)]) (define-key function-key-map "\e[^" [(control shift f9)]) (define-key function-key-map "\e[_" [(control shift f10)]) (define-key function-key-map "\e[`" [(control shift f11)]) (define-key function-key-map "\e[{" [(control shift f12)]) ;;; ;;; Now come the extended key names. Please refer to README.sco for ;;; more information regarding these keys and how to set them up. ;;; (define-key function-key-map "\e]A" [(shift home)]) (define-key function-key-map "\e]B" [(shift up)]) (define-key function-key-map "\e]C" [(shift prior)]) (define-key function-key-map "\e]D" [(shift left)]) (define-key function-key-map "\e]E" [(shift right)]) (define-key function-key-map "\e]F" [(shift end)]) (define-key function-key-map "\e]G" [(shift down)]) (define-key function-key-map "\e]H" [(shift next)]) (define-key function-key-map "\e]I" [(shift insert)]) (define-key function-key-map "\e]J" [(shift delete)]) (define-key function-key-map "\e]K" [(control home)]) (define-key function-key-map "\e]L" [(control up)]) (define-key function-key-map "\e]M" [(control prior)]) (define-key function-key-map "\e]N" [(control left)]) (define-key function-key-map "\e]O" [(control right)]) (define-key function-key-map "\e]P" [(control end)]) (define-key function-key-map "\e]Q" [(control down)]) (define-key function-key-map "\e]R" [(control next)]) (define-key function-key-map "\e]S" [(control insert)]) (define-key function-key-map "\e]T" [(control delete)]) (define-key function-key-map "\e]U" [(meta home)]) (define-key function-key-map "\e]V" [(meta up)]) (define-key function-key-map "\e]W" [(meta prior)]) (define-key function-key-map "\e]X" [(meta left)]) (define-key function-key-map "\e]Y" [(meta right)]) (define-key function-key-map "\e]Z" [(meta end)]) (define-key function-key-map "\e]a" [(meta down)]) (define-key function-key-map "\e]b" [(meta next)]) (define-key function-key-map "\e]c" [(meta insert)]) (define-key function-key-map "\e]d" [(meta delete)]) (define-key function-key-map "\e]e" [(control center)]) (define-key function-key-map "\e]f" [(control kp-subtract)]) (define-key function-key-map "\e]g" [(control kp-add)]) (define-key function-key-map "\e]h" [(meta center)]) (define-key function-key-map "\e]i" [(meta kp-subtract)]) (define-key function-key-map "\e]j" [(meta kp-add)])