annotate test/redisplay-testsuite.el @ 109165:750db9f3e6d8

Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp * alloc.c (overrun_check_malloc, overrun_check_realloc) (overrun_check_free, xstrdup, allocate_string) (allocate_string_data, compact_small_strings, Fmake_string) (make_unibyte_string, make_multibyte_string) (make_string_from_bytes, make_specified_string, make_float) (Fcons, allocate_terminal, allocate_frame, make_pure_string) (Fgarbage_collect): Replace bcopy, safe_bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp. * atimer.c (start_atimer, set_alarm): Likewise. * buffer.c (clone_per_buffer_values, report_overlay_modification) (mmap_realloc, init_buffer_once): Likewise. * callint.c (Fcall_interactively): Likewise. * callproc.c (Fcall_process, Fcall_process_region, child_setup) (getenv_internal_1): Likewise. * casefiddle.c (casify_object): Likewise. * ccl.c (ccl_driver): Likewise. * character.c (str_as_multibyte, str_to_multibyte): Likewise. * charset.c (load_charset_map_from_file) (load_charset_map_from_file, load_charset_map_from_vector) (Fdefine_charset_internal): Likewise. * cm.c (Wcm_clear): Likewise. * coding.c (decode_eol, decode_coding_object) (Fset_coding_system_priority, make_subsidiaries): Likewise. * data.c (Faset): Likewise. * dired.c (directory_files_internal, file_name_completion_stat): Likewise. * dispnew.c (new_glyph_matrix, adjust_glyph_matrix) (clear_glyph_row, copy_row_except_pointers) (copy_glyph_row_contents, new_glyph_pool, realloc_glyph_pool) (save_current_matrix, restore_current_matrix) (build_frame_matrix_from_leaf_window, mirrored_line_dance) (mirror_line_dance, scrolling_window): Likewise. * doc.c (Fsnarf_documentation, Fsubstitute_command_keys): Likewise. * doprnt.c (doprnt): Likewise. * editfns.c (Fuser_full_name, make_buffer_string_both) (Fmessage_box, Fformat, Ftranspose_regions): Likewise. * emacs.c (sort_args): Likewise. * eval.c (Fapply, Ffuncall): Likewise. * fileio.c (Ffile_name_directory, make_temp_name) (Fexpand_file_name, search_embedded_absfilename) (Fsubstitute_in_file_name, Ffile_symlink_p, Finsert_file_contents) (auto_save_error): Likewise. * fns.c (Fstring_equal, Fcopy_sequence, concat) (string_to_multibyte, Fstring_as_unibyte, Fstring_as_multibyte) (internal_equal, Fclear_string, larger_vector, copy_hash_table) (Fmake_hash_table): Likewise. * fringe.c (Fdefine_fringe_bitmap): Likewise. * ftfont.c (ftfont_text_extents): Likewise. * getloadavg.c (getloadavg): Likewise. * image.c (define_image_type, make_image, make_image_cache) (x_create_x_image_and_pixmap, xbm_image_p) (w32_create_pixmap_from_bitmap_data, xbm_load, xpm_lookup_color) (xpm_image_p, x_create_bitmap_from_xpm_data, xpm_load) (init_color_table, x_build_heuristic_mask, pbm_image_p, pbm_load) (png_image_p, png_read_from_memory, png_load, jpeg_image_p) (tiff_image_p, tiff_read_from_memory, gif_image_p) (gif_read_from_memory, gif_load, svg_image_p, gs_image_p): Likewise. * indent.c (scan_for_column, compute_motion): Likewise. * insdel.c (gap_left, gap_right, make_gap_smaller, copy_text) (insert_1_both, insert_from_gap, replace_range_2): Likewise. * intervals.c (reproduce_tree, reproduce_tree_obj): Likewise. * keyboard.c (echo_char, save_getcjmp, restore_getcjmp) (kbd_buffer_store_event_hold, apply_modifiers_uncached) (store_user_signal_events, menu_bar_items, tool_bar_items) (process_tool_bar_item, append_tool_bar_item) (read_char_minibuf_menu_prompt, read_key_sequence) (Fread_key_sequence, Fread_key_sequence_vector, Frecent_keys): Likewise. * keymap.c (current_minor_maps, Fdescribe_buffer_bindings): Likewise. * lisp.h (STRING_COPYIN): Likewise. * lread.c (Fload, read1, oblookup): Likewise. * msdos.c (Frecent_doskeys): Likewise. * nsfns.m (Fx_create_frame): Likewise. * nsfont.m (nsfont_open, nsfont_text_extents, ns_glyph_metrics): Likewise. * nsimage.m (EmacsImage-initFromSkipXBM:width:height:) (EmacsImage-initForXPMWithDepth:width:height:flip:length:): Likewise. * nsmenu.m (ns_update_menubar): Likewise. * nsterm.m (ns_draw_fringe_bitmap, ns_term_init): Likewise. * print.c (print_unwind, printchar, strout, print_string) (print_error_message): Likewise. * process.c (conv_lisp_to_sockaddr, set_socket_option) (Fmake_network_process, Fnetwork_interface_list) (Fnetwork_interface_info, read_process_output, Fprocess_send_eof) (init_process): Likewise. * ralloc.c (resize_bloc, r_alloc_sbrk, r_alloc_init): Likewise. * regex.c (init_syntax_once, regex_compile, re_compile_fastmap): Likewise. * scroll.c (do_scrolling, do_direct_scrolling) (scrolling_max_lines_saved): Likewise. * search.c (search_buffer, wordify, Freplace_match): Likewise. * sound.c (wav_init, au_init, Fplay_sound_internal): Likewise. * syntax.c (skip_chars, skip_syntaxes): Likewise. * sysdep.c (child_setup_tty, sys_subshell, emacs_get_tty) (emacs_set_tty): Likewise. * term.c (encode_terminal_code, calculate_costs) (produce_special_glyphs, create_tty_output, init_tty, delete_tty): Likewise. * termcap.c (tgetst1, gobble_line): Likewise. * termhooks.h (EVENT_INIT): Likewise. * tparam.c (tparam1): Likewise. * unexalpha.c (unexec): Likewise. * unexec.c (write_segment): Likewise. * unexmacosx.c (unexec_write_zero): Likewise. * w32fns.c (w32_wnd_proc, Fx_create_frame, x_create_tip_frame) (Fx_file_dialog, Fsystem_move_file_to_trash): Likewise. * w32font.c (w32font_list_family, w32font_text_extents) (w32font_list_internal, w32font_match_internal) (w32font_open_internal, compute_metrics, Fx_select_font): Likewise. * w32menu.c (set_frame_menubar, add_menu_item) (w32_menu_display_help, w32_free_submenu_strings): Likewise. * w32term.c (XCreateGC, w32_initialize_display_info): Likewise. * w32uniscribe.c (uniscribe_list_family): Likewise. * w32xfns.c (get_next_msg, post_msg, prepend_msg): Likewise. * window.c (make_window, replace_window, set_window_buffer) (Fsplit_window): Likewise. * xdisp.c (init_iterator, RECORD_OVERLAY_STRING, reseat_to_string) (add_to_log, message3, x_consider_frame_title) (append_space_for_newline, extend_face_to_end_of_line) (decode_mode_spec_coding, init_glyph_string): Likewise. * xfaces.c (x_create_gc, get_lface_attributes_no_remap) (Finternal_copy_lisp_face, Finternal_merge_in_global_face) (face_attr_equal_p, make_realized_face, make_face_cache) (free_realized_faces, lookup_named_face, smaller_face) (face_with_height, lookup_derived_face) (x_supports_face_attributes_p, Finternal_set_font_selection_order) (Finternal_set_font_selection_order, realize_default_face) (compute_char_face, face_at_buffer_position) (face_for_overlay_string, face_at_string_position, merge_faces): Likewise. * xfns.c (xic_create_fontsetname, Fx_create_frame) (Fx_window_property, x_create_tip_frame) (Fx_backspace_delete_keys_p): Likewise. * xfont.c (xfont_list, xfont_match, xfont_list_family) (xfont_text_extents): Likewise. * xmenu.c (set_frame_menubar, xmenu_show): Likewise. * xrdb.c (magic_file_p, x_get_resource): Likewise. * xselect.c (x_queue_event, x_get_window_property) (receive_incremental_selection): Likewise. * xsmfns.c (x_session_check_input): Likewise. * xterm.c (x_send_scroll_bar_event, SET_SAVED_MENU_EVENT) (handle_one_xevent, x_check_errors, xim_initialize, x_term_init): Likewise. * character.h (BCOPY_SHORT): Removed. * config.in: Regenerate. * dispnew.c (safe_bcopy): Only define as dummy if PROFILING. * emacs.c (main) [PROFILING]: Don't declare dump_opcode_frequencies. * lisp.h (safe_bcopy): Remove declaration. (memset) [!HAVE_MEMSET]: Declare. (memcpy) [!HAVE_MEMCPY]: Likewise. (memmove) [!HAVE_MEMMOVE]: Likewise. (memcmp) [!HAVE_MEMCMP]: Likewise. * s/ms-w32.h (bzero, bcopy, bcmp, GAP_USE_BCOPY) (BCOPY_UPWARD_SAFE, BCOPY_DOWNWARD_SAFE, HAVE_BCOPY, HAVE_BCMP): Don't define. (HAVE_MEMCMP, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET): Define. * s/msdos.h (GAP_USE_BCOPY, BCOPY_UPWARD_SAFE) (BCOPY_DOWNWARD_SAFE): Don't define. * sysdep.c (memset) [!HAVE_MEMSET]: Define. (memcpy) [!HAVE_MEMCPY]: Define. (memmove) [!HAVE_MEMMOVE]: Define. (memcmp) [!HAVE_MEMCMP]: Define. * config.nt (HAVE_BCOPY, HAVE_BCMP): Remove undefs. (HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET, HAVE_MEMCMP): Add undefs. * sed2v2.inp (HAVE_MEMCPY, HAVE_MEMSET): Edit to 1. (HAVE_BZERO): Don't edit. * lwlib.c (lwlib_memset, lwlib_bcopy): Remove. (malloc_widget_value, free_widget_info, allocate_widget_instance) (lw_separator_p): Replace lwlib_memset, lwlib_bcopy, bzero, bcmp by memset, memcpy, memcmp. * lwlib-utils.c (XtApplyToWidgets): Likewise. * xlwmenu.c (XlwMenuInitialize): Likewise. * lwlib.h (lwlib_bcopy): Remove declaration. * ebrowse.c (add_sym, make_namespace): Replace bcopy, bzero by memcpy, memmove, memset. * pop.c (pop_retrieve, socket_connection, pop_getline): Likewise. * CPP-DEFINES (BCOPY_DOWNWARD_SAFE, BCOPY_UPWARD_SAFE) (GAP_USE_BCOPY, HAVE_BCMP, HAVE_BCOPY, bcmp, bcopy, bzero): Remove. * configure.in: Don't check for bcopy, bcmp, bzero. Don't include <strings.h> and don't define bcopy, bzero, BCMP in config.h.
author Andreas Schwab <schwab@linux-m68k.org>
date Thu, 08 Jul 2010 00:18:28 +0200
parents b262a4f49bf3
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
103698
01395a3c52c8 Fix comment.
Juri Linkov <juri@jurta.org>
parents: 103689
diff changeset
1 ;;; redisplay-testsuite.el --- Test suite for redisplay.
103593
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
2
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 103698
diff changeset
3 ;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
103593
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
4
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
5 ;; Author: Chong Yidong <cyd@stupidchicken.com>
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
6 ;; Keywords: internal
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
7 ;; Human-Keywords: internal
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
8
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
10
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
14 ;; (at your option) any later version.
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
15
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
19 ;; GNU General Public License for more details.
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
20
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
23
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
24 ;;; Commentary:
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
25
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
26 ;; Type M-x test-redisplay RET to generate the test buffer.
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
27
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
28 ;;; Code:
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
29
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
30 (defun test-insert-overlay (text &rest props)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
31 (let ((opoint (point))
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
32 overlay)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
33 (insert text)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
34 (setq overlay (make-overlay opoint (point)))
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
35 (while props
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
36 (overlay-put overlay (car props) (cadr props))
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
37 (setq props (cddr props)))))
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
38
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
39 (defun test-redisplay-1 ()
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
40 (insert "Test 1: Displaying adjacent and overlapping overlays:\n\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
41 (insert " Expected: gnu emacs\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
42 (insert " Results: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
43 (test-insert-overlay "n" 'before-string "g" 'after-string "u ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
44 (test-insert-overlay "ma" 'before-string "e" 'after-string "cs")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
45 (insert "\n\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
46 (insert " Expected: gnu emacs\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
47 (insert " Results: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
48 (test-insert-overlay "u" 'before-string "gn")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
49 (test-insert-overlay "ma" 'before-string " e" 'after-string "cs")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
50 (insert "\n\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
51 (insert " Expected: gnu emacs\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
52 (insert " Results: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
53 (test-insert-overlay "XXX" 'display "u "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
54 'before-string "gn" 'after-string "em")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
55 (test-insert-overlay "a" 'after-string "cs")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
56 (insert "\n\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
57 (insert " Expected: gnu emacs\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
58 (insert " Results: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
59 (test-insert-overlay "u " 'before-string "gn" 'after-string "em")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
60 (test-insert-overlay "XXX" 'display "a" 'after-string "cs")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
61 (insert "\n\n"))
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
62
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
63 (defun test-redisplay-2 ()
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
64 (insert "Test 2: Mouse highlighting. Move your mouse over the letters XXX:\n\n")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
65 (insert " Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
66 (propertize "xxxXXXxxx" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
67 "...---...\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
68 (test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx"
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
69 'mouse-face 'highlight )
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
70 (test-insert-overlay "---" 'before-string "..." 'after-string "...")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
71 (insert "\n\n Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
72 (propertize "xxxXXX" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
73 "...---...\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
74 (test-insert-overlay "XXX" 'before-string "xxx" 'mouse-face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
75 (test-insert-overlay "---" 'before-string "..." 'after-string "...")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
76 (insert "\n\n Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
77 (propertize "XXX" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
78 "...---...\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
79 (test-insert-overlay "..." 'display "XXX" 'mouse-face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
80 (test-insert-overlay "---" 'before-string "..." 'after-string "...")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
81 (insert "\n\n Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
82 (propertize "XXXxxx" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
83 "...\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
84 (test-insert-overlay "..." 'display "XXX" 'after-string "xxx"
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
85 'mouse-face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
86 (test-insert-overlay "error" 'display "...")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
87 (insert "\n\n Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
88 "---..."
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
89 (propertize "xxxXXX" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
90 "\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
91 (test-insert-overlay "xxx" 'display "---" 'after-string "...")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
92 (test-insert-overlay "error" 'before-string "xxx" 'display "XXX"
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
93 'mouse-face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
94 (insert "\n\n Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
95 "...---..."
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
96 (propertize "xxxXXXxxx" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
97 "\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
98 (test-insert-overlay "---" 'before-string "..." 'after-string "...")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
99 (test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx"
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
100 'mouse-face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
101 (insert "\n\n Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
102 "..."
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
103 (propertize "XXX" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
104 "...\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
105 (test-insert-overlay "---"
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
106 'display (propertize "XXX" 'mouse-face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
107 'before-string "..."
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
108 'after-string "...")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
109 (insert "\n\n Expected: "
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
110 (propertize "XXX\n" 'face 'highlight)
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
111 "\n Test: ")
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
112 (test-insert-overlay "XXX\n" 'mouse-face 'highlight)
109045
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
113 (insert "\n\n"))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
114
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
115 (defun test-redisplay-3 ()
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
116 (insert "Test 3: Overlay with before/after strings and images:\n\n")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
117 (let ((img-data "#define x_width 8
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
118 #define x_height 8
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
119 static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff };"))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
120 ;; Control
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
121 (insert " Expected: AB"
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
122 (propertize "X" 'display `(image :data ,img-data :type xbm))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
123 "CD\n")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
124
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
125 ;; Overlay with before, after, and image display string.
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
126 (insert " Result 1: ")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
127 (let ((opoint (point)))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
128 (insert "AXD\n")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
129 (let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
130 (overlay-put ov 'before-string "B")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
131 (overlay-put ov 'after-string "C")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
132 (overlay-put ov 'display
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
133 `(image :data ,img-data :type xbm))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
134
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
135 ;; Overlay with before and after string, and image text prop.
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
136 (insert " Result 2: ")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
137 (let ((opoint (point)))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
138 (insert "AXD\n")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
139 (let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
140 (overlay-put ov 'before-string "B")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
141 (overlay-put ov 'after-string "C")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
142 (put-text-property (1+ opoint) (+ 2 opoint) 'display
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
143 `(image :data ,img-data :type xbm))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
144
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
145 ;; Overlays with adjacent before and after strings, and image text
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
146 ;; prop.
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
147 (insert " Result 3: ")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
148 (let ((opoint (point)))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
149 (insert "AXD\n")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
150 (let ((ov1 (make-overlay opoint (1+ opoint)))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
151 (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
152 (overlay-put ov1 'after-string "B")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
153 (overlay-put ov2 'before-string "C")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
154 (put-text-property (1+ opoint) (+ 2 opoint) 'display
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
155 `(image :data ,img-data :type xbm))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
156
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
157 ;; Three overlays.
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
158 (insert " Result 4: ")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
159 (let ((opoint (point)))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
160 (insert "AXD\n\n")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
161 (let ((ov1 (make-overlay opoint (1+ opoint)))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
162 (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint)))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
163 (ov3 (make-overlay (1+ opoint) (+ 2 opoint))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
164 (overlay-put ov1 'after-string "B")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
165 (overlay-put ov2 'before-string "C")
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
166 (overlay-put ov3 'display `(image :data ,img-data :type xbm))))))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
167
103593
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
168
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
169 (defun test-redisplay ()
3acb65a2fdd5 * redisplay-testsuite.el: New file.
Chong Yidong <cyd@stupidchicken.com>
parents:
diff changeset
170 (interactive)
109045
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
171 (let ((buf (get-buffer "*Redisplay Test*")))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
172 (if buf
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
173 (kill-buffer buf))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
174 (pop-to-buffer (get-buffer-create "*Redisplay Test*"))
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
175 (erase-buffer)
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
176 (test-redisplay-1)
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
177 (test-redisplay-2)
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
178 (test-redisplay-3)
b262a4f49bf3 Add redisplay test for image and overlay string interaction.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
179 (goto-char (point-min))))
103689
3666f62113ed Add arch tagline
Miles Bader <miles@gnu.org>
parents: 103593
diff changeset
180
3666f62113ed Add arch tagline
Miles Bader <miles@gnu.org>
parents: 103593
diff changeset
181 ;; arch-tag: fcee53c8-024f-403d-9154-61ae3ce0bfb8