1998-08-18 Kenichi Handa <handa@etl.go.jp>
- * ccl.c (CCL_READ_CHAR): If eof is encounterd while processing the
+ * ccl.c (CCL_READ_CHAR): If eof is encountered while processing the
last block, don't just finish but processes eol block of the
current CCL program.
(ccl_driver): Add a new jump label ccl_repeat for the above change.
1998-08-13 Andrew Innes <andrewi@harlequin.co.uk>
- * w32.c (stat): Fall-back to default behaviour when we cannot get
+ * w32.c (stat): Fall-back to default behavior when we cannot get
accurate information on file attributes.
1998-08-12 Richard Stallman <rms@psilocin.ai.mit.edu>
(coding_category_name): Include "coding-category-ccl".
(detect_coding_ccl): New function.
(setup_coding_system): Setup coding->spec.ccl.valid_codes from the
- coding system priority `valid-codes' for CCL based coding systesm.
+ coding system priority `valid-codes' for CCL based coding systems.
(detect_coding_mask): Check also a CCL based coding system.
(Fupdate_coding_systems_internal): Renamed from
Fupdate_iso_coding_systems.
translation-table to 1. Initialize and static pro Qvalid_codes.
* coding.h (CODING_CATEGORY_IDX_CCL): New macro.
- (CODING_CATEGORY_IDX_BIG5, CODING_CATEGORY_IDX_RAW_TEXT,
- CODING_CATEGORY_IDX_BINARY, CODING_CATEGORY_IDX_MAX): Increased by
- one.
+ (CODING_CATEGORY_IDX_BIG5, CODING_CATEGORY_IDX_RAW_TEXT)
+ (CODING_CATEGORY_IDX_BINARY, CODING_CATEGORY_IDX_MAX): Increased by one.
(CODING_CATEGORY_MASK_CCL): New macro.
(CODING_CATEGORY_MASK_ANY): Include CODING_CATEGORY_MASK_CCL.
* fileio.c (Finsert_file_contents): Call Vset_auto_coding_function
with two arguments.
(Fwrite_region): If buffer-file-coding-system is set locally, use
- the coding system whithout checking file-coding-system-alist.
+ the coding system without checking file-coding-system-alist.
(syms_of_fileio): Docstring of set-auto-coding-function adjusted
for the change of argument number.
1998-07-13 Eli Zaretskii <eliz@mescaline.gnu.org>
- * w16select.c (set_clipboard_data, get_clipboard_data,
- Fw16_set_clipboard_data, Fw16_get_clipboard_data,
- Fx_selection_exists_p): Use CF_OEMTEXT instead of CF_TEXT.
+ * w16select.c (set_clipboard_data, get_clipboard_data)
+ (Fw16_set_clipboard_data, Fw16_get_clipboard_data)
+ (Fx_selection_exists_p): Use CF_OEMTEXT instead of CF_TEXT.
1998-07-12 Andrew Innes <andrewi@delysid.gnu.org>
- * w32select.c: (Fw32_set_clipboard_data): Set Vlast_coding_system_used.
+ * w32select.c (Fw32_set_clipboard_data): Set Vlast_coding_system_used.
(Fw32_get_clipboard_data): Likewise.
1998-07-12 Richard Stallman <rms@psilocin.ai.mit.edu>
* ccl.c: Typo in comments fixed.
* coding.c (DECODE_ISO_CHARACTER): While decoding two-byte code,
- if the sencond byte is invalid, produce the first byte as is.
+ if the second byte is invalid, produce the first byte as is.
* fontset.c (fs_load_font): Typo in comments fixed.
1998-07-03 Kenichi Handa <handa@etl.go.jp>
* editfns.c (Finsert): Typo in doc-string fixed.
- (Finsert_and_inherit, Finsert_before_markers,
- Finsert_and_inherit_before_markers): Likewize.
+ (Finsert_and_inherit, Finsert_before_markers)
+ (Finsert_and_inherit_before_markers): Likewise.
1998-07-02 Ken'ichi Handa <handa@melange.gnu.org>
* xterm.c (x_list_fonts): Keep alloca usage simple.
-1998-06-20 Per Starback <starback@strindberg.ling.uu.se>
+1998-06-20 Per Starbäck <starback@strindberg.ling.uu.se>
* xdisp.c, charset.h, coding.c, emacs.c: Doc fixes.
* process.c (read_process_output): Handle carryover correctly.
* xterm.c (dumpglyphs): Check the case that FACE_FONT (face) is
- NULL. While displaing cursor with non-default face, if the
+ NULL. While displaying cursor with non-default face, if the
variable `font' is NULL, don't set GCFont.
1998-06-19 Richard Stallman <rms@gnu.org>
1998-06-17 Geoff Voelker <voelker@cs.washington.edu>
- * w32.c (is_unc_volume, open_unc_volume, read_unc_volume,
- close_unc_volume, unc_volume_file_attributes): New functions.
+ * w32.c (is_unc_volume, open_unc_volume, read_unc_volume)
+ (close_unc_volume, unc_volume_file_attributes): New functions.
(wnet_enum_handle): New variable.
(opendir, readdir, closedir, sys_access, stat): Handle UNC volumes.
1998-06-12 Ken'ichi Handa <handa@melange.gnu.org>
* fileio.c (Finsert_file_contents): Undo the previous change for
- handling set-ault-coding.
+ handling set-auto-coding.
1998-06-11 Richard Stallman <rms@psilocin.ai.mit.edu>
(scan_lists): Likewise.
(prev_char_comstart_first): New function.
- * syntax.c
1998-06-05 Andrew Innes <andrewi@harlequin.co.uk>
- * w32.c: #include sys/file.h
+ * w32.c: #include sys/file.h.
(sys_access): Provide our own implementation which recognizes D_OK.
(is_exec): New function.
(stat): Use it.
in a string's intervals start from zero.
(validate_interval_range, interval_of, Fnext_property_change)
(property_change_between_p, Fnext_single_property_change)
- (Fprevious_property_change, Fprevious_single_property_change):
+ (Fprevious_property_change, Fprevious_single_property_change)
(Ftext_property_any, Ftext_property_not_all): Implement that.
* textprop.c: Undo previous change.
* coding.h: Change terms unify/unification to
translate/translation respectively throughout the file.
- * fns.c (concat): Fix bug in concatinating a list of multibyte and
+ * fns.c (concat): Fix bug in concatenating a list of multibyte and
unibyte characters.
* lisp.h (Vnonascii_translation_table): Name changed from
1998-05-07 Eli Zaretskii <eliz@mescaline.gnu.org>
* process.c (init_process, syms_of_process) [not subprocesses]:
- Make definition consistent with prototypes on lisp.h
+ Make definition consistent with prototypes on lisp.h.
1998-05-07 Kenichi Handa <handa@etl.go.jp>
* unexelf.c [__alpha__ && !__NetBSD__ && !__OpenBSD__]:
Include definition of HDRR structure that used to be in sym.h,
- instead of sym.h
+ instead of sym.h.
1998-04-29 Andreas Schwab <schwab@delysid.gnu.org>
1998-04-28 Eli Zaretskii <eliz@mescaline.gnu.org>
- * Makefile.in (callproc.o, print.o, cmds.o, dispnew.o, fileio.o,
- frame.o, keyboard.o, minibuf.o, process.o, scroll.o, sysdep.o,
- term.o, w16select.o, window.o, xdisp.o, xfaces.o, lread.o): Depend
- on msdos.h.
+ * Makefile.in (callproc.o, print.o, cmds.o, dispnew.o, fileio.o)
+ (frame.o, keyboard.o, minibuf.o, process.o, scroll.o, sysdep.o)
+ (term.o, w16select.o, window.o, xdisp.o, xfaces.o, lread.o):
+ Depend on msdos.h.
(print.o): Depend on dispextern.h.
1998-04-28 Andreas Schwab <schwab@delysid.gnu.org>
* callproc.c, fileio.c: Include msdos.h after lisp.h.
- * msdos.c (IT_ring_bell, IT_write_glyphs, IT_clear_end_of_line,
- IT_clear_screen, IT_clear_to_end, IT_clear_to_end, IT_cursor_to,
- IT_cmgoto, IT_reassert_line_highlight, IT_change_line_highlight,
- IT_update_begin, IT_update_end, IT_set_terminal_modes,
- IT_reset_terminal_modes, IT_set_terminal_window,
- pixel_to_glyph_coords, IT_menu_display): Bring definitions in
+ * msdos.c (IT_ring_bell, IT_write_glyphs, IT_clear_end_of_line)
+ (IT_clear_screen, IT_clear_to_end, IT_clear_to_end, IT_cursor_to)
+ (IT_cmgoto, IT_reassert_line_highlight, IT_change_line_highlight)
+ (IT_update_begin, IT_update_end, IT_set_terminal_modes)
+ (IT_reset_terminal_modes, IT_set_terminal_window)
+ (pixel_to_glyph_coords, IT_menu_display): Bring definitions in
accordance with prototype declarations.
* msdos.h [!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
* emacs.c (standard_args): Apply --unibyte/multibyte after --nw.
- * lisp.h: Include initial_obarray from lread.c
+ * lisp.h: Include initial_obarray from lread.c.
* data.c (set_internal): Test keywordness only in initial obarray.
1998-04-23 Inge Frick <inge@nada.kth.se>
- * keyboard.c: (parse_menu_item): Support keywords :keys and
+ * keyboard.c (parse_menu_item): Support keywords :keys and
:key-sequence. Some changes to provide GC-protection. Some
cosmetic changes.
(syms_of_keyboard): Define new symbols `:keys' and `:key-sequence'.
* w16select.c (Fwin16_set_clipboard_data): Call UNBLOCK_INPUT
before calling sit_for.
- (Fwin16_get_clipboard_data, Fwin16_set_clipboard_data): Balance
+ (Fwin16_get_clipboard_data, Fwin16_set_clipboard_data): Balance
the calls to BLOCK_INPUT and UNBLOCK_INPUT.
(alloc_xfer_buf): If want_size is more than 1MB, return
immediately with failure.
Insist on MAX_LENGTH_OF_MULTI_BYTE_FORM bytes when checking
for read_buffer full; this way need not check specially for multibyte.
- * emacs.c: Include buffer.h
+ * emacs.c: Include buffer.h.
(main): When handling --unibyte, mark all existing
buffers as unibyte; but don't handle it when dumping.
* process.h (struct Lisp_Process): Add inherit_coding_system_flag
member.
- * process.c (Fset_process_inherit_coding_system_flag,
- Fprocess_inherit_coding_system_flag): New functions.
+ * process.c (Fset_process_inherit_coding_system_flag)
+ (Fprocess_inherit_coding_system_flag): New functions.
(syms_of_process): Defsubr them.
(Fstart_process, Fopen_network_stream): Initialize
inherit_coding_system_flag.
(w32_fatal_reload_error): New function.
(read_in_bss, map_in_heap): Invoke w32_fatal_reload_error upon error.
- * w32.c (sys_read): Clear carriage return flag.
+ * w32.c (sys_read): Clear carriage return flag.
Report normal EOF when read fails if nothing in buffer.
Only read more if more remaining.
(check_windows_init_file): New function.
CCL_ReadMultibyteCharacter.
(CCL_WriteMultibyteChar2): Macro name changed from
CCL_WriteMultibyteChar2.
- (CCL_
(MAX_TABLE_SET_LEVEL): New macro.
(tr_stack): New type.
(translate_stack, translate_stack_pointer): New variables.
(ccl_driver): Adjusted for the above changes.
(resolve_symbol_ccl_program): New function.
(Fccl_execute): The arg CCL-PROGRAM can be a symbol of CCL
- program. If CCL-PRGRAM is a vector, convert symbols in it to ID
+ program. If CCL-PROGRAM is a vector, convert symbols in it to ID
numbers by resolve_symbol_ccl_program.
(Fccl_execute_on_string): Likewise.
- (Fregister_ccl_program): If the arg CCL-PRGRAM is a vector,
+ (Fregister_ccl_program): If the arg CCL-PROGRAM is a vector,
convert symbols in it to ID numbers by resolve_symbol_ccl_program.
* ccl.h (Vccl_program_table, Qccl_program_idx): Extern them.
* window.c (Fset_window_configuration): Fix mixing of Lisp_Object
and int.
- * sysdep.c (init_sys_modes): Fix mixing of Lisp_Object and int
+ * sysdep.c (init_sys_modes): Fix mixing of Lisp_Object and int.
* search.c (compile_pattern, compile_pattern_1): Fix mixing of
Lisp_Object and int.
* frame.c (Fset_mouse_position, Fset_mouse_pixel_position): Fix
mixing of Lisp_Object and int.
- * fns.c (Fsubstring, substring_both, Fchar_table_range,
- Fset_char_table_range): Fix mixing of Lisp_Object and int.
+ * fns.c (Fsubstring, substring_both, Fchar_table_range)
+ (Fset_char_table_range): Fix mixing of Lisp_Object and int.
* fileio.c (Fwrite_region): Fix mixing of Lisp_Object and int.
* editfns.c (Fchar_after, Fchar_before): Fix mixing of Lisp_Object
- and int
+ and int.
* coding.c (code_convert_region): Fix mixing of Lisp_Object and
int.
* cm.h: Update return types of declarations.
* xterm.h, puresize.h, termhooks.h, lisp.h, keyboard.h,
- intervals.h, dispextern.h, blockinput.h, coding.h: Add more
- prototypes.
+ * intervals.h, dispextern.h, blockinput.h, coding.h:
+ Add more prototypes.
* xterm.c, xselect.c, xrdb.c, xmenu.c, xdisp.c, window.c,
- widget.c, undo.c, terminfo.c, term.c, sysdep.c, syntax.c,
- search.c, scroll.c, process.c, print.c, mocklisp.c, prefix-args.c,
- marker.c, keymap.c, keyboard.c, intervals.c, insdel.c, indent.c,
- frame.c, fontset.c, fns.c, floatfns.c, filelock.c, fileio.c,
- eval.c, emacs.c, editfns.c, doprnt.c, doc.c, dispnew.c, dired.c,
- data.c, coding.c, cmds.c, cm.c, charset.c, ccl.c, category.c,
- casetab.c, casefiddle.c, callproc.c, callint.c, bytecode.c,
- buffer.c, alloc.c, abbrev.c: Fix -Wimplicit warnings.
+ * widget.c, undo.c, terminfo.c, term.c, sysdep.c, syntax.c,
+ * search.c, scroll.c, process.c, print.c, mocklisp.c, prefix-args.c,
+ * marker.c, keymap.c, keyboard.c, intervals.c, insdel.c, indent.c,
+ * frame.c, fontset.c, fns.c, floatfns.c, filelock.c, fileio.c,
+ * eval.c, emacs.c, editfns.c, doprnt.c, doc.c, dispnew.c, dired.c,
+ * data.c, coding.c, cmds.c, cm.c, charset.c, ccl.c, category.c,
+ * casetab.c, casefiddle.c, callproc.c, callint.c, bytecode.c,
+ * buffer.c, alloc.c, abbrev.c: Fix -Wimplicit warnings.
* buffer.c (Fset_buffer_multibyte): Do nothing if nothing actually
changes.
Function moved after set_intervals_multibyte_1.
* xdisp.c (redisplay_window): If updating mode line,
- temporarily change selected_frame
+ temporarily change selected_frame.
1998-04-02 Dave Love <fx@gnu.org>
1998-03-21 Richard Stallman <rms@delysid.gnu.org>
* dired.c (Fdirectory_files):
- In FULL case, compute number of characters
+ In FULL case, compute number of characters.
* fns.c (substring_both, Fsubstring): Use make_specified_string.
(concat): Make string result unibyte or multibyte as appropriate.
* xselect.c (selection_data_to_lisp_data): Use make_string_from_bytes.
- * insdel.c: (insert_from_string_1, replace_range):
+ * insdel.c (insert_from_string_1, replace_range):
Use STRING_MULTIBYTE to determine whether string is multibyte.
* editfns.c: Use STRING_BYTES and SET_STRING_BYTES.
(Ftranspose_regions): Try to handle combining bytes.
* alloc.c, xterm.c, xselect.c, xmenu.c, xfns.c, xdisp.c, search.c,
- process.c, print.c, lread.c, keymap.c, insdel.c, keyboard.c,
- frame.c, fns.c, filelock.c, doc.c, dispnew.c, data.c, coding.c,
- charset.c, ccl.c, category.c, casefiddle.c, callproc.c, callint.c,
- bytecode.c, abbrev.c, minibuf.c, buffer.c, fileio.c: Use
- STRING_BYTES and SET_STRING_BYTES.
+ * process.c, print.c, lread.c, keymap.c, insdel.c, keyboard.c,
+ * frame.c, fns.c, filelock.c, doc.c, dispnew.c, data.c, coding.c,
+ * charset.c, ccl.c, category.c, casefiddle.c, callproc.c, callint.c,
+ * bytecode.c, abbrev.c, minibuf.c, buffer.c, fileio.c:
+ Use STRING_BYTES and SET_STRING_BYTES.
* xmenu.c: Don't include puresize.h any more as code that needs it
has moved to keyboard.c.
1998-03-21 Richard Stallman <rms@psilocin.gnu.org>
* dired.c (Fdirectory_files): In FULL case,
- compute number of characters
+ compute number of characters.
* insdel.c (insert_from_string_1, replace_range):
Use STRING_MULTIBYTE to determine whether string is multibyte.
* cmds.c (internal_self_insert): Pass new arg to replace_range.
- * insdel.c (insert_1_both, insert_from_string_1, insert_from_buffer_1):
- (adjust_before_replace, adjust_after_replace, replace_range):
+ * insdel.c (insert_1_both, insert_from_string_1, insert_from_buffer_1)
+ (adjust_before_replace, adjust_after_replace, replace_range)
(del_range_2): Call record_delete the new way.
Use make_buffer_string_both to make the string to pass.
* keyboard.h (item_properties): New variable.
(ITEM_PROPERTY_...): New macros.
- * keymap.c (fix_submap_inheritance, get_keyelt, store_in_keymap,
- copy-keymap, where_is_internal_1): Support new format for menu items.
+ * keymap.c (fix_submap_inheritance, get_keyelt, store_in_keymap)
+ (copy-keymap, where_is_internal_1): Support new format for menu items.
(syms_of_keymap): New symbol `menu-item'.
* keyboard.c: Include puresize.h for CHECK_IMPURE.
(menu_bar_one_keymap): Moved some code to menu_bar_item.
(menu_bar_item): Rewritten to use parse_menu_item.
(menu_bar_item_1): Function deleted.
- (QCenable, QCvisible, QChelp, QCfilter, QCbutton, QCtoggle, QCradio):
+ (QCenable, QCvisible, QChelp, QCfilter, QCbutton, QCtoggle, QCradio)
(Qmenu_alias): New variables.
(syms_of_keyboard): Initialize them, and item_properties.
1998-03-04 Kenichi HANDA <handa@etl.go.jp>
* buffer.c (Fset_buffer_multibyte): Fix arg for chars_in_text.
- Be sure not to have a multibyte sequence striding over the GAP
+ Be sure not to have a multibyte sequence striding over the GAP.
* charset.c (strwidth): Make it work for invalid bytes sequence.
(Fstring_width): Give byte length of STR to strwidth.
1998-02-19 Kenichi Handa <handa@etl.go.jp>
- * buffer.c (advance_to_char_boundary): Make the behaviour
+ * buffer.c (advance_to_char_boundary): Make the behavior
consistent with INC_POS.
* ccl.c (Fccl_execute_on_string): Add new arg UNIBYTE-P.
* charset.h (INC_POS): Use macro BASE_LEADING_CODE_P.
- (DEC_POS): Make the behaviour consistent with INC_POS.
+ (DEC_POS): Make the behavior consistent with INC_POS.
(BUF_INC_POS, BUF_DEC_POS): Likewise.
* charset.c (invalid_character): New function.
- (chars_in_text): Make the behaviour consistent with INC_POS.
+ (chars_in_text): Make the behavior consistent with INC_POS.
(multibyte_chars_in_text): Likewise.
(str_cmpchar_id): Likewise.
(non_ascii_char_to_string): Call invalid_character.
(Fchar_direction): Likewise.
* coding.c (decode_coding_iso2022): Update coding->fake_multibyte.
- (ENCODE_SINGLE_SHIFT_2, ENCODE_SINGLE_SHIFT_3,
- encode_coding_iso2022, decode_coding_sjis_big5,
- encode_coding_sjis_big5, decode_eol, encode_eol, decode_coding,
- encode_coding): Likewise.
+ (ENCODE_SINGLE_SHIFT_2, ENCODE_SINGLE_SHIFT_3)
+ (encode_coding_iso2022, decode_coding_sjis_big5)
+ (encode_coding_sjis_big5, decode_eol, encode_eol, decode_coding)
+ (encode_coding): Likewise.
(shrink_decoding_region, shrink_encoding_region): Do not skip
non-ASCII code in any cases. Bug fix for getting starting address
from BEG.
* search.c (search_buffer): Update POS_BYTE for regexp search.
* xdisp.c (display_text_line): Handling of a wide-column character
- fixed. Make the behaviour consistent with INC_POS.
+ fixed. Make the behavior consistent with INC_POS.
1998-02-18 Richard Stallman <rms@gnu.org>
* callproc.c (Fcall_process): Allow creating a new buffer
for the output.
-1998-01-30 Kenichi Handa Kenichi Handa <handa@etl.go.jp>
+1998-01-30 Kenichi Handa <handa@etl.go.jp>
* coding.c (ENCODE_ISO_CHARACTER): Pay attention to
CODING_FLAG_ISO_USE_ROMAN and CODING_FLAG_ISO_USE_OLDJIS.
heading_ascii. Deleted members last_block, direction, selective,
carryover, carryover_size.
(CODING_MAY_REQUIRE_DECODING): New macro.
- (CODING_CATEGORY_MASK_ISO_7BIT, CODING_CATEGORY_MASK_ISO_8BIT,
- CODING_CATEGORY_MASK_ISO_SHIFT, CODING_CATEGORY_MASK_ISO): New
- macros.
+ (CODING_CATEGORY_MASK_ISO_7BIT, CODING_CATEGORY_MASK_ISO_8BIT)
+ (CODING_CATEGORY_MASK_ISO_SHIFT, CODING_CATEGORY_MASK_ISO):
+ New macros.
(Qraw_text): Extern it.
- * coding.c (DECODE_CHARACTER_ASCII): Update coding->produced_char;
+ * coding.c (DECODE_CHARACTER_ASCII): Update coding->produced_char.
(DECODE_CHARACTER_DIMENSION1): Likewise.
(Qraw_text, Qcoding_category): New variables.
(syms_of_coding): Intern and staticpro them.
Update coding->heading_ascii.
(detect_eol_type): New arg SKIP.
(detect_eol): Adjusted for the change of detect_eol_type.
- (ccl_codign_driver): New function.
+ (ccl_coding_driver): New function.
(decode_coding): Arg CONSUMED deleted, and the meaning of return
value changed. Update members produced, produced_char, consumed,
consumed_char of the struct *coding.
string.
* fileio.c (Finsert_file_contents): Adjusted for the change of
- struct coding_system and function decode_coding. For normail file
+ struct coding_system and function decode_coding. For normal file
reading, use code_convert_region.
(Fwrite_region): Adjusted for the change of struct coding_system.
(e_write): Adjusted for the change of encode_coding.
(struct iso2022_spec): New member.
last_invalid_designation_register.
(struct coding_system): New member inhibit_inconsistent_eol_type.
- (CODING_CATEGORY_IDX_ISO_7_TIGHT,
- CODING_CATEGORY_MASK_ISO_7_TIGHT): New macros.
- (CODING_CATEGORY_MASK_ANY): Include
- CODING_CATEGORY_MASK_ISO_7_TIGHT.
+ (CODING_CATEGORY_IDX_ISO_7_TIGHT, CODING_CATEGORY_MASK_ISO_7_TIGHT):
+ New macros.
+ (CODING_CATEGORY_MASK_ANY): Include CODING_CATEGORY_MASK_ISO_7_TIGHT.
(coding_category_table, coding_category_name): Extern deleted.
(Vselect_safe_coding_system_function): Extern it.
1998-01-21 Kenichi Handa <handa@etl.go.jp>
- * ccl.h: (struct ccl_program): New member private_state.
+ * ccl.h (struct ccl_program): New member private_state.
- * ccl.c (Vccl_translation_table_vector, Qccl_program,
- Qccl_translation_table, Qccl_translation_table_id): New variables.
- append new symbols. Qccl_translation_table and
+ * ccl.c (Vccl_translation_table_vector, Qccl_program)
+ (Qccl_translation_table, Qccl_translation_table_id): New variables.
+ Append new symbols. Qccl_translation_table and
Qccl_translation_table_id.
(CCL_Call): Fix the comment.
- (CCL_ReadMultibyteCharacter, CCL_WriteMultibyteCharacter,
- CCL_UnifyCharacter, CCL_UnifyCharacterConstTbl,
- CCL_IterateMultipleMap, CCL_TranslateMultipleMap): New macros for
- CCL Commands.
+ (CCL_ReadMultibyteCharacter, CCL_WriteMultibyteCharacter)
+ (CCL_UnifyCharacter, CCL_UnifyCharacterConstTbl)
+ (CCL_IterateMultipleMap, CCL_TranslateMultipleMap):
+ New macros for CCL Commands.
(EXCMD): New macro.
- (ccl_driver): New case lable `CCL_Extention'.
+ (ccl_driver): New case label `CCL_Extention'.
(setup_ccl_program): Initialize the member `private_state' of CCL.
(Fregister_ccl_program): Delete unused variable IDX.
(Fregister_ccl_translation_table): New function.
Pass different args to scan_newline.
Properly compare oldpoint with Z.
- * syntax.c (skip_chars): Use unibyte_char_to_multibyte,
+ * syntax.c (skip_chars): Use unibyte_char_to_multibyte.
* fns.c (concat): Use unibyte_char_to_multibyte.
insert_from_string. Scan string by bytes and chars.
(Ftry_completion): Use size_byte while comparing.
(Fall_completions): Use size_byte while comparing.
- (test_completion):
+ (test_completion): Pass both kinds of size to oblookup.
* editfns.c (syms_of_editfns): Delete defsubr for sref.
* keyboard.c (read_char): Use Faref on Vkeyboard_translate_table
if it is a string.
(apply_modifiers_uncached): New arg base_len_byte. Calls changed.
- (read_char_minibuf_menu_prompt):
- (read_key_sequence): Access buffer's downcase_table with XCHAR_TABLE.
+ (read_char_minibuf_menu_prompt, read_key_sequence): Access buffer's
+ downcase_table with XCHAR_TABLE.
(Fexecute_extended_command): Use Faref to access FUNCTION.
Use size_byte of BINDING.
(stuff_buffered_input): Use size_byte of STUFFSTRING.
(Fmessage, Fmessage_box): Update message_text based on size_byte.
* insdel.c (insert_from_string): New args POS_BYTE, LENGTH.
- (insert_from_string_before_markers):
- (insert_from_string_1): New arg POS_BYTE. Swap args NCHARS, NBYTES.
- Don't fail to use POS_BYTE!
+ (insert_from_string_before_markers, insert_from_string_1): New arg
+ POS_BYTE. Swap args NCHARS, NBYTES. Don't fail to use POS_BYTE!
(insert_from_buffer_1): Get both inschars and insbytes from NEW.
* alloc.c (make_uninit_multibyte_string): New function.
(insert_1, indented_beyond_p): Decls changed.
(move_gap_both, del_range_byte, del_range_both, del_range_2)
(scan_newline, Ffile_locked_p): New decls.
- (struct Lisp_Marker):
* search.c (scan_newline): Always restore prev value of immediate_quit.
* xdisp.c (redisplay_internal): Use scan_newline.
(display_text_line, try_window_id): Use scan_newline.
- * xdisp.c (pos_tab_indent): Moved from indent,c. Now static.
+ * xdisp.c (pos_tab_indent): Moved from indent.c. Now static.
Take POS in bytes and chars. Callers changed.
* indent.c (Fcurrent_indentation): Use scan_newline and SET_PT_BOTH.
* keymap.c (describe_map): Fix decl of arg ELT_DESCRIBER.
- * process.c (create_process, deactivate_process, close_process_descs):
+ * process.c (create_process, deactivate_process, close_process_descs)
(kill_buffer_processes, status_notify): Return void.
(Fstart_process): Cast arg to create_process.
- * undo.c (record_insert, record_delete, record_marker_adjustment):
+ * undo.c (record_insert, record_delete, record_marker_adjustment)
(record_change, record_first_change, record_property_change):
Return void.
1997-11-27 Ken'ichi Handa <handa@delysid.gnu.org>
- * undo.c (record_change, record_first_change,
- record_property_change): Declare them as void.
+ * undo.c (record_change, record_first_change, record_property_change):
+ Declare them as void.
(record_delete, record_marker_adjustment): Declare them as void.
* indent.c (invalidate_current_column): Declare it as void.
* filelock.c (unlock_buffer): Declare it as void.
- * buffer.c (nsberror, record_buffer, validate_region,
- fix_overlay_before): Declare them as void.
+ * buffer.c (nsberror, record_buffer, validate_region)
+ (fix_overlay_before): Declare them as void.
- * sysdep.c (discard_tty_input, init_baud_rate,
- wait_for_termination, flush_pending_output, child_setup_tty,
- sys_suspend, sys_subshell, init_sigio, request_sigio,
- unrequest_sigio, init_sys_modes, get_frame_size, reset_sys_modes,
- setup_pty): Declare them as void.
+ * sysdep.c (discard_tty_input, init_baud_rate, wait_for_termination)
+ (flush_pending_output, child_setup_tty, sys_suspend, sys_subshell)
+ (init_sigio, request_sigio, unrequest_sigio, init_sys_modes)
+ (get_frame_size, reset_sys_modes, setup_pty): Declare them as void.
* keymap.c (describe_vector): Declaration fixed (delete `.' at the
tail of type `void'.
(fix_submap_inheritance): Declare it as void.
- * keyboard.c (echo_now, record_auto_save, cmd_error_internal,
- start_polling, stop_polling, bind_polling_period,
- timer_start_idle, timer_stop_idle, gobble_input,
- record_asynch_buffer_change, clear_input_pending,
- stuff_buffered_input, clear_waiting_for_input,
- quit_throw_to_read_char): Declare these as void.
+ * keyboard.c (echo_now, record_auto_save, cmd_error_internal)
+ (start_polling, stop_polling, bind_polling_period, timer_start_idle)
+ (timer_stop_idle, gobble_input, record_asynch_buffer_change)
+ (clear_input_pending, stuff_buffered_input, clear_waiting_for_input)
+ (quit_throw_to_read_char): Declare these as void.
(Fsuspend_emacs): Delete unnecessary extern declaration for
init_sys_mode.
(Fexecute_extended_command): Give Voverriding_local_map as the
(Fformat_time_string): Doc fix: %b, %h, %B, %a, %A, and %p depend on
locale; don't use actual chars to describe %n and %t.
- * src/Makefile.in (strftime.o), src/makefile.nt ($(BLD)\strftime.obj):
+ * src/Makefile.in (strftime.o):
+ * src/makefile.nt ($(BLD)\strftime.obj):
No need to compile with -Dstrftime=emacs_strftime any more.
1997-11-22 Richard Stallman <rms@gnu.org>
* buffer.h: Add more prototypes and function declarations.
* print.c (printchar): Declare `work' as unsigned char.
- (internal_with_output_to_temp_buffer): Protoype parameter
+ (internal_with_output_to_temp_buffer): Prototype parameter
FUNCTION.
(Ferror_message_string): Remove extra argument of
print_error_message.
* xdisp.c (display_text_line): Make decision about which windows
highlight the region in just once place.
- When minibuffer is selected, show the region in the previous window,
+ When minibuffer is selected, show the region in the previous window.
* charset.h (ASCII_BYTE_P): New macro.
1997-11-10 Eli Zaretskii <eliz@is.elta.co.il>
* msdos.c: Support for Japanese display on DOS/V systems.
- (screen_old_address, screen_virtual_segment,
- screen_virtual_offset): New variables.
+ (screen_old_address, screen_virtual_segment, screen_virtual_offset):
+ New variables.
(dosv_refresh_virtual_screen): New function.
- (dos_direct_output, dos_set_window_size, IT_write_glyphs,
- IT_clear_end_of_line, IT_clear_screen, IT_display_cursor,
- IT_reset_terminal_modes, XMenuActivate, abort): Call
+ (dos_direct_output, dos_set_window_size, IT_write_glyphs)
+ (IT_clear_end_of_line, IT_clear_screen, IT_display_cursor)
+ (IT_reset_terminal_modes, XMenuActivate, abort): Call
dosv_refresh_virtual_screen if under DOS/V.
(IT_set_terminal_modes): If under DOS/V, update the address of
primary screen buffer.
* coding.h (struct coding_system): Add member common_flags, delete
member require_flushing.
- (CODING_REQUIRE_FLUSHING_MASK, CODING_REQUIRE_DECODING_MASK,
- CODING_REQUIRE_ENCODING_MASK, CODING_REQUIRE_DETECTION_MASK): New
- macros.
+ (CODING_REQUIRE_FLUSHING_MASK, CODING_REQUIRE_DECODING_MASK)
+ (CODING_REQUIRE_ENCODING_MASK, CODING_REQUIRE_DETECTION_MASK):
+ New macros.
(CODING_REQUIRE_NO_CONVERSION, CODING_MAY_REQUIRE_NO_CONVERSION):
These macros deleted.
- (CODING_REQUIRE_FLUSHING, CODING_REQUIRE_DECODING,
- CODING_REQUIRE_ENCODING, CODING_REQUIRE_DETECTION): New macros.
+ (CODING_REQUIRE_FLUSHING, CODING_REQUIRE_DECODING)
+ (CODING_REQUIRE_ENCODING, CODING_REQUIRE_DETECTION): New macros.
* editfns.c (Fsref): If IDX points an 8-bit code which is not part
of multibyte characters, return it. Pay attention to
* charset.h (CHAR_VALID_P): Renamed from VALID_CHAR_P, new
argument GENERICP. Call char_valid_p for a non-ASCII character.
- * charset.c (char_valid_p): New function
+ * charset.c (char_valid_p): New function.
(Fchar_valid_p): New function.
(syms_of_charset): Declare it as a Lisp function.
1997-10-21 Kenichi Handa <handa@etl.go.jp>
- * Makefile.in (xselect.o): Depend on buffer.h
+ * Makefile.in (xselect.o): Depend on buffer.h.
* coding.c (Qcoding_system_spec): Deleted.
(Vcoding_system_list, Vcoding_system_alist): New variables.
* emacs.c (shut_down_emacs): Call `dos_cleanup'.
- * msdos.c (mouse_get_pos): Remove reduntant call to `int86'.
+ * msdos.c (mouse_get_pos): Remove redundant call to `int86'.
Clear the mouse-moved flag for all frames. Update last mouse
position.
(IT_set_menu_bar_lines): Remove.
* dosfns.c (__tb): Define.
(restore_parent_vm_title): New function.
(ms_windows_version): New function.
- (w95_set_virtual_machine_title): New function
+ (w95_set_virtual_machine_title): New function.
(x_set_title): New function.
- (dos_cleanup): New function
+ (dos_cleanup): New function.
(syms_of_dosfns): Define `dos-windows-version' Lisp variable.
(init_dosfns): Compute MS-Windows version and save the original
title of our DOS box.
(FILE_LAST_CR): New macro.
(w32_get_long_filename): Declare extern.
- * w32console.c: (DebPrint, reset_kbd, unset_kbd, take_console):
+ * w32console.c (DebPrint, reset_kbd, unset_kbd, take_console):
Delete functions.
(keyboard_init_hook): Delete variable.
(prev_console_cursor) [! USE_SEPARATE_SCREEN]: New variable.
* w32fns.c: Include limits.h and errno.h.
Declare externs from other files.
(w32_in_use): New variable.
- (check_w32, have_menus_p, x_set_title, w32_msg_worker,
- find_deferred_msg, send_deferred_msg, complete_deferred_msg,
- Fw32_focus_frame, W32-send-sys-command): New functions.
+ (check_w32, have_menus_p, x_set_title, w32_msg_worker)
+ (find_deferred_msg, send_deferred_msg, complete_deferred_msg)
+ (Fw32_focus_frame, W32-send-sys-command): New functions.
(last_mouse_movement_time): Delete variable.
(x_frame_parms): Alphabetize. Add title parm.
(initialize_frame_menubar): Pass in new param to set_frame_menubar.
* w32proc.c: Include w32heap.h.
- (Vw32_start_process_share_console, Vw32_generate_fake_inodes,
- Vw32_get_true_file_attributes, Qhigh, Qlow, process_dir):
+ (Vw32_start_process_share_console, Vw32_generate_fake_inodes)
+ (Vw32_get_true_file_attributes, Qhigh, Qlow, process_dir):
New variables.
- (find_child_console, set_process_dir, Fw32_short_file_name,
- Fw32_long_file_name, Fw32_set_process_priority, Fw32_get_locale_info,
- Fw32_get_current_locale_id, Fw32_get_default_local_id,
- Fw32_set_current_locale): New functions.
+ (find_child_console, set_process_dir, Fw32_short_file_name)
+ (Fw32_long_file_name, Fw32_set_process_priority, Fw32_get_locale_info)
+ (Fw32_get_current_locale_id, Fw32_get_default_local_id)
+ (Fw32_set_current_locale): New functions.
(CORRECT_DIR_SEPS): New macro.
(create_child): Create a new console if subprocs don't share parent's.
(reap_subprocess): Don't check for dos subprocesses.
* w32term.c (SIF_*): Win95 macros defined for NT.
(struct tagSCROLLINFO): Win95 struct defined for NT.
- (vertical_scroll_bar_min_handle, vertical_scroll_bar_top_border,
- vertical_scroll_bar_bottom_border, last_scroll_bar_drag_pos,
- Vw32_gab_focus_on_raise, Vw32_capslock_is_shiftlock): New
- variables.
+ (vertical_scroll_bar_min_handle, vertical_scroll_bar_top_border)
+ (vertical_scroll_bar_bottom_border, last_scroll_bar_drag_pos)
+ (Vw32_gab_focus_on_raise, Vw32_capslock_is_shiftlock):
+ New variables.
(w32_frame_up_to_date): Block input.
(do_line_dance): Use DC while erasing, release at end.
(show_mouse_face): Use column and endcolumn calculated at start of
loop.
- (my_create_scrollbar, my_show_window, my_set_window_pos,
- my_set_focus) [! ATTACH_THREADS]: Send message to window instead
- of invoking Windows procedure.
- (x_scroll_bar_create, x_scroll_bar_move, x_scroll_bar_handle_click,
- x_scroll_bar_report_motion): Use SCROLLINFO for proportional handle.
+ (my_create_scrollbar, my_show_window, my_set_window_pos, my_set_focus)
+ [! ATTACH_THREADS]: Send message to window instead of invoking
+ Windows procedure.
+ (x_scroll_bar_create, x_scroll_bar_move, x_scroll_bar_handle_click)
+ (x_scroll_bar_report_motion): Use SCROLLINFO for proportional handle.
(x_scroll_bar_set_handle): Create proportional sized scroll handle.
(w32_set_vertical_scroll_bar): Size handle according to how much
is showing in window.
Pass in new parameter to w32_kbd_mods_to_emacs.
Handle WM_DISPLAYCHANGE, WINDOWPOSCHANGED, ACTIVATE, SHOWWINDOW,
INITMENU, and ACTIVATEAPP messages.
- Explicitly check for visibile and obscured frames, and to see if
+ Explicitly check for visible and obscured frames, and to see if
any event should cause a redisplay.
(x_display_bar_cursor): Don't check whether frame is updating here.
by a mouse down event.
(x_to_win32_color): Support for X Windows RGB string specifications.
- * w32menu.c (get_frame_menubar_event): Check for the possibility
+ * w32menu.c (get_frame_menubar_event): Check for the possibility
of a menu-bar button. A menu-bar button is a caption on the menu
bar with no submenu.
(set_frame_menubar): Correctly handle menu-bar buttons.
1997-09-02 Nico Francois <nico.francois@scala.nl>
- * w32menu.c (single_keymap_panes): Fixed problem with 'descrip'
+ * w32menu.c (single_keymap_panes): Fixed problem with 'descrip'
lisp object not being protected properly (GCPRO).
- (get_single_keymap_event): Fixed problem with 'descrip' lisp
+ (get_single_keymap_event): Fixed problem with 'descrip' lisp
object not being protected properly (GCPRO).
(name_is_separator): New function.
(list_of_panes): If a pane's name is empty ("") items are now
placed in the main popup instead of a blank-named submenu. This
seems to be an undocumented feature of x-popup-menu.
- (list_of_items): New argument HMENU.
- Use 1 and 0 instead of Qt and Qnil for enable in add_menu_item
+ (list_of_items): New argument HMENU.
+ Use 1 and 0 instead of Qt and Qnil for enable in add_menu_item.
1997-09-02 Geoff Voelker <voelker@cs.washington.edu>
override CRT routines.
* w32inevt.c (key_event): New parameter isdead. Set isdead if the
- key press was done using a dead key.
+ key press was done using a dead key.
* w32term.c (w32_read_socket): Pass in new parameter to key_event.
Let key_event determine whether key is dead.
detect it as no-conversion.
(decode_coding): Handle coding_type_raw_text.
(encode_coding): Likewise.
- (Fdetect_coding_region): Ajusted for the above changes.
+ (Fdetect_coding_region): Adjusted for the above changes.
(shrink_conversion_area): Handle coding_type_raw_text.
* coding.h (coding_type): New member coding_type_raw_text.
(Fread_string): New argument INHERIT_INPUT_METHOD.
(Fread_no_blanks_input): Likewise.
(Fread_command): Call Fcompleting_read with INHERIT_INPUT_METHOD nil.
- (Fread_function, Fread_variable, Fread_buffer): Likewise
+ (Fread_function, Fread_variable, Fread_buffer): Likewise.
(Fcompleting_read): New argument INHERIT_INPUT_METHOD.
* lisp.h (DEFUN_ARGS_8): New macro.
- (Fcompleting_read, Fread_from_minibuffer, Fread_string,
- Fread_no_blanks_input): Number of arguments fixed.
+ (Fcompleting_read, Fread_from_minibuffer, Fread_string)
+ (Fread_no_blanks_input): Number of arguments fixed.
* eval.c (Feval): Handle a subr which takes 8 arguments.
(Ffuncall): Likewise.
* emacs.c (main): Fix previous change.
-1997-08-11 +03 Eli Zaretskii <eliz@is.elta.co.il>
+1997-08-11 Eli Zaretskii <eliz@is.elta.co.il>
* dosfns.c (init_dosfns): Avoid calling DOS memory-allocation
service, NT DPMI server will crash Emacs in DOS box, if we do.
* callproc.c (Fcall_process_region): Use cdr part (not car part)
of Vdefault_process_coding_system for writing out text.
- * coding.c (detect_coding_iso2022): Do not exclude posibility of
+ * coding.c (detect_coding_iso2022): Do not exclude possibility of
7-bit encoding when designation to G1 occurs. If CSI, SS2, or SS3
is found, return CODING_CATEGORY_MASK_ISO_8_ELSE.
(Fdetect_coding_region): Doc-string modified.
1997-07-31 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu>
* coding.c (encode_coding_iso2022): When source data ends not at
- character boundardy, set data in coding->carryover correctly, and
+ character boundary, set data in coding->carryover correctly, and
set SRC to SRC_END.
(encode_coding_sjis_big5): Likewise.
(encode_coding): Don't set coding->carryover_size to 0.
1997-07-25 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu>
- * fontset.c (syms_of_fontset): Set Vhighlight_wrong_size_font to
- Qnil.
+ * fontset.c (syms_of_fontset): Set Vhighlight_wrong_size_font to Qnil.
- * coding.h (CODING_REQUIRE_TEXT_CONVERSION,
- CODING_REQUIRE_EOL_CONVERSION, CODING_REQUIRE_CONVERSION): Deleted.
+ * coding.h (CODING_REQUIRE_TEXT_CONVERSION)
+ (CODING_REQUIRE_EOL_CONVERSION, CODING_REQUIRE_CONVERSION): Deleted.
(CODING_REQUIRE_NO_CONVERSION): New macro.
(CODING_MAY_REQUIRE_NO_CONVERSION): New macro.
* fileio.c (Finsert_file_contents): Use new macros
- CODING_MAY_REQUIRE_NO_CONVERSION and
- CODING_MAY_REQUIRE_NO_CONVERSION.
+ CODING_MAY_REQUIRE_NO_CONVERSION and CODING_REQUIRE_NO_CONVERSION.
(Fwrite_region): Correct the logic for deciding coding system.
* process.c (read_process_output): Use new macro
- CODING_REQUIRE_NO_CONVERSION
+ CODING_REQUIRE_NO_CONVERSION.
(send_process): Use new macro CODING_MAY_REQUIRE_NO_CONVERSION.
* xterm.c (dumpglyphs): Check the member `encoding' of *FONTP while
1997-07-15 Kenichi HANDA <handa@etl.go.jp>
- * coding.h (CODING_CATEGORY_IDX_ISO_7_ELSE): This macro is deleted
+ * coding.h (CODING_CATEGORY_IDX_ISO_7_ELSE): This macro is deleted.
(CODING_CATEGORY_IDX_ISO_7_ELSE): New macro.
- (CODING_CATEGORY_IDX_ISO_8_ELSE): New macro
+ (CODING_CATEGORY_IDX_ISO_8_ELSE): New macro.
(CODING_CATEGORY_MASK_ISO_ELSE): This macro is deleted.
(CODING_CATEGORY_MASK_ISO_7_ELSE): New macro.
(CODING_CATEGORY_MASK_ISO_8_ELSE): New macro.
* syntax.h (struct gl_state_s): New field `offset'.
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Set offset field.
(SETUP_SYNTAX_TABLE): Clear offset field.
- (UPDATE_SYNTAX_TABLE, UPDATE_SYNTAX_TABLE_FORWARD):
+ (UPDATE_SYNTAX_TABLE, UPDATE_SYNTAX_TABLE_FORWARD)
(UPDATE_SYNTAX_TABLE_BACKWARD): Use the offset field.
* s/sol2.h (LIBS_SYSTEM): Add -lkvm and -lelf.
* window.c: Include blockinput.h.
(Fset_window_configuration): Block input around frobbing the frame.
- Preseve point in the current buffer if we do not switch
+ Preserve point in the current buffer if we do not switch
to a different one.
1997-07-06 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
* editfns.c (Fformat): Add second argument in call to Ftruncate.
* alloc.c, buffer.c, casefiddle.c, casetab.c, category.c,
- category.h, ccl.c, coding.c, editfns.c, fileio.c, fns.c, indent.c,
- intervals.c, intervals.h, keymap.c, lisp.h, minibuf.c, print.c,
- syntax.c, syntax.h, sysdep.c, textprop.c, xfns.c: Fix numerous
+ * category.h, ccl.c, coding.c, editfns.c, fileio.c, fns.c, indent.c,
+ * intervals.c, intervals.h, keymap.c, lisp.h, minibuf.c, print.c,
+ * syntax.c, syntax.h, sysdep.c, textprop.c, xfns.c: Fix numerous
bugs with inappropriate mixing of Lisp_Object with int.
* config.in (RE_TRANSLATE): Define to extract integers from
array of Lisp_Objects.
1997-07-02 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
- * process.c (send_process): Make buf and temp_buf `unsigned char *'.
+ * process.c (send_process): Make buf and temp_buf `unsigned char *'.
* buffer.c (overlay_strings): Use unsigned char for things
that relate to overlay_str_buf.
* fileio.c (Finsert_file_contents): Doc-string fixed. Call
Ffind_operation_coding_system.
- (Fwrite_region): Call Ffind_operation_coding_system.
+ (Fwrite_region): Call Ffind_operation_coding_system.
* callproc.c: Call Ffind_operation_coding_system.
* s/ms-w32.h: Duplicate undefs from config.in to check completeness.
(STDC_HEADERS, HAVE_TZNAME, HAVE_MKTIME): Define to have a value.
- (HAVE_GETPAGESIZE, HAVE_SETLOCALE, HAVE_SHUTDOWN, HAVE_TZSET,
- HAVE_LIMITS_H, HAVE_STRERROR): Define.
+ (HAVE_GETPAGESIZE, HAVE_SETLOCALE, HAVE_SHUTDOWN, HAVE_TZSET)
+ (HAVE_LIMITS_H, HAVE_STRERROR): Define.
[HAVE_NTGUI] (HAVE_MENUS): Define.
(SYSTEM_PURESIZE_EXTRA): Increase value.
* fontset.h (font_idx_temp): Extern it.
(FS_LOAD_FONT): New macro.
- * fontset.c (font_idx_temp): New temprary variable used in
+ * fontset.c (font_idx_temp): New temporary variable used in
FS_LOAD_FONT.
* xfaces.c (Fset_face_attribute_internal): Use FS_LOAD_FONT
(x_new_fontset): If frame F has already using FONTSET, avoid the
duplicated work. Use FS_LOAD_FONT.
(x_list_fonts): Call Fassoc to search Valternate_charset_table.
- (x_load_font): Get around a buf of XListFonts
+ (x_load_font): Get around a buf of XListFonts.
1997-06-20 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
* coding.c (Vcoding_system_alist): Deleted.
(Qcoding_system_spec): Renamed from Qcoding_system_vector.
- (Vdefault_process_coding_system, Vfile_coding_system_alist,
- Vprocess_coding_system_alist, Vnetwork_coding_system_alist): New
- variables.
+ (Vdefault_process_coding_system, Vfile_coding_system_alist)
+ (Vprocess_coding_system_alist, Vnetwork_coding_system_alist):
+ New variables.
(Ffind_coding_system): Adjusted for the above change.
(syms_of_coding): Declare them as lisp variables.
(Fcheck_coding_system): Pass list as DATA argument to Fsignal.
name to iso-latin-1.
(lisp_data_to_selection_data): Likewise.
- * xterm.c (dumpglyph): Shift baseline for such a font that is
+ * xterm.c (dumpglyphs): Shift baseline for such a font that is
shorter but ascent or descent exceed the line height.
For a larger font, draw a small hook at right-bottom edge instead
of a rectangle.
* Makefile.in (XOBJ, MSDOS_OBJ, SOME_MACHINE_OBJECTS): Delete xfaces.o.
(obj): Add xfaces.o.
(FACE_SUPPORT, SOME_MACHINE_LISP): Delete faces.elc.
- (shortlisp, lisp): Add faces.elc
+ (shortlisp, lisp): Add faces.elc.
* emacs.c (main): Call syms_of_xfaces whenever ! HAVE_NTGUI.
* xterm.c (process_expose_from_menu, XTread_socket):
Set has_been_visible field.
- (x_make_frame_visible): Don't do XMoveWindow unles has_been_visible.
+ (x_make_frame_visible): Don't do XMoveWindow unless has_been_visible.
* xterm.h (struct x_output): New field has_been_visible.
1997-05-18 Erik Naggum <erik@naggum.no>
* lisp.h (Vtty_erase_char): Declared.
- * keyboard.c (Vtty_erase_char): Variable defined
+ * keyboard.c (Vtty_erase_char): Variable defined.
(syms_of_keyboard): Set up Lisp variable.
Also set up `num-nonmacro-input-chars' to report actual keystrokes.
* sysdep.c (init_sys_modes): Initialize Vtty_erase_char if
(r_alloc_init) [DOUG_LEA_MALLOC]: Call mallopt,
instead of setting __malloc_extra_blocks.
-Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu>
+1997-05-15 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu>
* Makefile.in (charset.o): Add disptab.h in dependency list.
* fontset.c (fontset_pattern_regexp): Cast to (char *) before
assigning to P0.
- * ccl.c (struct ccl_prog_stack): Declear the member ccl_prog as
+ * ccl.c (struct ccl_prog_stack): Declare the member ccl_prog as
Lisp_Object *.
* editfns.c: Declare Fuser_full_name as Lisp_Object in advance to
argument C is an invalid character code.
(Fconcat_chars): Use alloca instead of malloc.
- * charset.h (CHAR_STRING): Comment reflect the above change.
+ * charset.h (CHAR_STRING): Comment reflect the above change.
* coding.h: Name change through the code:
coding-category-internal => coding-category-emacs-mule,
Pass index character as a Lisp_Object.
* keymap.c (Fmake_keymap): Make a char-table.
- (access_keymap, store_in_keymap): Likewise,
+ (access_keymap, store_in_keymap): Likewise.
(describe_map, Fset_keymap_parent, Faccessible_keymaps): Likewise.
(Fwhere_is_internal, Fcopy_keymap): Handle a char-table.
(copy_keymap_1, accessible_keymaps_char_table): New subroutines.
* charset.h (unify_char): Extern it.
* coding.c (Valternate_charset_table): The variable deleted.
- (Venable_character_unification,
- Vstandard_character_unification_table_for_read,
- Vstandard_character_unification_table_for_write,
- Qcharacter_unification_table): New variables.
+ (Venable_character_unification)
+ (Vstandard_character_unification_table_for_read)
+ (Vstandard_character_unification_table_for_write)
+ (Qcharacter_unification_table): New variables.
(syms_of_coding): Initialize and declare them.
(DECODE_ISO_CHARACTER): Modified to handle a character unification
table instead of Valternate_charset_table.
* fontset.c (Vfontset_alias_alist): New variable.
(fontset_pattern_regexp): Delete code for handling nickname of a
- fonset. It is now handled in Fquery_fontset by consulting
+ fontset. It is now handled in Fquery_fontset by consulting
Vfontset_alias_alist.
(Fquery_fontset): Handle Vfontset_alias_alist.
(syms_of_fontset): Terminate each line by `\n\' in doc-string of
and clip-large-size-font modified.
* xfns.c (Fx_create_frame): Delete code for handling the X
- resouce "Fontset".
+ resource "Fontset".
* xselect.c (selection_data_to_lisp_data): If TYPE is `STRING'
and DATA contains 8-bit codes, decode them as Latin-1 characters.
(char_quoted): Move earlier, update gl_state when needed.
(find_defun_start): Update gl_state when needed.
(back_comment): New function.
- (Scomment_fence, Sstring_fence): New delimeter char classes
+ (Scomment_fence, Sstring_fence): New delimiter char classes
denoted by `!' and `|'.
(Fchar_syntax, Fmatching_paren): Update gl_state to whole-buffer state.
(scan_words): Update gl_state when needed.
New members Scomment_fence, Sstring_fence.
(SYNTAX_ENTRY): Depending on the value of SYNTAX_ENTRY_VIA_PROPERTY
may do a lookup for syntax table in gl_state.
- (UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD,
- UPDATE_SYNTAX_TABLE, SETUP_SYNTAX_TABLE,
- SETUP_SYNTAX_TABLE_FOR_OBJECT): New macros.
+ (UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD)
+ (UPDATE_SYNTAX_TABLE, SETUP_SYNTAX_TABLE)
+ (SETUP_SYNTAX_TABLE_FOR_OBJECT): New macros.
(struct gl_state_s): New struct.
* textprop.c: Style of comments corrected.
(copy_category_table, Fmodify_category_entry): Adjusted for the
new structure of Lisp_Char_Table.
- * ccl.c: (ccl_driver): Fix bug of the case CCL_WriteArrayReadJump.
+ * ccl.c (ccl_driver): Fix bug of the case CCL_WriteArrayReadJump.
* charset.h (CHARSET_TABLE_ENTRY): Handle ASCII charset correctly.
(SPLIT_NON_ASCII_CHAR, SPLIT_CHAR): Return -1 in C2 for DIMENSION1
characters.
- * charset.c (non_ascii_char_to_string, update_charset_table,
- Fsplit_char): Adjusted for the above change.
+ * charset.c (non_ascii_char_to_string, update_charset_table)
+ (Fsplit_char): Adjusted for the above change.
* coding.c (detect_coding_iso2022, detect_coding_mask): Ignore
invalid ESC sequence for ISO 2022.
* fns.c (copy_sub_char_table): New function.
(Fcopy_sequence): Call copy_sub_char_table for copying a sub char
table.
- (Fchar_table_range, Fset_char_table_range, map_char_table,
- Fmap_char_table): Handle multibyte characters correctly.
+ (Fchar_table_range, Fset_char_table_range, map_char_table)
+ (Fmap_char_table): Handle multibyte characters correctly.
* fontset.c (Vhighlight_wrong_size_font, Vclip_large_size_font):
New variables.
* xterm.c (dumpglyphs): Clip and highlight glyphs displayed with
fonts of wrong size.
-Sun Apr 6 10:26:53 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu>
+1997-04-06 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu>
* emacs.c (init_cmdargs) [MSDOS]: Make the change that sets
`installation-directory' if `info' is found as its subdirectory or
sibling, be conditioned on MSDOS (it makes trouble on Unix).
-
1997-04-05 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
* coding.c (Ffind_coding_system): Doc fix.
1997-03-05 NIIBE Yutaka <gniibe@mri.co.jp>
- * indent.c: (compute_motion): When POS >= TO, don't call
+ * indent.c (compute_motion): When POS >= TO, don't call
find_before_next_newline as it assumes POS < TO.
1997-03-02 Ken'ichi Handa <handa@etl.go.jp>
* coding.c (setup_coding_system): Now, flags of ISO2022 coding
systems contains charsets instead of charset IDs. Correct setting
coding->symbol and coding->eol_type. The performance improved.
- (encode_coding) : Fix typo ("=" -> "==").
+ (encode_coding): Fix typo ("=" -> "==").
(detect_coding_iso2022, decode_coding_iso2022): Make the code
robust against invalid SI and SO.
(ENCODE_RESET_PLANE_AND_REGISTER): Argument `eol' is deleted.
* keymap.c (describe_vector): Do not describe deeper char-table if
enable-multibyte-characters is nil.
- * process.c (proc_decode_coding_system,
- proc_encode_coding_system): Changed to array of pointers to struct
- coding_system to reduce the size of dumped Emacs.
+ * process.c (proc_decode_coding_system, proc_encode_coding_system):
+ Changed to array of pointers to struct coding_system to reduce the
+ size of dumped Emacs.
(create_process, Fopen_network_stream): Allocate them dynamically.
(init_process): Initialize these pointers to NULL.
(Fstart_process, Fopen_network_stream): Do not perform character
* lread.c (Fload): Call Vload_source_file_function with 4 args.
-1997-02-22 Tsugutomo ENAMI <enami@ba2.so-net.or.jp>
+1997-02-22 Tsugutomo ENAMI <enami@ba2.so-net.or.jp>
- * regex.c: Include charset.h and category.h
+ * regex.c: Include charset.h and category.h.
- [!emacs] (BASE_LEADING_CODE_P, WORD_BOUNDARY_P, CHAR_HEAD_P,
- SINGLE_BYTE_CHAR_P, SAME_CHARSET_P, MULTIBYTE_FORM_LENGTH,
- STRING_CHAR_AND_LENGTH, GET_CHAR_AFTER_2, GET_CHAR_BEFORE_2):
+ [!emacs] (BASE_LEADING_CODE_P, WORD_BOUNDARY_P, CHAR_HEAD_P)
+ (SINGLE_BYTE_CHAR_P, SAME_CHARSET_P, MULTIBYTE_FORM_LENGTH)
+ (STRING_CHAR_AND_LENGTH, GET_CHAR_AFTER_2, GET_CHAR_BEFORE_2):
New dummy macros.
(enum re_opcode_t): New member categoryspec and
notcategoryspec.
- (STORE_CHARACTER_AND_INCR, EXTRACT_CHARACTER,
- CHARSET_LOOKUP_RANGE_TABLE_WITH_COUNT,
- CHARSET_LOOKUP_RANGE_TABLE, CHARSET_BITMAP_SIZE,
- CHARSET_RANGE_TABLE_EXISTS_P, CHARSET_RANGE_TABLE
- CHARSET_PAST_RANGE_TABLE): New macros.
+ (STORE_CHARACTER_AND_INCR, EXTRACT_CHARACTER)
+ (CHARSET_LOOKUP_RANGE_TABLE_WITH_COUNT)
+ (CHARSET_LOOKUP_RANGE_TABLE, CHARSET_BITMAP_SIZE)
+ (CHARSET_RANGE_TABLE_EXISTS_P, CHARSET_RANGE_TABL)
+ (CHARSET_PAST_RANGE_TABLE): New macros.
(TRANSLATE): Cast return value to unsigned char, not char.
(struct range_table_work_area): New structure.
- (EXTEND_RANGE_TABLE_WORK_AREA, SET_RANGE_TABLE_WORK_AREA,
- FREE_RANGE_TABLE_WORK_AREA, CLEAR_RANGE_TABLE_WORK_USED,
- RANGE_TABLE_WORK_USED, RANGE_TABLE_WORK_ELT): New macros.
+ (EXTEND_RANGE_TABLE_WORK_AREA, SET_RANGE_TABLE_WORK_AREA)
+ (FREE_RANGE_TABLE_WORK_AREA, CLEAR_RANGE_TABLE_WORK_USED)
+ (RANGE_TABLE_WORK_USED, RANGE_TABLE_WORK_ELT): New macros.
(FREE_STACK_RETURN): Call FREE_RANGE_TABLE_WORK_AREA.
(regex_compile): Declare `c' and `c1' as int to store
multibyte characters.
- Declare range_table_work and initialize it.
+ Declare range_table_work and initialize it.
Initialize bufp->multibyte to 0 if not emacs.
For case '[' and `default', code re-written to handle
multibyte characters.
* xdisp.c (try_window): Change the way of calculation of tab
offset. We now use val.tab_offset to maintain tab offset.
- Removed local variable tab_offset.
+ Removed local variable tab_offset.
(try_window_id): Likewise.
* indent.c: Include "charset.h".
(xterm.o): Depend on charset.h, ccl.h, and fontset.h.
(category.o, ccl.o, charset.o, coding.o, fontset.o): New targets.
- * alloc.c (Fmake_char_table): Typo in doc-string fixed. Handle
- the case that PURPOSE is nil (in a deeper char-table).
+ * alloc.c (Fmake_char_table): Typo in doc-string fixed.
+ Handle the case that PURPOSE is nil (in a deeper char-table).
(Fmake_bool_vector): Make correct size of Lisp_Object for
bool-vector.
* lread.c: Include charset.h.
(Vload_source_file_function): New variable.
(Fload): Call Vload_source_file_function if defined while loading
- an Emacs Lisp source file. */
+ an Emacs Lisp source file.
(read_multibyte): New function.
(read_escape): Handle multibyte characters.
(read1): Correct the value of size_in_chars of a bool vector.
* emacs.c (main): Don't extend stack limit too far.
-Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu>
+1997-02-02 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu>
* msdos.c (dos_rawgetc): When international keyboard doesn't have
to be supported, recognize Alt-key combinations even if the Alt
* term.c (term_init): Use new name initialize_w32_display.
* w32.c, w32console.c, w32faces.c, w32fns.c, w32heap.c,
- w32inevt.c, w32menu.c, w32proc.c, w32select.c, w32term.c,
- w32xfns.c, win32.h, w32inevt.h, w32term.h: Change all uses of win95,
+ * w32inevt.c, w32menu.c, w32proc.c, w32select.c, w32term.c,
+ * w32xfns.c, win32.h, w32inevt.h, w32term.h: Change all uses of win95,
winnt, and win32 into Windows 95, Windows NT, and W32, respectively.
Expand "win" substring in variables referring to Microsoft Windows
constructs into "windows".
1997-01-15 Eli Zaretskii <eliz@is.elta.co.il>
* keyboard.c (interrupt_signal): Make emergency exit work on MSDOS
- frames. Block further SIGINTs while `interrupt_signal' runs.
+ frames. Block further SIGINTs while `interrupt_signal' runs.
* msdos.c (sigprocmask, sig_suspender): New functions, implement
signal blocking on MSDOS.
* xmenu.c (single_keymap_panes): New arg DEPTH.
Cut off recursion at that depth. Callers changed.
-1996-12-23 +02 Eli Zaretskii <eliz@is.elta.co.il>
+1996-12-23 Eli Zaretskii <eliz@is.elta.co.il>
* msdos.c (dos_set_keyboard): Test whether KEYB.COM is installed
for international keyboard support.
* xfns.c (x_set_scroll_bar_width): Reject a width that's too small.
-1006-12-10 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
+1996-12-10 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
* buffer.c (syms_of_buffer): Doc fix (transient-mark-mode).
* editfns.c (Fline_beginning_position, Fline_end_position): New fns.
* cmds.c (Fend_of_line, Fbeginning_of_line):
Use Fline_beginning_position, Fline_end_position.
- * lisp.h (Fend_of_line, Fbeginning_of_line): Declared.
+ * lisp.h (Fend_of_line, Fbeginning_of_line): Declared.
1996-11-23 Richard Stallman <rms@whiz-bang.gnu.ai.mit.edu>
1996-11-18 Geoff Voelker <voelker@cs.washington.edu>
* emacs.c, frame.c, frame.h, keyboard.c, nt.c, nt.h,
- ntheap.c, ntheap.h, ntinevt.c, ntinevt.h, ntproc.c, ntterm.c,
- termhooks.h, unexnt.c, w32faces.c, w32fns.c, w32menu.c, w32reg.c,
- w32select.c, w32term.c, w32term.h, w32xfns.c, s/windowsnt.h:
+ * ntheap.c, ntheap.h, ntinevt.c, ntinevt.h, ntproc.c, ntterm.c,
+ * termhooks.h, unexnt.c, w32faces.c, w32fns.c, w32menu.c, w32reg.c,
+ * w32select.c, w32term.c, w32term.h, w32xfns.c, s/windowsnt.h:
Change identifiers of the form win32* to w32*.
* window.c (special-display-p, same-window-p): Add missing
Reorganize function definitions so etags finds them.
* abbrev.c (Finsert_abbrev_table_description).
* editfns.c (Finsert_and_inherit_before_markers).
- * eval.c (Frun_hook_with_args, Frun_hook_with_args_until_success,
- Frun_hook_with_args_until_failure).
+ * eval.c (Frun_hook_with_args, Frun_hook_with_args_until_success)
+ (Frun_hook_with_args_until_failure).
* window.c (Fcurrent_window_configuration).
- * xselect.c (Fx_own_selection_internal, Fx_get_selection_internal,
- Fx_disown_selection_internal).
+ * xselect.c (Fx_own_selection_internal, Fx_get_selection_internal)
+ (Fx_disown_selection_internal).
1996-10-30 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
* frame.h (struct frame): New field phys_cursor_on.
-1996-10-08 David Kågedal <davidk@lysator.liu.se>
+1996-10-08 David Kågedal <davidk@lysator.liu.se>
* xmenu.c (Fx_popup_menu): Give the menu a title when the menu is
a single keymap.
1996-10-05 Marcus G. Daniels <marcus@coulee.tdb.com>
- * xfns.c (x_set_internal_border_width): Only change
+ * xfns.c (x_set_internal_border_width): Only change
an edit_widget's internal_border_width for the toolkit case.
1996-10-04 Richard Stallman <rms@ethanol.gnu.ai.mit.edu>
(find_handler_clause): If Vdebug_force, call debugger
even if there are handlers.
-1996-09-26 Marcus Daniels <marcus@sayre.sysc.pdx.edu>
+1996-09-26 Marcus G. Daniels <marcus@sayre.sysc.pdx.edu>
* xfns.c (x_set_scroll_bar_width): Move cursor to the
left margin, past a scroll bar, if any.
* window.c (syms_of_window): Doc fixes.
-1996-09-25 Marcus Daniels <marcus@sysc.pdx.edu>
+1996-09-25 Marcus G. Daniels <marcus@sysc.pdx.edu>
* s/irix5-0.h (sigsetmask, _longjmp, _setjmp): #undef them.
(_BSD_SIGNALS): Definition deleted.
1996-09-20 Richard Stallman <rms@ethanol.gnu.ai.mit.edu>
- * xterm.c (x_scroll_bar_create, x_scroll_bar_move):
+ * xterm.c (x_scroll_bar_create, x_scroll_bar_move)
(x_scroll_bar_expose): Use VERTICAL_SCROLL_BAR_WIDTH_TRIM.
* xterm.h (VERTICAL_SCROLL_BAR_WIDTH_TRIM): Renamed from
* xfns.c (Fx_create_frame): Default Qvertical_scroll_bars to `left'.
-Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu>
+1996-09-20 Marcus G. Daniels <marcus@sayre.sysc.pdx.edu>
* xterm.c (XTclear_end_of_line): Shift end-of-line when there is a
left-side scroll bar by FRAME_LEFT_SCROLL_BAR_WIDTH.
(x_scroll_bar_expose): Narrow the box slightly for a left-side
scroll bar.
- * xfns.c: Add the symbol `right'; this symbol is used to indicate
+ * xfns.c: Add the symbol `right'; this symbol is used to indicate
that a right-side scroll bar is wanted.
(x_set_vertical_scroll_bars): Check for left<->right<->none
scroll bar changes, and modify the vertical scroll bar type
* keyboard.c (make_lispy_event): When converting from pixel to
glyph coordinates, offset by WINDOW_LEFT_MARGIN instead of XINT
- (XWINDOW (window)->left; this is necessary when there are
+ (XWINDOW (window)->left); this is necessary when there are
left-side scrollbars.
* frame.c (make_frame): Switch from boolean
necessarily the same any more.
(change_frame_size_1): Use FRAME_WINDOW_WIDTH to check for changes.
Give `set_window_width' the window width value.
- Use new macro SET_FRAME_WIDTH.
+ Use new macro SET_FRAME_WIDTH.
* xterm.h (VERTICAL_SCROLL_BAR_INSIDE_WIDTH): Add frame as an
argument, and use it to decrease the width in the case of a
before read0 call.
(read1): New variable `uninterned_symbol', which controls how to
make symbols. Support #:, #n=object and #n#.
- (make_symbol): New function, used in read1 to make uninterned symbols
+ (make_symbol): New function, used in read1 to make uninterned symbols.
(Fintern): Set `obarray' field of interned symbols.
(init_obarray): Explicit set `obarray' field of symbol `nil'.
(syms_of_lread): staticpro read_objects, the list of read objects.
* print.c: Add #n=object, #n#, and #:symbol constructs to printer.
(PRINTDECLARE): New macro to declare required variables.
(PRINTPREPARE, PRINTFINISH): Set printed_genyms to nil.
- (Fwrite_char, write_string, write_string_1, Fterpri, Fprin1,
- Fprin1_to_string, Fprinc, Fprint): Use new macro PRINTDECLARE.
+ (Fwrite_char, write_string, write_string_1, Fterpri, Fprin1)
+ (Fprin1_to_string, Fprinc, Fprint): Use new macro PRINTDECLARE.
(print): Print uninterned symbols readable.
(syms_of_print): Defvar `print-gensym', staticpro printed_gensyms.
(XMARKBIT): Test BITS_PER_EMACS_INT to conditionalize fast definition.
* m/alpha.h (BITS_PER_EMACS_INT): New definition.
- * s/sol2.h (LIBS_SYSTEM): Use -lkstat instead of -lelf -lkvm
+ * s/sol2.h (LIBS_SYSTEM): Use -lkstat instead of -lelf -lkvm.
* process.c (create_process): Test HAVE_SETPGID for using setpgid.
* config.in (HAVE_SETPGID): Add #undef.
- * keymap.c (syms_of_keymap): staticpro current_global_map;
+ * keymap.c (syms_of_keymap): staticpro current_global_map.
* intervals.c (get_local_map): Call indirect-function.
* config.in (mktime): Define to emacs_mktime if we are using our own
mktime, since Nextstep doesn't let Emacs redefine the builtin mktime.
- * Makefile.in (MKTIME_OBJ): Use our mktime instead of NEXTSTEP's,
+ * Makefile.in (MKTIME_OBJ): Use our mktime instead of NEXTSTEP's,
since NEXTSTEP's wrongly ignores TZ.
(mktime): #undef, to avoid messing up the file name mktime.c.
- * editfns.c (Fencode_time): Remove NEXTSTEP workaround;
+ * editfns.c (Fencode_time): Remove NEXTSTEP workaround;
we now use our mktime instead.
1996-09-03 Richard Stallman <rms@ethanol.gnu.ai.mit.edu>
(print): Print certain expressions more compactly when set.
Also use XCAR and XCDR directly -- we know we have conses.
-1996-08-23 Marcus Daniels <marcus@sayre.sysc.pdx.edu>
+1996-08-23 Marcus G. Daniels <marcus@sayre.sysc.pdx.edu>
* xterm.c (x_term_init): If the default Xt font does not exist on
the X server, add a resource so that dialog boxes use a common font.
See ChangeLog.6 for earlier changes.
- Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+ Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
- Copying and distribution of this file, with or without modification,
- are permitted provided the copyright notice and this notice are preserved.
+
+ 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>.
;;; arch-tag: 3b03e091-1123-4031-b67d-41683932cc48