diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 14:56:31 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 14:56:31 +0000 |
| commit | ef393e7645961c61ff1e776d67d3c3b9f494bc49 (patch) | |
| tree | 1471dfc50643fdc560d1c94fff6318482fa8876b /src | |
| parent | 270af5640a046aab319b9988fc29f41a47681f92 (diff) | |
| download | emacs-ef393e7645961c61ff1e776d67d3c3b9f494bc49.tar.gz | |
Trailing whitespace deleted.
Diffstat (limited to 'src')
213 files changed, 3252 insertions, 3252 deletions
diff --git a/src/.gdbinit b/src/.gdbinit index 705a6e836a7..ca6f5f255a2 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -334,7 +334,7 @@ end define xbacktrace set $bt = backtrace_list - while $bt + while $bt set $type = (enum Lisp_Type) ((*$bt->function >> gdb_valbits) & 0x7) if $type == Lisp_Symbol xprintsym *$bt->function @@ -353,7 +353,7 @@ define xbacktrace end document xbacktrace Print a backtrace of Lisp function calls from backtrace_list. - Set a breakpoint at Fsignal and call this to see from where + Set a breakpoint at Fsignal and call this to see from where an error was signaled. end diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 890ea110a3e..a93f4ab9825 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -6625,7 +6625,7 @@ * editfns.c (Fcurrent_time_zone): Don't forget to include code to signal an error when EMACS_CURRENT_TIME_ZONE is not defined. -1992-08-06 Joseph Arceneaux (jla@gnu.ai.mit.edu) +1992-08-06 Joseph Arceneaux (jla@gnu.ai.mit.edu) * doc.c (Vdata_directory): Declared. (syms_of_doc): Initialized. @@ -6643,7 +6643,7 @@ character from the key sequence, NOT the index of the character IN the key sequence. How many tries will it take to get it right? -1992-08-04 Roland McGrath (roland@churchy.gnu.ai.mit.edu) +1992-08-04 Roland McGrath (roland@churchy.gnu.ai.mit.edu) * eval.c (syms_of_eval): Doc fix for debug-on-quit. diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 13c49fa72db..36ec0081a62 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 @@ -20,7 +20,7 @@ * xdisp.c (redisplay): If have window change at end, redisplay again. - * lread.c (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro): + * lread.c (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro): Delete third arg DOC. * s/hpux8.h (LD_SWITCH_SYSTEM): Delete the -L options. @@ -522,7 +522,7 @@ * floatfns.c: Don't guard DOMAIN && SING && OVERFLOW check by an #ifndef MSDOS. -1994-05-06 Francesco Potorti` (pot@cnuce.cnr.it) +1994-05-06 Francesco Potorti` (pot@cnuce.cnr.it) * m/delta.h: (SYSTEM_MALLOC): deleted. The problem isn't there. @@ -626,7 +626,7 @@ x_destroy_window): Use row/col instead of buffer position to keep track of highlighted area. -1994-05-02 Francesco Potorti` (pot@cnuce.cnr.it) +1994-05-02 Francesco Potorti` (pot@cnuce.cnr.it) * m/delta.h: (SYSTEM_MALLOC): Defined, since GNU malloc does not work. (BCOPY_UPWARD_SAFE): Defined to 0 for the Green Hills compiler. @@ -641,7 +641,7 @@ * xfns.c (Fx_create_frame): Set the size_hint_flags field. Don't call x_calc_absolute_position. * xterm.c (x_calc_absolute_position): Use size_hint_flags. - New FLAGS arg deleted. Callers changed. + New FLAGS arg deleted. Callers changed. * xfns.c (x_figure_window_size): Handle `-' for top or left. (Fx_parse_geometry): Handle one element at a time. @@ -892,7 +892,7 @@ * keyboard.c (read_char): Don't use menus if we have events waiting. * xterm.c (XTread_socket) [USE_X_TOOLKIT]: Let toolkit handle - menu bar click. + menu bar click. 1994-04-25 Karl Heuer (kwzh@hal.gnu.ai.mit.edu) @@ -1025,7 +1025,7 @@ 1994-04-20 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * frame.c (Fmodify_frame_parameters, Fframe_parameters): + * frame.c (Fmodify_frame_parameters, Fframe_parameters): Define even if not MULTI_FRAME. * config.h.in (HAVE_INET_SOCKETS): Add #undef. @@ -1359,7 +1359,7 @@ * buffer.h (Vafter_change_functions, Vbefore_change_functions): Declared. - * insdel.c (before_change_functions_restore): + * insdel.c (before_change_functions_restore): (after_change_functions_restore): New functions. (signal_before_change): Handle Vbefore_change_functions. (signal_after_change): Handle Vafter_change_functions. @@ -1605,7 +1605,7 @@ 1994-04-01 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * xterm.c (construct_menu_click, construct_mouse_click): + * xterm.c (construct_menu_click, construct_mouse_click): Use XSET when setting result->x and result->y. * xmenu.c (xmenu_show): Undo part of March 11 change: @@ -1649,13 +1649,13 @@ * xterm.h: Define HAVE_X11R4 if AIX3_2 is defined. - * xfns.c (x_window) [USE_X_TOOLKIT]: New args window_prompting and + * xfns.c (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only. Don't pass top_pos and left_pos to XtCreatePopupShell. Call initialize_frame_menubar before creating the Emacs frame if it is not the minibuffer. Call XtManageChild for the menubar widget if any. Compute some geometry management. - (Fx_create_frame): Pass window_prompting and minibuffer_only to + (Fx_create_frame): Pass window_prompting and minibuffer_only to x_window. Don't call x_wm_set_size_hint. Don't call initialize_frame_menubar. @@ -1811,7 +1811,7 @@ 1994-03-24 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) - * xfns.c (Fx_create_frame): Add USE_X_TOOLKIT conditional around the + * xfns.c (Fx_create_frame): Add USE_X_TOOLKIT conditional around the call to initialize_frame_menubar. 1994-03-23 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -1851,7 +1851,7 @@ 1994-03-23 Frederic Pierresteguy (fp@geech.gnu.ai.mit.edu) - * xmenu.c (update_frame_menubar): Function renamed from + * xmenu.c (update_frame_menubar): Function renamed from update_one_frame_psheets. (initialize_frame_menubar): New function. (set_frame_menubar): Call menu_bar_items when items is NIL. @@ -2009,7 +2009,7 @@ * minibuf.c (read_minibuf): Disallow trailing junk. -1994-03-16 Morten Welinder (terra@diku.dk) +1994-03-16 Morten Welinder (terra@diku.dk) * fileio.c (Ffile_modes) [MSDOS]: set exec-bit based on file suffix. * s/msdos.h: use bcopy when moving gap. @@ -2285,7 +2285,7 @@ 1994-03-04 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) - * xmenu.c (update_one_frame_psheets): Call EmacsFrameSetCharSize to + * xmenu.c (update_one_frame_psheets): Call EmacsFrameSetCharSize to force the paned widget to resize to the right value. (xmenu_show): No need to check a second time whether the mouse has moved to another menu bar item. This slows down execution. @@ -2295,7 +2295,7 @@ 1994-03-04 Roland McGrath (roland@churchy.gnu.ai.mit.edu) - * xmenu.c [USE_X_TOOLKIT] (xmenu_show): Pass display to + * xmenu.c [USE_X_TOOLKIT] (xmenu_show): Pass display to XtWindowToWidget. 1994-03-03 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -2360,7 +2360,7 @@ * frame.c (make_frame): Init menu_bar_items field to 0. * xdisp.c (update_menu_bar): Change call to menu_bar_items. (display_menu_bar): Use FRAME_MENU_BAR_LINES as vector. - * xmenu.c (map_event_to_object, set_frame_menubar): + * xmenu.c (map_event_to_object, set_frame_menubar): Use FRAME_MENU_BAR_LINES as vector. 1994-03-01 Karl Heuer (kwzh@hal.gnu.ai.mit.edu) @@ -2377,7 +2377,7 @@ * fileio.c (Finsert_file_contents): If undo_list was t, leave it t. - * alloc.c (memory_signal_data): No longer static. + * alloc.c (memory_signal_data): No longer static. (syms_of_alloc): Stick Qerror onto memory_signal_data. * lisp.h (memory_signal_data): Declare it. * eval.c (Fsignal): If DATA is memory_signal_data, don't add to it. @@ -2729,7 +2729,7 @@ * xmenu.c (free_frame_menubar) [USE_X_TOOLKIT]: New function to destroy the X Widget instance of the menubar. - * widget.c (EmacsFrameResize): Don't call XTranslateCoordinates. Code + * widget.c (EmacsFrameResize): Don't call XTranslateCoordinates. Code removed. * xmenu.c (xmenu_show) [USE_X_TOOLKIT]: Return Qnil when val is null. @@ -2764,7 +2764,7 @@ 1994-02-10 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) - * xmenu.c (xmenu_show): Test again event.xmotion.x_root in the + * xmenu.c (xmenu_show): Test again event.xmotion.x_root in the MotionNotify case. 1994-02-09 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -2822,12 +2822,12 @@ * xterm.c (x_set_window_size): New arg CHANGE_GRAVITY. (x_new_font): Pass CHANGE_GRAVITY arg to x_set_window_size. (x_wm_set_size_hint): New arg CHANGE_GRAVITY. - (x_set_offset, x_set_window_size): + (x_set_offset, x_set_window_size): Pass CHANGE_GRAVITY arg to x_set_window_size. - * xfns.c (x_set_internal_border_width, x_set_vertical_scroll_bars): + * xfns.c (x_set_internal_border_width, x_set_vertical_scroll_bars): Pass CHANGE_GRAVITY arg to x_set_window_size. (Fx_create_frame): Pass CHANGE_GRAVITY arg to x_wm_set_size_hint. - * frame.c (Fset_frame_height, Fset_frame_width, Fset_frame_size): + * frame.c (Fset_frame_height, Fset_frame_width, Fset_frame_size): Pass CHANGE_GRAVITY arg to x_set_window_size. * frame.c (other_visible_frames): @@ -2875,7 +2875,7 @@ 1994-02-04 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) - * xmenu.c (xmenu_show) [USE_X_TOOLKIT]: Remove the #if 0 directives + * xmenu.c (xmenu_show) [USE_X_TOOLKIT]: Remove the #if 0 directives and reverse one to avoid the flickering of the menubar. 1994-02-04 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -2982,7 +2982,7 @@ 1994-01-28 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) - * xterm.c (x_set_window_size): Add USE_X_TOOLKIT conditional. Call + * xterm.c (x_set_window_size): Add USE_X_TOOLKIT conditional. Call EmacsFrameSetCharSize and return. * xterm.c (x_term_init): Cast to (char **) before assignment to argv. @@ -3357,7 +3357,7 @@ * buffer.c, buffer.h [MSDOS]: New buffer-local variable: buffer-file-type to handle DOS newlines. - * callproc.c (syms_of_callproc) [MSDOS]: New lisp variable: + * callproc.c (syms_of_callproc) [MSDOS]: New lisp variable: binary-process. (init_callproc) [MSDOS]: Initialize binary-process. [MSDOS]: Declare binary-process. @@ -3369,7 +3369,7 @@ (Fcall_process) [not subprocesses]: Barf if zero buffer argument. (call_process_cleanup) [MSDOS]: Close and erase temporary file instead of the pid-stuff. - (Fcall_process_region) [MSDOS]: Create temporary file in $TMP or + (Fcall_process_region) [MSDOS]: Create temporary file in $TMP or $TEMP. (Fchild_setup) [MSDOS]: #if 0, as it is not used. @@ -3399,7 +3399,7 @@ in a slash. (Finsert_file_contents) [MSDOS]: Determine file type by name (call find-buffer-file-type) and change CR+LF to LF if it is a text file. - (Fwrite_region) [MSDOS]: Use text/binary mode as specified by + (Fwrite_region) [MSDOS]: Use text/binary mode as specified by buffer_file_type. (syms_of_fileio) [MSDOS]: Set Qfind_buffer_file_type. (Fsubstitute_in_file_name) [MSDOS]: Ignore case in environtment @@ -3407,7 +3407,7 @@ * floatfns.c [MSDOS]: Don't define HAVE_MATHERR. - * keyboard.c [MSDOS]: #include <dos.h> and <time.h>, but not + * keyboard.c [MSDOS]: #include <dos.h> and <time.h>, but not <sys/ioctl.h>. (read_avail_input) [MSDOS]: Work around `ioctl'. Also read through dos_keyread for better keyboard support. @@ -3437,7 +3437,7 @@ * systty.h [MSDOS]: don't #include <sgtty.h>. We haven't got it. Declare dummy main field. Don't ever use TABs. - * termcap.c (tgetent) [INTERNAL_TERMINAL]: Fake internal terminal + * termcap.c (tgetent) [INTERNAL_TERMINAL]: Fake internal terminal without reading any files. (valid_file_name, tgetent) [MSDOS]: Drive letter support. (tgetent) [MSDOS]: Use text mode for database. @@ -3728,7 +3728,7 @@ * m/sun2.h (OTHER_FILES): Use ${libsrc} as dir. -1993-12-15 Michal Jankowski (michalj@fuw.edu.pl) +1993-12-15 Michal Jankowski (michalj@fuw.edu.pl) * insdel.c (del_range): Second argument in call to offset_intervals is 'from', not 'point'. @@ -3767,7 +3767,7 @@ (redisplay_window): Likewise. (display_text_line): Likewise. (display_menu_bar): Likewise. - (display_mode_element): + (display_mode_element): * editfns.c (Fmessage): Use message2. @@ -3818,7 +3818,7 @@ * process.c (create_process): Delete SYSV4_PTYS code. (deactivate_process): Likewise. - + 1993-12-06 Richard Stallman (rms@gnu.ai.mit.edu) * doc.c (Fsubstitute_command_keys): Ignore menu bar bindings. @@ -3880,7 +3880,7 @@ * fileio.c (Fread_file_name): If defalt is nil and user tries to use it, signal an error. - * lisp.h (DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_0,...): + * lisp.h (DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_0,...): New macros. (DEFUN) [__STDC__]: Use those macros. @@ -4081,7 +4081,7 @@ 1993-11-20 Paul Reilly (pmr@legacy.pajato.com) - * s/dgux.h (PTY_ITERATION, PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF): + * s/dgux.h (PTY_ITERATION, PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF): Defined (copied from usg5-4.h). (FIRST_PTY_LETTER): Deleted. @@ -4093,7 +4093,7 @@ the case where there are no intervals. (Fprevious_single_property_change, Fprevious_property_change) Extra arg LIMIT. Return value was off by 1. - (Fnext_single_property_change, Fnext_property_change): + (Fnext_single_property_change, Fnext_property_change): Extra arg LIMIT. (Fnext_single_property_change): Require at least 2 args. * indent.c (compute_motion): @@ -4594,7 +4594,7 @@ 1993-07-09 Karl Berry (karl@cs.umb.edu) - * dired.c (file_name_completion): Install case-preserving + * dired.c (file_name_completion): Install case-preserving changes from Emacs 18 for completion_ignore_case. (completion_ignore_case): Declare. @@ -4785,7 +4785,7 @@ * buffer.c (verify_overlay_modification): Initialize endpos. - * keymap.c (describe_buffer_bindings): Declare shadow just once. + * keymap.c (describe_buffer_bindings): Declare shadow just once. 1993-08-10 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4903,7 +4903,7 @@ * m/ibm370aix.h: Total rewrite; includes ibmps2-aix.h. - * m/ibmps2-aix.h (SYSTEM_TYPE): Don't redefine it here. + * m/ibmps2-aix.h (SYSTEM_TYPE): Don't redefine it here. * syntax.c: Doc fix. @@ -5004,9 +5004,9 @@ (textget_direct, Qfront_sticky, Qrear_nonsticky): Declared. * textprop.c (Qfront_sticky, Qrear_nonsticky): New variables. (syms_of_textprop): Set them up. - + Change display code to handle the `invisible' text property. - * dispnew.c (direct_output_for_insert): Fail if character + * dispnew.c (direct_output_for_insert): Fail if character just inserted has text properties. (direct_ouput_forward_char): Fail if moving near invisible chars. * indent.c (compute_motion): Compute correctly for invisible text. @@ -5217,7 +5217,7 @@ * s/sco4.h (HAVE_SOCKETS): Define, if HAVE_INET_SOCKETS. - * sunfns.c: Fix comment syntax. Put back the comment + * sunfns.c: Fix comment syntax. Put back the comment saying that we don't maintain this file. * xterm.c (XTread_socket) [! HAVE_X11R5]: @@ -5360,7 +5360,7 @@ be asked. * textprop.c (syms_of_textprop): Don't forget defsubr for - Stext_property_all. + Stext_property_all. * textprop.c (Ftext_property_any, Ftext_property_all): Use EQ to compare property values, not Fequal. @@ -5588,7 +5588,7 @@ 1993-07-08 Roland McGrath (roland@churchy.gnu.ai.mit.edu) * callint.c (check_mark): Don't check mark-active unless in - transient-mark-mode. + transient-mark-mode. For inactive mark, signal mark-inactive instead of error with a message. * editfns.c (region_limit): Don't error if Vmark_even_if_inactive @@ -5690,7 +5690,7 @@ against Qnil, not 0. * keyboard.c (Vdouble_click_time): Renamed from double_click_time, - and made a Lisp_Object instead of an int. + and made a Lisp_Object instead of an int. (make_lispy_event): If Vdouble_click_time is t, impose no time limit on double-clicks. (syms_of_keyboard): DEFVAR_LISP (not DEFVAR_INT) @@ -5844,7 +5844,7 @@ 1993-06-28 Richard Stallman (rms@mole.gnu.ai.mit.edu) * keymap.c (describe_map_2): Cleanups. - Check there's no previous definition in same keymap. + Check there's no previous definition in same keymap. 1993-06-24 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index d7794eb6722..1f20b6812f7 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -1766,7 +1766,7 @@ * m/intel386.h (C_SWITCH_SYSTEM): Don't #undef or define it. [SOLARIS2, SOLARIS2_4, !__GNUC__] (C_SWITCH_MACHINE): Define instead. -1995-03-26 Germano Caronni <caronni@tik.ethz.ch> +1995-03-26 Germano Caronni <caronni@tik.ethz.ch> * ralloc.c (r_re_alloc): Correct realloc behavior--allow shrinking of blocks while reallocating, if shrinking by more than one page. @@ -1789,7 +1789,7 @@ * textprop.c (Fnext_property_change): Fix previous change. -1995-03-23 Kevin Rodgers <kevinr@ihs.com> +1995-03-23 Kevin Rodgers <kevinr@ihs.com> * print.c (temp_output_buffer_setup): (Re)set the default directory of the temp buffer to that of the current buffer. @@ -3199,7 +3199,7 @@ * dispnew.c (scrolling): Fewer restrictions if scroll_region_ok is set. New vector old_draw_cost for direct scrolling method. -1994-12-23 Michal Jankowski (Michal.Jankowski@fuw.edu.pl) +1994-12-23 Michal Jankowski (Michal.Jankowski@fuw.edu.pl) * keyboard.c (read_char): Don't echo keys when echo_keystrokes is 0. @@ -4314,7 +4314,7 @@ * buffer.c (list_buffers_1): Always mark current_buffer read-only. -1994-10-20 Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> +1994-10-20 Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> * m/dpx2.h (LD_SWITCH_MACHINE): Defined. @@ -5279,7 +5279,7 @@ * window.c (syms_of_window): Doc fix. -1994-09-26 Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> +1994-09-26 Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> * m/dpx2.h (POSIX_SIGNALS): Define it. (sigsetmask): Add #undef. @@ -5485,7 +5485,7 @@ * editfns.c (Fmessage_box): Renamed from Fbox_message. -1994-09-17 Michael Ben-Gershon (mybg@cs.huji.ac.il) +1994-09-17 Michael Ben-Gershon (mybg@cs.huji.ac.il) * unexec.c (copy_text_and_data): Add RISCiX changes. @@ -5793,7 +5793,7 @@ * term.c (clear_to_end): Fix reversed condition. -1994-09-16 K. Berry <kb@cs.umb.edu> +1994-09-16 K. Berry <kb@cs.umb.edu> * dired.c (Qcompletion_ignored_extensions): New symbol. (syms_of_dired): Initialize it. @@ -5804,7 +5804,7 @@ * s/msdos.h (MODE_LINE_BINARY_TEXT): Define this symbol. * xdisp.c (decode_mode_spec): Use it when defined. -1994-09-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> +1994-09-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * minibuf.c (read_minibuf): Don't add to the history list if the minibuffer string is empty, since it is not very useful. @@ -6045,7 +6045,7 @@ instead of whether SIGIO is defined. * Makefile.in.in (xterm.o): Depend on keyboard.h. -1994-08-26 Kevin Rodgers <kevinr@ihs.com> +1994-08-26 Kevin Rodgers <kevinr@ihs.com> * xfns.c (Fx_color_defined_p): Return list of RGB values, not just t. diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index cc4764a734a..3cf30f682e3 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -116,7 +116,7 @@ * xmenu.c (Fx_popup_dialog): Don't fail to initialize WINDOW. * xdisp.c (prepare_menu_bars): Clear pending_menu_activation. - + * print.c: When printing into a buffer, generate all the text first, then insert it all at once. (print_buffer): New variable. @@ -239,7 +239,7 @@ * xfns.c (xlwmenu_default_font): Declare, but don't define. * xselect.c (last_event_timestamp): Declare, but don't define. -1996-07-15 David Mosberger-Tang <davidm@AZStarNet.com> +1996-07-15 David Mosberger-Tang <davidm@AZStarNet.com> * m/alpha.h (TEXT_START, DATA_START, DATA_SEG_BITS, UNEXEC, DATA_END): Omit these definitions if ELF. @@ -1079,7 +1079,7 @@ scroll_bar_up_arrow, scroll_bar_down_arrow. (win32_scroll_bar_click): New enum constant. -1996-05-03 Andrw Innes <andrewi@harlequin.co.uk> +1996-05-03 Andrw Innes <andrewi@harlequin.co.uk> * makefile.nt (SUBSYSTEM) [NTGUI]: Remove conditional. (LINK_FLAGS): Explicitly set base address, and stack and heap sizes. @@ -1574,7 +1574,7 @@ * w32fns.c (defined_color): Map color to nearest in default palette. (win32_wnd_proc): Special handling for WM_CLOSE. -1996-04-16 Kim Storm <storm@olicom.dk> +1996-04-16 Kim Storm <storm@olicom.dk> * msdos.c (check_timer): Removed; use gettime instead. (sys_select): Call __dpmi_yield while waiting for input to @@ -4475,7 +4475,7 @@ * keyboard.c (read_key_sequence): Validate the event position before calling get_local_map. -1995-08-29 Jack Repenning <jackr@sgi.com> +1995-08-29 Jack Repenning <jackr@sgi.com> * unexelfsgi.c: Compute new data offset based on memory address; also, copy .got from memory not temacs. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index 6413b20eeeb..99631e5eefa 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -83,7 +83,7 @@ * xterm.c, xterm.h: x_display_unibyte_char_with_fontset renamed to unibyte_display_via_language_environment. - + * xfns.c (unibyte_display_through_language_environment): Renamed from x_display_unibyte_char_with_fontset. @@ -200,7 +200,7 @@ * commands.h (Vthis_command): Renamed from this_command. - * minibuf.c (Fminibuffer_complete): + * minibuf.c (Fminibuffer_complete): this_command renamed to Vthis_command. * macros.c (Fcall_last_kbd_macro): @@ -210,7 +210,7 @@ (real_this_command): New variable, but not a Lisp variable; updated like Vthis_command, but never altered by Lisp programs. (command_loop_1): Use real_this_command to set Vreal_last_command. - + 1998-08-07 Kenichi Handa <handa@etl.go.jp> * cmds.c (internal_self_insert): If enable-multibyte-characters is @@ -266,7 +266,7 @@ to XLoadQueryFont. (fast_find_position): Handle case where position is before an invisible character, thus not actually listed in charstarts. - + * keyboard.c (Vinput_method_previous_message): New variable. (syms_of_keyboard): Set up lisp variable. (Qinput_method_exit_on_first_char, Qinput_method_use_echo_area): @@ -278,7 +278,7 @@ * lisp.h (Fread_key_sequence): Update declaration. * callint.c (Fcall_interactively): Pass new arg to Fread_key_sequence. - + 1998-08-03 Richard Stallman <rms@psilocin.ai.mit.edu> * window.c (Fmove_to_window_line): Doc fix. @@ -331,7 +331,7 @@ account. 1998-07-30 Paul Eggert <eggert@twinsun.com> - + * src/Makefile.in (widget.o, xfns.o, xmenu.o): Prepend $(srcdir)/ to rule dependencies outside this dir. @@ -450,7 +450,7 @@ (syms_of_keyboard): Set up Lisp vars. (command_loop_1): Check Vunread_input_method_events and Vunread_post_input_method_events along with Vunread_command_events. - + 1998-07-11 Andrew Innes <andrewi@harlequin.co.uk> * w32menu.c (w32_menu_show): Set widget call_data to 0 if @@ -509,11 +509,11 @@ * charset.h (MAX_CHAR_COMPOSITION): Defined as (GLYPH_MASK_CHAR - 1), one less than the previous value. - (GENERIC_COMPOSITION_CHAR): New macro. + (GENERIC_COMPOSITION_CHAR): New macro. * charset.c (Vgeneric_character_list): New variable. (init_charset_once): Init and staticpro it. - (Fgeneric_character_list): New function. + (Fgeneric_character_list): New function. (syms_of_charset): defsubr it. * fns.c (Fset_char_table_default): Check only if the charset of @@ -630,7 +630,7 @@ * doc.c (get_doc_string): Take both UNIBYTE and DEFINITION as args. All callers changed. * lisp.h (get_doc_string): Adjust declaration. - + * lread.c (read_list): Pass new arg to get_doc_string. * doc.c (get_doc_string): 2nd arg is now DEFINITION; @@ -646,7 +646,7 @@ * emacs.c (sort_args): Discard duplicate options with no args. (main): With duplicate -d options, use the last one. Likewise for -t. Check -d last, by checking for -nl earlier on. - + 1998-06-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * keyboard.c (command_loop): Reset executing_macro after @@ -775,7 +775,7 @@ 1998-06-14 Eli Zaretskii <eliz@mescaline.gnu.org> * msdos.c (dos_set_keyboard): Call Int 2Fh via the DPMI server, - not directly. + not directly. (dos_yield_time_slice): New function. (sys_select): Use it instead of __dpmi_yield. @@ -895,7 +895,7 @@ (display_text_line): If cursor's in the frame's echo area, don't set this_line_endpos. (redisplay_window): Use Fwindow_end to find lower scroll margin. - + * syntax.c (scan_lists): Properly skip the comment-fence character that ends a comment, when moving forward. (Fbackward_prefix_chars): Return immediately if point is at BEGV. @@ -912,7 +912,7 @@ (scan_lists): Likewise. (prev_char_comstart_first): New function. - * syntax.c + * syntax.c 1998-06-05 Andrew Innes <andrewi@harlequin.co.uk> * w32.c: #include sys/file.h @@ -1008,7 +1008,7 @@ * w32.c (sys_rename): Handle filenames with accented characters. (stat): Handle "c:/.." and "/.." specially. - + * unexw32.c (w32_fatal_reload_error): Update error message. 1998-05-30 Karl Heuer <kwzh@gnu.org> @@ -1065,7 +1065,7 @@ (read1): Enable saving of doc strings on WINDOWSNT. (read_list): Call get_doc_string instead of read_doc_string, when forced to load doc strings. - + 1998-05-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * s/gnu-linux.h (setpgrp): Remove extra parens around parameters. @@ -1130,7 +1130,7 @@ * window.c (select_window_1): New subroutine, from Fselect_window. (Fselect_window): Use select_window_1. (temp_output_buffer_show): Use select_window_1. - + 1998-05-22 Kenichi Handa <handa@etl.go.jp> * ccl.c: Change term "character translation table" to "translation @@ -1198,7 +1198,7 @@ * minibuf.c (syms_of_minibuf): Doc fix. * window.c (Fscroll_up, Fscroll_down, Fscroll_other_window): Doc fixes. - + * frame.c (make_frame_visible_1): New function. (Fmake_frame_visible): Use that. @@ -1275,7 +1275,7 @@ * window.c (Fset_window_buffer): Update buffer's display_time. * insdel.c (insert_1_both, insert_from_string_1, replace_range) - (insert_from_buffer_1, adjust_before_replace, adjust_after_replace): + (insert_from_buffer_1, adjust_before_replace, adjust_after_replace): Don't copy text being deleted, if undo is disabled. * lread.c (readchar): Use readchar_backlog again @@ -1380,7 +1380,7 @@ * xdisp.c (redisplay_window): Handle scroll_step along with scroll_conservatively. Fix 1-off error checking the limit for them. - * filelock.c (unlock_file): Encode the file name. + * filelock.c (unlock_file): Encode the file name. 1998-05-10 Richard Stallman <rms@psilocin.ai.mit.edu> @@ -1517,7 +1517,7 @@ * emacs.c (main): Call the syms_of_... and keys_of_... functions earlier, before init_vms_input and init_display. - + 1998-05-04 E. Jay Berkenbilt <ejb@ql.org> * window.h (WINDOW_RIGHT_MARGIN): Don't subtract 1 from width when @@ -1585,7 +1585,7 @@ 1998-05-02 Hrvoje Niksic <hniksic@srce.hr> - * fileio.c (Fmake_temp_name): Improve randomness of generated file + * fileio.c (Fmake_temp_name): Improve randomness of generated file names. 1998-05-01 Richard Stallman <rms@psilocin.gnu.org> @@ -1599,7 +1599,7 @@ 1998-04-30 Geoff Voelker <voelker@cs.washington.edu> - * keyboard.c (Qdrag_n_drop, drag_n_drop_syms, lispy_drag_n_drop_names) + * keyboard.c (Qdrag_n_drop, drag_n_drop_syms, lispy_drag_n_drop_names) New variables. (make_lispy_event): Handle drag_n_drop events. (syms_of_keyboard): Initialize new symbols. @@ -1610,7 +1610,7 @@ * termhooks.h (event_kind): New event type `drag_n_drop'. * makefile.nt (LIBS): Link in shell32.lib. - + * w32fns.c: Include shellapi.h. (w32_createwindow): Enable drag-n-drop on new windows. (w32_wnd_proc): Handle WM_DROPFILES messages. @@ -1618,7 +1618,7 @@ * w32term.c: Include shellapi.h. (construct_drag_n_drop): New function. - (w32_read_socket): Handle WM_DROPFILES messages. + (w32_read_socket): Handle WM_DROPFILES messages. 1998-04-30 Skip Collins <ColliBF1@APLMSG.JHUAPL.EDU> @@ -1637,7 +1637,7 @@ * indent.c (compute_motion): When invisible text cross TO, return TO, not the start of the invisible text. - * process.c (Fset_process_inherit_coding_system_flag, Fstart_process): + * process.c (Fset_process_inherit_coding_system_flag, Fstart_process): Store inherit_coding_system_flag as a Lisp_Object. (Fopen_network_stream): Likewise. (Fprocess_inherit_coding_system_flag): Access it as Lisp_Object. @@ -1686,7 +1686,7 @@ * emacs.c (abort): Omit this definition, if NO_ABORT. End by calling exit, to avoid warning. - + 1998-04-28 Richard Stallman <rms@psilocin.gnu.org> * filelock.c: Include coding.h. @@ -1767,7 +1767,7 @@ * minibuf.c (minibuf_conform_representation): New function. (Ftry_completion): Use it to return multibyte string if and only if the completion table has a multibyte string. - (Fdisplay_completion_list): + (Fdisplay_completion_list): Convert string to unibyte before displaying it, if default is unibyte. * eval.c (find_handler_clause): Cast Fbacktrace to proper type. @@ -1881,7 +1881,7 @@ * xfaces.c (unload_color): No longer static. - * insdel.c (insert_from_string, insert_from_string_before_markers): + * insdel.c (insert_from_string, insert_from_string_before_markers): Don't special case LENGTH = 0. (insert_from_buffer): Likewise. @@ -1894,7 +1894,7 @@ 1998-04-22 Eli Zaretskii <eliz@delysid.gnu.org> * w16select.c (Fwin16_set_clipboard_data): Call UNBLOCK_INPUT - before calling sit_for. + before calling sit_for. (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 @@ -1911,7 +1911,7 @@ 1998-04-21 Eli Zaretskii <eliz@delysid.gnu.org> * callproc.c (Fcall_process) [MSDOS]: Call child_setup instead of - run_msdos_command. + run_msdos_command. (child_setup) [MSDOS]: Call run_msdos_command here. (child_setup) [DOS_NT]: Get past drive letter in pwd. Don't call close_load_descs, since we are not in a vfork. @@ -1957,7 +1957,7 @@ (load_convert_to_unibyte): New variable. (syms_of_lread): Set up Lisp var. (read1): If load_convert_to_unibyte, convert strings to unibyte. - + * insdel.c (copy_text): Count down bytes_left properly in multibyte to unibyte case. @@ -2062,7 +2062,7 @@ (map_virt_key): Brazilian keyboards use 0xc1 for /(?) key. * w32menu.c (Vmenu_updating_frame): New variable. - (Fx_popup_menu, set_frame_menubar): Record frame whose menu is + (Fx_popup_menu, set_frame_menubar): Record frame whose menu is being updated. (syms_of_w32menu): Define Vmenu_updating_frame. @@ -2082,7 +2082,7 @@ * w32term.c (Vw32_recognize_altgr): New variable. (dumpglyphs): Update from xterm.c. (w32_ring_bell): Flash window, don't just reset its state. - (dumprectangle, show_mouse_face, x_draw_single_glyph): Use new + (dumprectangle, show_mouse_face, x_draw_single_glyph): Use new args to dumpglyphs. (my_set_foreground_window): New function. (w32_condemn_scroll_bars): Mark all as condemned scroll bars. @@ -2193,7 +2193,7 @@ * fontset.h (FONT_ENCODING_NOT_DECIDED): The value is changed to 255. (find_ccl_program_func): Extern it. (Fquery_fontset): Args number changed to 2. - + * xfns.c (syms_of_xfns): Initialize find_ccl_program_func. * xterm.c (x_find_ccl_program): New function. @@ -2293,7 +2293,7 @@ (printchar, strout): If echo area text converted to multibyte does not all fit, truncate it at char boundary. - * marker.c (buf_charpos_to_bytepos, buf_bytepos_to_charpos): + * marker.c (buf_charpos_to_bytepos, buf_bytepos_to_charpos): When calling set_marker_both, pass the right buffer. * indent.c (Fcompute_motion): Check that TO and FROM are in range. @@ -2367,7 +2367,7 @@ (syms_of_charset): Defsubr it. (multibyte_form_length): Modified to be consistent with string_to_non_ascii_char. - + * charset.h (MULTIBYTE_FORM_LENGTH): Don't check LEN here. * xdisp.c (display_text_line): Code for displaying a character by @@ -2547,7 +2547,7 @@ * fileio.c (barf_or_query_if_file_exists): New arg QUICK. All calls changed. - + 1998-03-27 Richard Stallman <rms@psilocin.gnu.org> * insdel.c (check_markers_debug_flag): New variable. @@ -2568,7 +2568,7 @@ * coding.c (code_convert_region): Call adjust_before_replace in the no-conversion case. Adjust GPT, ZV and Z in chars. - + 1998-03-25 Richard Stallman <rms@psilocin.gnu.org> * lread.c (init_lread): Init Vstandard_input. @@ -2733,7 +2733,7 @@ * fns.c (substring_both, Fsubstring): Use make_specified_string. (concat): Make string result unibyte or multibyte as appropriate. - + * doc.c (Fsubstitute_command_keys): Use make_string_from_bytes. * coding.c (code_convert_string): Use make_string_from_bytes. @@ -2748,7 +2748,7 @@ * editfns.c (Fchar_to_string): Use make_string_from_bytes. (Fformat): Use make_specified_string. (make_buffer_string_both): Use make_uninit_string if buffer is unibyte. - + * sunfns.c (syms_of_sunfns): Pass new arg to make_pure_string. * lread.c (read1): Pass new arg to make_pure_string. @@ -2769,14 +2769,14 @@ * lisp.h (STRING_BYTES, SET_STRING_BYTES): New macros. * All files: Use STRING_BYTES and SET_STRING_BYTES. - + * editfns.c (Ftranspose_regions): Try to handle combining bytes. * insdel.c (replace_range): New arg NOMARKERS. - + 1998-03-20 Richard Stallman <rms@psilocin.gnu.org> * 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): (del_range_2): Call record_delete the new way. @@ -2787,7 +2787,7 @@ * undo.c (record_delete): Replace LENGTH arg with STRING. (record_change): Call record_delete the new way. - + * Makefile.in (keymap.o): Depend on puresize.h. (xmenu.o): Don't depend on puresize.h. @@ -2799,7 +2799,7 @@ * 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. (parse_menu_item): New function. (menu_item_eval_property_1, menu_item_eval_property) New suroutines. @@ -2919,7 +2919,7 @@ * process.c (exec_sentinel, read_process_output): Fstore_match_data => Fset_match_data. - + * xmenu.c (set_frame_menubar): Fstore_match_data => Fset_match_data. * xdisp.c (message_dolog): Save and restore Vdeactivate_mark. @@ -3018,14 +3018,14 @@ * lisp.h (struct Lisp_Buffer_Local_Value): Field car renamed to realvalue. New fields check_frame, found_for_buffer, found_for_frame, buffer, frame. - + * data.c (store_symval_forwarding, swap_in_symval_forwarding) (set_internal, default_value, Fset_default, Fmake_local_variable) (Fmake_variable_buffer_local, Fkill_local_variable): Handle new data structure for struct Lisp_Buffer_Local_Value. (Fmake_variable_frame_local): New function. - * buffer.c (set_buffer_internal_1) + * buffer.c (set_buffer_internal_1) (swap_out_buffer_local_variables): Handle new data structure for struct Lisp_Buffer_Local_Value. @@ -3044,7 +3044,7 @@ Call set_search_regs differently in a forward search. (boyer_moore): Fix up the code that translates the pattern and loops thru equivalent characters. - + 1998-03-07 Richard Stallman <rms@psilocin.gnu.org> * insdel.c (adjust_markers_for_insert): New arg COMBINED_AFTER_BYTES. @@ -3178,7 +3178,7 @@ (list2, list3, list4, list5): New function decl. (Fwrite_region): Add an argument. (compare_window_configurations): New function decl. - + * keyboard.c: Include syntax.h. (interrupt_signal): Save and restore gl_state around an immediate quit, in case debugger returns. @@ -3200,7 +3200,7 @@ * callproc.c (Fcall_process_region): Pass new arg to Fwrite_region. 1998-03-01 Ilya Zakharevich <ilya@math.ohio-state.edu> - + * syntax.c (update_syntax_table): Properly update `position' field of used intervals. @@ -3486,7 +3486,7 @@ * buffer.c (advance_to_char_boundary): New function. (Fset_buffer_multibyte): Advance all byte-positions to char boundaries. Clear undo list. - + * fontset.h (GENERIC_FONT_PTR): Commented-out definition deleted. 1998-02-06 Kenichi Handa <handa@etl.go.jp> @@ -3504,7 +3504,7 @@ * editfns.c (Fposition_bytes): New function. (syms_of_editfns): defsubr it. - * fns.c (Fstring_bytes): New function. + * fns.c (Fstring_bytes): New function. (syms_of_fns): defsubr it. 1998-02-05 Richard Stallman <rms@psilocin.gnu.org> @@ -3721,7 +3721,7 @@ change of code_convert_string. (Fupdate_iso_coding_systems): New function. (init_coding_once): Initialize coding_system_table. - + * data.c (Faset): Allow setting a multibyte character in a multibyte string as far as it doesn't change the size_byte of the string. @@ -3809,7 +3809,7 @@ CODING_CATEGORY_MASK_ISO_7_TIGHT. (coding_category_table, coding_category_name): Extern deleted. (Vselect_safe_coding_system_function): Extern it. - + * charset.h (MAX_CHAR_COMPOSITION): New macro. (CHAR_CHARSET): Check more strictly. (CODING_FLAG_ISO_DESIGNATION): New macro. @@ -3864,19 +3864,19 @@ * charset.c (nonascii_insert_offset): Variable moved from cmds.c. (syms_of_charset): Initialize variable. - * cmds.c (internal_self_insert, Fself_insert_command): + * cmds.c (internal_self_insert, Fself_insert_command): Use unibyte_char_to_multibyte. (nonascii_insert_offset): Variable moved to charset.c. (syms_of_cmds): Don't initialize nonascii_insert_offset. * fileio.c (Fsubstitute_in_file_name): Use unibyte_char_to_multibyte. - + * keyboard.c (command_loop_1): Use unibyte_char_to_multibyte. * xdisp.c (message_dolog): Use unibyte_char_to_multibyte. Pass different args to scan_newline. Properly compare oldpoint with Z. - + * syntax.c (skip_chars): Use unibyte_char_to_multibyte, * fns.c (concat): Use unibyte_char_to_multibyte. @@ -4100,7 +4100,7 @@ (insert_from_buffer_1): Call copy_text to convert between single-byte and multibyte text. (insert_from_string_1): Likewise. - + * process.c (read_process_output): New var `multibyte'. Set it according to which coding system was used. @@ -4168,7 +4168,7 @@ 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): * editfns.c (syms_of_editfns): Delete defsubr for sref. @@ -4218,7 +4218,7 @@ * 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_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. @@ -4263,7 +4263,7 @@ Initialize print_buffer_pos_byte. Use insert_1_both. (printchar): Update print_buffer_pos_byte and print_buffer_pos. (print_buffer_pos_byte): New variable. - + * editfns.c (general_insert_function): Pass the additional args to INSERT_FROM_STRING_FUNC. (Fchar_to_string): Use make_multibyte_string. @@ -4274,7 +4274,7 @@ (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_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. @@ -4301,13 +4301,13 @@ (Fstring): Renamed from Fconcat_chars. Handle bytes vs chars in string. (syms_of_charset): Corresponding changes. - + * fns.c (concat, Fsubstring, internal_equal, mapcar1): Distinguish bytes and chars when indexing strings. (Fstring_equal, Fstring_lessp): Likewise. (substring_both): New function. (string_char_to_byte, string_byte_to_char): New functions. - + * charset.h (FETCH_STRING_CHAR_ADVANCE): New macro. * lisp.h (struct lisp_String): New field size_byte. @@ -4319,10 +4319,10 @@ * window.c (Fselect_window): Don't set OW->pointm if OW->buffer is nil. (Fset_window_configuration): Set old selected window's pointm. - + * minibuf.c (Fcompleting_read): Doc fix. - * keymap.c (current_minor_maps): + * keymap.c (current_minor_maps): If a variable has an entry in Vminor_mode_overriding_map_alist, and also an entry in Vminor_mode_map_alist, ignore the latter. @@ -4350,7 +4350,7 @@ * lisp.h (struct Lisp_Marker): Rename `bufpos' to `bytepos'. Its value no longer includes the gap space. - + * editfns.c (Fchar_after): Fix previous change. * fileio.c (a_write): Fix prototype. @@ -4360,7 +4360,7 @@ (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): + (struct Lisp_Marker): * search.c (scan_newline): Always restore prev value of immediate_quit. @@ -4388,7 +4388,7 @@ * charset.h (CHAR_HEAD_P): Take char, not pointer, as arg. * window.c (unshow_buffer): Set PT with TEMP_SET_PT_BOTH. - + * indent.c (indented_beyond_p): Take POS in bytes and chars. Callers changed. (pos_tab_indent): Function moved to xdisp.c. @@ -4400,7 +4400,7 @@ * 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. (indented_beyond_p, current_column_1): Likewise. @@ -4421,7 +4421,7 @@ (window_scroll): Save and restore both kinds of pointers. * process.c (status_notify): Use byte and char pointers. - + * callint.c (Fcall_interactively) <'d', 'r'>: Use set_marker_both. * emacs.c (abort): New function. @@ -4451,14 +4451,14 @@ (message_log_check_duplicate): Take charpos and bytepos args. (message_dolog): Use markers to update old PT, BEGV, ZV. Use scan_newline. Handle positions in bytes and chars. - + 1997-12-28 Richard Stallman <rms@psilocin.gnu.org> * xselect.c (Fx_rotate_cut_buffers_internal): Doc fix. * coding.c (code_convert_region): Handle bytepos and charpos. (Fdetect_coding_region): Likewise. - + * Makefile.in (marker.o): Depend on charset.h. 1997-12-27 Richard Stallman <rms@psilocin.gnu.org> @@ -4491,7 +4491,7 @@ * syntax.h (SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos. Wrap in if (1) ... else. - + * minibuf.c (Fminibuffer_complete_word): Handle bytes vs characters when comparing buffer against string. (temp_echo_area_glyphs): Save, update, delete text using @@ -4505,13 +4505,13 @@ * buffer.h (DECODE_POSITION): New macro. (CHAR_TO_BYTE, BYTE_TO_CHAR): New macros. - + * buffer.h (BEG_BYTE, BEGV_BYTE, PT_BYTE, GPT_BYTE) (ZV_BYTE, Z_BYTE): New macros. (BUF_BEG_BYTE, BUF_BEGV_BYTE, BUF_PT_BYTE, BUF_GPT_BYTE) (BUF_ZV_BYTE, BUF_Z_BYTE): New macros. (BUF_GAP_END_ADDR): New macro. - (BEGV_ADDR, PT_ADDR, GPT_ADDR, GAP_END_ADDR, ZV_ADDR, Z_ADDR): + (BEGV_ADDR, PT_ADDR, GPT_ADDR, GAP_END_ADDR, ZV_ADDR, Z_ADDR): Use the new ..._byte buffer data. (BUFFER_CEILING_OF, BUFFER_FLOOR_OF): Likewise. (BUF_GPT_ADDR, BUF_Z_ADDR): Likewise. @@ -4543,7 +4543,7 @@ (write_abbrev): Return void. (Fexpand_abbrev): Scan in bytepos along with charpos. (Funexpand_abbrev): Use bytepos to delete the expansion. - + * charset.h (INC_POS, DEC_POS): Fix because arg is a bufpos. (BUF_INC_POS, BUF_DEC_POS): New macros. (INC_BOTH, DEC_BOTH): New macros. @@ -4567,7 +4567,7 @@ use readchar_backlog to fetch bytes from a character. (unreadchar): Increment readchar_backlog. (readevalloop, Fread): Init readchar_backlog. - + * charset.c (Fchar_boundary_p): Always return 0. (Fchars_in_region): Just subtract the arguments. (chars_in_text): New function. @@ -4612,28 +4612,28 @@ (Fmove_to_column): Scan with bytepos and charpos. (pos_tab_offset): Use bytepos to do FETCH_BYTE. (skip_invisible): Don't worry about position in middle of character. - + * xdisp.c (try_window): Pass bytepos to and from display_text_line. (try_window_id): Likewise. Use byte pos as well as charpos. (redisplay_internal): Handle bytepos for tlbufpos. * xdisp.c (message): Cast last arg to doprnt. - + * indent.h (struct position): New field bytepos. * keyboard.c (command_loop_1): Use PT_BYTE when calling FETCH_BYTE. Instead of Fforward_point, just add. - + * search.c (looking_at_1): Use bytepos to call re_search_2. Convert search regs to charpos, if search succeeded. (search_buffer): Likewise. Also convert charpos <-> bytepos in non-regexp case. - (scan_buffer): Convert charpos <-> bytepos. + (scan_buffer): Convert charpos <-> bytepos. (scan_newline): New function. (find_next_newline): Function deleted. (set_search_regs): Args now in bytes; convert to charpos. (Freplace_match): Convert charpos <-> bytepos when scanning case. - + * fileio.c (restore_point_unwind): Now static. Use Fgoto_char. (Funhandled_file_name_directory): Doc fix. (Finsert_file_contents): Handle bytes vs chars. @@ -4642,7 +4642,7 @@ (e_write): Rename args. (Funhandled_file_name_directory): Doc fix. (a_write, e_write): Now static. - + * editfns.c (Fgoto_char): When arg is a marker, copy char and byte positions from it. When arg is an integer, no need to worry that it is in middle of a character. @@ -4710,9 +4710,9 @@ (message2): Pass new arg to message2_nolog. (message1_nolog): Likewise. - * keyboard.c (Fexecute_extended_command): + * keyboard.c (Fexecute_extended_command): Save message_enable_multibyte and pass it to message2_nolog. - + * alloc.c (Fgarbage_collect): Save message_enable_multibyte and pass it to message2_nolog. @@ -4734,7 +4734,7 @@ * xdisp.c (message_dolog): Convert between single-byte and multibyte when inserting text into *Messages*. - + 1997-12-11 Richard Stallman <rms@gnu.org> * sysdep.c (sys_signal): Add two casts. @@ -4742,7 +4742,7 @@ 1997-12-09 Richard Stallman <rms@gnu.org> * callproc.c (Fcall_process): Don't clobber new_argv[0] - in the case of no args. + in the case of no args. 1997-12-09 Kenichi Handa <handa@etl.go.jp> @@ -4799,7 +4799,7 @@ * eval.c (do_autoload): Return void. * sysdep.c (reset_sigio): Return void. - + * keyboard.c (Fsuspend_emacs): Cast init_sys_modes when calling record_unwind_protect. @@ -4818,7 +4818,7 @@ * 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. * fileio.c (report_file_error): Declare it as void. @@ -4857,7 +4857,7 @@ * xdisp.c (redisplay_preserve_echo_area): Declare it as void. * charset.c (strwidth): Remove extra argument to buffer_display_table. - + 1997-11-25 Andreas Schwab <schwab@delysid.gnu.org> * charset.h (SPLIT_STRING): Remove extra argument to @@ -5126,7 +5126,7 @@ 1997-10-24 Richard Stallman <rms@gnu.org> - * frame.c (Fmouse_pixel_position, Fmouse_position): + * frame.c (Fmouse_pixel_position, Fmouse_position): Pass -1 as INSIST arg to mouse_position_hook. * w32term.c (w32_mouse_position): Handle INSIST < 0. * xterm.c (XTmouse_position): Handle INSIST < 0. @@ -5466,7 +5466,7 @@ Decode all result file names using Vfile_name_coding_system. * coding.c (Fencode_coding_string, Fdecode_coding_string): Doc fixes. - + 1997-09-07 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * lread.c (Feval_buffer): New arg FILENAME. @@ -5476,7 +5476,7 @@ 1997-09-07 Geoff Voelker <voelker@cs.washington.edu> * firstfile.c: New file. - + 1997-09-07 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * xdisp.c (display_string): Determine multibyte from current buffer, @@ -5491,7 +5491,7 @@ * unexelf.c: Test __OpenBSD__ along with __NetBSD__. [__OpenBSD__]: Include sys/exec_elf.h. - + 1997-09-05 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu> * coding.c (Ffind_operation_coding_system): If a function in @@ -5505,7 +5505,7 @@ * lisp.h (Fread_coding_system): Update decl. * callint.c (Fcall_interactively): Pass new arg to Fread_coding_system. - + 1997-09-04 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * m/alpha.h (PTY_OPEN): Call sigblock properly. @@ -5581,7 +5581,7 @@ a separate .bss section conditional. Use my_begbss and my_endbss to determine .bss size by default. Look for Emacs data in EMDATA section. - + * w32.c: Include stddef.h. (getwd): Delete macro. (startup_dir): New variable. @@ -5598,9 +5598,9 @@ (sys_link): Support NTFS links. (sys_rename): Use a long file name for temporary name. (sys_pipe): Make pipes binary and non-inheritable. - (sys_read, sys_write): Spoof text mode translation for pipes + (sys_read, sys_write): Spoof text mode translation for pipes and sockets. - + (hashval): Simplify. (generate_inode_val): Use long file name version of file. @@ -5615,18 +5615,18 @@ (lookup_volume_info, add_volume_info, GetCachedVolumeInformation): New functions. (get_volume_info): Use volume_info_data. - Use GetCachedVolumeInformation. + Use GetCachedVolumeInformation. (init_ntproc): No longer restrict to one DOS subprocess. Use CRT _open and _fdopen. Cache fixed drive information. - + * w32.h: Remove debugging macros. (child_process): Remove is_dos_process field, add hwnd handle field. (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. @@ -5640,7 +5640,7 @@ * w32fns.c: Include limits.h and errno.h. Declare externs from other files. - (w32_in_use): New variable. + (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. @@ -5654,7 +5654,7 @@ (x_icon): Initial support for creating window iconified. (x_display_info_for_name): Set w32_in_use. (Fx_open_connection): Validate Vwindow_system. Set w32_in_use. - + (w32_create_window): Set window size to frame dimensions. Set font width, line height, border, scrollbar indexes. Don't set X and Y units indexes. @@ -5662,7 +5662,7 @@ Make static. Don't post done message. No longer handle create scrollbar message. Don't abort on anomalous messages. Return when completion detected. - (w32_wnd_proc): Keep track of button state. + (w32_wnd_proc): Keep track of button state. For WINDOWPOSCHANGING, force window dimensions to be multiples of character dimensions. Handle CREATESCROLLBAR. @@ -5675,7 +5675,7 @@ Set icon name. Use courier new as default font (has bold and italic). Set BufferPredicate and Title default parameters. - + (x_to_w32_weight): Support semibold weight. (x_to_w32_charset): Map # to numeric charset identifier. (w32_to_x_charset): Encode unknown charsets as a number. @@ -5697,23 +5697,23 @@ * w32inevt.c: Declare externs from other files. (w32_kbd_mods_to_emacs): New parameter KEY. Use w32-capslock-is-shiftlock for old behavior. - (key_event): Pass in new parameter to w32_kbd_mods_to_emacs. - + (key_event): Pass in new parameter to w32_kbd_mods_to_emacs. + * w32menu.c (init_menu_items): Disable code. (x_activate_menubar): New function. (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_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_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. + (reap_subprocess): Don't check for dos subprocesses. Add debug support. (sys_wait): Ignore socket child_procs. Check for quit while waiting. @@ -5760,7 +5760,7 @@ 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 visibile 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. @@ -5773,9 +5773,9 @@ (x_focus_on_frame): Set focus by making frame the foreground window. (x_raise_frame): Support frames to be raised without grabbing focus. (x_lower_frame): Set NOACTIVATE flag when setting window position. - (x_make_frame_visible, x_make_frame_invisible): Pass in frame + (x_make_frame_visible, x_make_frame_invisible): Pass in frame to my_show_window. - (x_iconify_frame): Send a MINIMIZE message to the window. + (x_iconify_frame): Send a MINIMIZE message to the window. (x_wm_set_size_hint): Set font width, line height, border, and scroll bar indexes instead of X and Y unit indexes. @@ -5786,7 +5786,7 @@ * w32term.h (w32_output): New fields menubar_widget, menubar_active, and pending_menu_activation. - (VERTICAL_SCROLL_BAR_*): Use proportional scroll bar variables. + (VERTICAL_SCROLL_BAR_*): Use proportional scroll bar variables. (W32WindowPos): Delete definition. (WM_EMACS_SETFOCUS, WND_*_INDEX): New macros. (deferred_msg): New structure. @@ -5799,7 +5799,7 @@ Undef system calls before redefining. Emulated calls redefined to sys_*, real calls redefined to _*. (DebPrint): Macro defined. - + 1997-09-02 Michael Welsh Duggan <md5i@schenley.com> * w32term.h (WM_MOUSEWHEEL): Define if not already defined. @@ -5812,7 +5812,7 @@ * w32fns.c (win32_wnd_proc): Capture and handle WM_MOUSEWHEEL events. Capture and handle WM_EMACS_TRACKPOPUPMENU events. - Allow a dragged selection from a popup menu started up + Allow a dragged selection from a popup menu started up by a mouse down event. (x_to_win32_color): Support for X Windows RGB string specifications. @@ -5831,13 +5831,13 @@ send address of menu to win32menu_show. (win32menu_show): Send message to call popup menu rather than trying directly. get_menu_event should take an address. - Call eat_mouse_events in order to get rid of any extraneous + Call eat_mouse_events in order to get rid of any extraneous mouse events. (list_of_panes): Only bring up one pane if the length of the list of panes is one. 1997-09-02 Nico Francois <nico.francois@scala.nl> - + * 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 @@ -5884,12 +5884,12 @@ * sysdep.c (sys_subshell) [DOS_NT]: Save and restore parent's working directory. (sys_subshell) [WINDOWSNT]: Share MSDOS code. Don't take console. - (init_sys_modes, reset_sys_modes) [WINDOWSNT]: Do it even with + (init_sys_modes, reset_sys_modes) [WINDOWSNT]: Do it even with a read_socket_hook. * xdisp.c (redisplay_internal): Check to see if frame is not obscured as well as visible. - + 1997-09-02 Michael Welsh Duggan <md5i@schenley.com> * lisp.h: Declare discard_mouse_events. @@ -5915,7 +5915,7 @@ in the detect_coding_iso2022 case. * minibuf.c (Fread_from_minibuffer, Fread_string): Doc fixes. - (Fread_no_blanks_input, Fcompleting_read): Doc fixes. + (Fread_no_blanks_input, Fcompleting_read): Doc fixes. * unexnext.c: Include unistd.h instead of libc.h. @@ -5997,7 +5997,7 @@ raw-text-unix. (Fdetect_coding_region): Do not select no-conversion even if EOL format of raw-text file is inconsistent. - + 1997-08-28 Kenichi Handa <handa@etl.go.jp> * coding.c (Qno_conversion, Qundecided): New variables. @@ -6160,7 +6160,7 @@ * fontset.c (Valternate_fontname_alist): Name changed from Valternative_fontname_alist. (syms_of_fontset): Adjusted for the above change. - + * fontset.h: Adjusted for the name change of Valternate_fontname_alist. @@ -6386,7 +6386,7 @@ * xrdb.c (X_DEFAULT_SEARCH_PATH): Add /usr/X11R6/lib alternatives. - * editfns.c (Fwiden, Fnarrow_to_region, save_restriction_restore): + * editfns.c (Fwiden, Fnarrow_to_region, save_restriction_restore): Don't set clip_changed if the new values are the same as the old. * fileio.c (Fwrite_region): Turn off the feature of checking @@ -6487,7 +6487,7 @@ 1997-08-02 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * coding.c: Doc fixes. - + * lread.c (Fload): New optional arg MUST-SUFFIX. * fns.c (Frequire): Pass t for the MUST-SUFFIX arg to Fload. * eval.c (do_autoload): Pass new arg to Fload. @@ -6553,7 +6553,7 @@ 1997-07-29 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu> * xterm.c (x_list_fonts): Reject a font whose min_bounds.width is 0. - + 1997-07-28 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * emacs.c (sort_args): Check properly for `--'. @@ -6687,12 +6687,12 @@ * keyboard.c (read_char): Delete spurious UNGCPRO. Add UNGCPRO before the longjmps to wrong_kboard_jmpbuf. Initialize c before the GCPRO1. - + * frame.c (Fdelete_frame): Undo previous change. * s/hpux8.h (LD_SWITCH_SYSTEM_TEMACS): Define this instead of LD_SWITCH_SYSTEM. - + * window.c (set_window_height): Allow all heights > 0 for minibuffer windows. (change_window_height): Fix one-off comparing DELTA with MAXIMUM. @@ -6929,7 +6929,7 @@ * w32.c (sys_shutdown): New function. * s/ms-win32.h: Define HAVE_SHUTDOWN. - + 1997-07-10 Eli Zaretskii <eliz@pogo.gnu.ai.mit.edu> * xfaces.c (Fset_face_attribute_internal): Set mouse_face_defer @@ -6961,7 +6961,7 @@ * xterm.c (x_load_font): Get value of fontp->height from ascent and descent members of structure font->max_bounds. - (dumpglyphs): Draw background by FillSolid if a font is too short. + (dumpglyphs): Draw background by FillSolid if a font is too short. 1997-07-08 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> @@ -6996,7 +6996,7 @@ * 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. @@ -7037,7 +7037,7 @@ emacs-mule, and set coding system for encoding to nil. (Fopen_network_stream): If enable-multibyte-characters is nil, set coding systems for decoding and encoding to nil. - + * fileio.c (Finsert_file_contents): If enable-multibyte-characters is nil, decode character code by emacs-mule. (Fwrite_region): Use buffer-file-coding-system for encoding if @@ -7138,7 +7138,7 @@ * syssignal.h (sigpause): Don't define if already defined. * Makefile.in (LD_SWITCH_SYSTEM_TEMACS): New variable. - + 1997-07-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile.in (lisp, shortlisp): Add widget.elc. @@ -7226,7 +7226,7 @@ (read_process_output): Use read instead of READ_CHILD_OUTPUT. * makefile.nt (OBJ2): Include new source files. - + * 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, @@ -7234,7 +7234,7 @@ [HAVE_NTGUI] (HAVE_MENUS): Define. (SYSTEM_PURESIZE_EXTRA): Increase value. - * unexw32.c, w32heap.c: Add pragma to force zero initialized + * unexw32.c, w32heap.c: Add pragma to force zero initialized data into .data segment. * w32console.c, w32term.c: Include charset.h. @@ -7325,7 +7325,7 @@ 1997-06-22 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * s/bsdos3.h: New file. - + * s/bsdos2.h (KERNEL_FILE): New overriding definition. * keyboard.c (read_avail_input): Check for failure with EIO. @@ -7336,7 +7336,7 @@ (KERNEL_FILE, UNEXEC): Don't redefine them if __linux__. [__linux__] (TEXT_START, DATA_START, DATA_SEG_BITS): Alternate definitions. - + * emacs.c (Fdump_emacs): Bind command-line-processed to nil here. * xdisp.c (init_xdisp): Pay attention to FRAME_MENU_BAR_LINES. @@ -7400,7 +7400,7 @@ * process.c (Fprocess_send_eof): Use shutdown, if it's a socket. Don't close the output descriptor if that is also the input descriptor. - + * config.in (HAVE_SHUTDOWN): Add #undef. * editfns.c (Fchar_before): Validate N after decrementing. @@ -7427,7 +7427,7 @@ 1997-06-15 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * process.c (wait_reading_process_input): When exiting because - the process WAIT_PROC has terminated, first read all its output. + the process WAIT_PROC has terminated, first read all its output. 1997-06-14 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> @@ -7461,7 +7461,7 @@ Don't define these if __ELF__. (RUN_TIME_REMAP, N_PAGSIZ, N_BSSADDR, N_TRELOFF): Likewise. - * m/alpha.h (TEXT_END, COFF, DATA_END): + * m/alpha.h (TEXT_END, COFF, DATA_END): Define them if __NetBSD__ just as if LINUX. (HAVE_TEXT_START): Define, if __NetBSD__ and __ELF__. @@ -7484,9 +7484,9 @@ * editfns.c (Finsert_char): Check QUIT. - * fontset.c (list_fontsets, fs_load_font): + * fontset.c (list_fontsets, fs_load_font): fast_c_string_match_ignore_case renamed. - + * xterm.c (x_list_fonts): fast_c_string_match_ignore_case renamed. * search.c (fast_c_string_match_ignore_case): @@ -7561,9 +7561,9 @@ 1997-06-01 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * lisp.h (VALMASK, GCTYPEMASK, MARKBIT, ARRAY_MARK_FLAG) - (PSEUDOVECTOR_FLAG, enum pvec_type, PSEUDOVECTOR_SIZE_MASK): + (PSEUDOVECTOR_FLAG, enum pvec_type, PSEUDOVECTOR_SIZE_MASK): Define regardless of NO_UNION_TYPE. - + * xfns.c (Fx_create_frame): Use XINT to access parent. * syntax.c (Fsyntax_table_p, check_syntax_table): Use EQ. @@ -7600,7 +7600,7 @@ (ORDINARY_LINK): Defined (if __NetBSD__). * s/netbsd.h [__alpha__] (NO_SHARED_LIBS): Defined. - + 1997-05-31 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * lread.c (init_lread): Sometimes add to load-path @@ -7642,7 +7642,7 @@ 1997-05-30 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> - * xterm.c (process_expose_from_menu, XTread_socket): + * 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. @@ -7753,7 +7753,7 @@ Simplify the call to x_real_positions. (x_make_frame_visible): Use win_gravity to decide whether to call XMoveWindow. Also, don't do it if frame already visible. - + * xfns.c (x_real_positions): Subtract border width from results. 1997-05-26 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> @@ -7803,11 +7803,11 @@ Always call x_wm_set_size_hint for them. No need to call XTranslateCoordinates here. (x_clear_errors): New function. - + 1997-05-20 Erik Naggum <erik@naggum.no> * editfns.c (Fformat_time_string): Doc update. - + 1997-05-20 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * editfns.c (Fformat_time_string): Doc update. @@ -7969,7 +7969,7 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> CODING_EOL_AUTOMATIC => CODING_EOL_UNDECIDED. * coding.c: Likewise. * fileio.c: Likewise. - + * xfns.c (Fx_create_frame): Delete unnecessary code. 1997-05-15 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> @@ -8009,7 +8009,7 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> (compute_trt_identity, compute_trt_shuffle): New subroutines. (init_casetab_once): Use XSETFASTINT to store into case table; use CHAR_TABLE_SINGLE_BYTE_SLOTS to end the loop. - + 1997-05-13 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * syntax.c (describe_syntax_1): Pass new args to describe_vector. @@ -8048,7 +8048,7 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> (copy_keymap_1, accessible_keymaps_char_table): New subroutines. (where_is_internal_1, where_is_internal_2): New functions. (syms_of_keymap): Set up Qchar_table_extra_slots prop on Qkeymap. - + 1997-05-10 Ken'ichi Handa <handa@etl.go.jp> * callproc.c (Fcall_process_region): Supply 7th new arg @@ -8151,7 +8151,7 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> * fileio.c (Fread_file_name): Finish previous change. - * coding.c (Fread_coding_system, Fread_non_nil_coding_system): + * coding.c (Fread_coding_system, Fread_non_nil_coding_system): Pass new arg to Fcompleting_read. * callint.c (Fcall_interactively): Pass new arg to Fcompleting_read. @@ -8231,7 +8231,7 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> 1997-04-30 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> - * xterm.c (XTmouse_position, x_term_init): + * xterm.c (XTmouse_position, x_term_init): Save value from x_catch_errors and pass to x_uncatch_errors. * xselect.c (x_own_selection, x_reply_selection_request) @@ -8405,14 +8405,14 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> SETUP_SYNTAX_TABLE_FOR_OBJECT): New macros. (struct gl_state_s): New struct. - * textprop.c: Style of comments corrected. + * textprop.c: Style of comments corrected. (interval_of): New function. 1997-04-14 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> * w16select.c: New file, MS-Windows clipboard support from Emacs running as MSDOS application. - + * s/msdos.h (SYMS_SYSTEM): Add `syms_of_win16select'. * Makefile.in (MSDOS_OBJ): Add w16select.o. @@ -8446,7 +8446,7 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> when REPLACE is handled by reading directly from the file. Use insert_1 to insert replacement text, to avoid query about whether to modify the buffer. - + 1997-04-10 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu> * Makefile.in (mallocobj): Make non-REL_ALLOC configuration work @@ -8496,7 +8496,7 @@ Thu May 15 22:21:18 1997 Ken'ichi Handa <handa@diazepam.gnu.ai.mit.edu> (init_alloc_once): Set trim and mmap malloc parms, when using glibc. * config.in (DOUG_LEA_MALLOC): Add #undef. - + * Makefile.in (mallocobj): Don't add gmalloc if using glibc. Drop check for `old malloc'; it isn't distributed with Emacs. @@ -8631,7 +8631,7 @@ Sun Apr 6 10:26:53 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> (Fcopy_file): Fix previous change. (Finsert_file_contents): Determine the character coding before we see if REPLACE can be handled. - Do handle REPLACE even if code conversion is needed. + Do handle REPLACE even if code conversion is needed. 1997-03-30 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> @@ -8664,10 +8664,10 @@ Sun Apr 6 10:26:53 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> 1997-03-22 Mark W. Eichin <eichin@kitten.gen.ma.us> * keyboard.c (make_lispy_event): Use iso_lispy_function_keys for - XK_ISO_* keys found in XFree86. + XK_ISO_* keys found in XFree86. (ISO_FUNCTION_KEY_OFFSET): New macro. (iso_lispy_function_keys): New table. - + * xterm.c (XTread_socket): Accept XK_ISO_* keys. 1997-03-19 Kenichi Handa <handa@etl.go.jp> @@ -8833,7 +8833,7 @@ Sun Apr 6 10:26:53 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> precisely. (Ffind_coding_system, syms_of_coding): Escape newlines in docstring. - + * charset.h (INC_POS, DEC_POS): Don't increase or decrease too much if there's binary code (invalid character code). @@ -8970,7 +8970,7 @@ Sun Apr 6 10:26:53 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> wordbeg, wordend, matchsyntax, and matchnotsyntax, code re-written to handle multibyte characters. Add code for case categoryspec and notcategoryspec. - + * regex.h (struct re_pattern_buffer): New member multibyte. 1997-02-21 Richard Stallman <rms@whiz-bang.gnu.ai.mit.edu> @@ -9381,7 +9381,7 @@ Sun Apr 6 10:26:53 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> 1997-02-14 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * print.c (print): Generate a backslash in \2e10. - + 1997-02-08 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> * window.c (change_window_height): Take size from multiple siblings, @@ -9432,7 +9432,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> that of the dividend. This does not yield a particularly accurate result, but at least it will be in the range promised by fmod. - + * doprnt.c: Include <float.h> if STDC_HEADERS. (DBL_MAX_10_EXP): Define if not defined; default is IEEE double. (doprnt1): Allocate enough buffer space to handle very large floating @@ -9487,7 +9487,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> Define these variables only if LOCALTIME_CACHE is defined. 1997-01-21 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> - + * msdos.c (run_msdos_command): Remove unused variables. (crlf_to_lf): Remove unused variables. (Fmsdos_downcase_filename): Remove unused variable. @@ -9517,7 +9517,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> * dispnew.c (init_display): Check for overflow in screen size. Use `fatal'. - + 1997-01-19 Geoff Voelker <voelker@cs.washington.edu> * w32.c (init_environment): Rebuild Vsystem_configuration at startup. @@ -9527,16 +9527,16 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> * w32gui.h: Renamed from win32.h. * dispextern.h, w32term.h, makefile.nt: Use new name w32gui.h. * makefile.nt: Update header comment. - - * w32console.c (initialize_w32_display): Renamed from + + * w32console.c (initialize_w32_display): Renamed from initialize_win_nt_display. * 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, winnt, and win32 into Windows 95, Windows NT, and W32, respectively. - Expand "win" substring in variables referring to Microsoft Windows + Expand "win" substring in variables referring to Microsoft Windows constructs into "windows". Canonicalize header comments to use same terminology. @@ -9684,7 +9684,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> Use BROKEN_MKTIME to determine whether mktime is broken. 1996-12-30 Paul Eggert <eggert@twinsun.com> - + * data.c, floatfns.c: <float.h>: Include if STDC_HEADERS. (IEEE_FLOATING_POINT): New symbol. * data.c (float_arith_driver, Fmod), floatfns.c (Ffloor): @@ -9725,7 +9725,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> * window.c (window_scroll): Preserve vpos of point if we cannot preserve the actual position of it. Make it static. New arg WHOLE; callers changed. - + * keyboard.c (read_char_x_menu_prompt): Unread and record all the input events from here. (record_menu_key): New subroutine. @@ -9876,7 +9876,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> * msdos.c (IT_cmgoto): Don't update FRAME_CURSOR_X when the cursor is in echo area. -1996-12-05 Erik Naggum <erik@naggum.no> +1996-12-05 Erik Naggum <erik@naggum.no> * keyboard.c (syms_of_keyboard): Doc fix. @@ -9944,7 +9944,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> * w32console.c: Renamed from w32term.c. * unexw32.c: Renamed from unexnt.c. * s/ms-w32.h: Renamed from s/windowsnt.h. - + * dispnew.c (init_display) [HAVE_NTGUI]: Use w32 for window-system. * Makefile.in, callproc.c, makefile.nt: Use new names for w32 files. @@ -10257,7 +10257,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> 1996-09-26 Marcus Daniels <marcus@sayre.sysc.pdx.edu> - * xfns.c (x_set_scroll_bar_width): Move cursor to the + * xfns.c (x_set_scroll_bar_width): Move cursor to the left margin, past a scroll bar, if any. 1996-09-26 Richard Stallman <rms@ethanol.gnu.ai.mit.edu> @@ -10372,7 +10372,7 @@ Sun Feb 2 10:36:26 1997 Eli Zaretskii <eliz@wombat.gnu.ai.mit.edu> 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 @@ -10421,7 +10421,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * 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 + (x_set_vertical_scroll_bars): Check for left<->right<->none scroll bar changes, and modify the vertical scroll bar type as appropriate. (x_figure_window_size): Use new SET_FRAME_WIDTH macro. @@ -10462,7 +10462,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * w32fns.c (Qright): New variable. (syms_of_win32fns): Initialize and staticpro Qright. - (x_set_vertical_scroll_bars): Check for left<->right<->none + (x_set_vertical_scroll_bars): Check for left<->right<->none scroll bar changes, and modify the vertical scroll bar type as appropriate. (x_figure_window_size): Use new SET_FRAME_WIDTH macro. @@ -10497,7 +10497,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> (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. - + * xterm.h (VERTICAL_SCROLL_BAR_INSIDE_WIDTH): Add frame as an argument, and use it to decrease the width in the case of a left-side scroll bar; this prevents the bar and adjacent text @@ -10517,7 +10517,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> `external_width' and `width'. (WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Modify to handle left-side scroll bars too. - + * window.h (WINDOW_LEFT_MARGIN): New macro. (WINDOW_RIGHT_EDGE, WINDOW_RIGHT_MARGIN): New macros. (WINDOW_FULL_WIDTH_P, WINDOW_RIGHTMOST_P): New macros. @@ -10528,7 +10528,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> (VERTICAL_SCROLL_BAR_TOP_RANGE): New arg F (not used). * xterm.c: Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT and VERTICAL_SCROLL_BAR_TOP_RANGE. - + * sysdep.c (init_system_name): Retry gethostbyname only 5 times and don't sleep after the last time. @@ -10592,7 +10592,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * window.c (Fset_window_start): Clear last_overlay_modified field. (set_window_height, set_window_width, Fset_window_buffer) - (change_window_height, window_scroll, Fset_window_configuration): + (change_window_height, window_scroll, Fset_window_configuration): Clear last_overlay_modified field. (Fpos_visible_in_window_p): Test last_overlay_modified field. @@ -10627,15 +10627,15 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * xdisp.c (overlay_unchanged_modified): New variable. (redisplay_internal): Set overlay_unchanged_modified. - * insdel.c (gap_left, gap_right, modify_region): + * insdel.c (gap_left, gap_right, modify_region): Compare overlay_unchanged_modified with OVERLAY_MODIFF. * buffer.c (modify_overlay): Renamed from redisplay_region moved here from xdisp.c, and made static. Callers changed. Update OVERLAY_MODIFF instead of MODIFF. * xdisp.c (redisplay_region): Renamed and moved to buffer.c. - - * s/sco5.h (C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM): + + * s/sco5.h (C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM): Don't define them if using GCC. 1996-09-13 Richard Stallman <rms@ethanol.gnu.ai.mit.edu> @@ -10674,7 +10674,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * keyboard.c (Fexecute_extended_command): Delete junk lines. Print the key bindings after the command, temporarily; then bring back the previous message. - + * buffer.c (syms_of_buffer): Doc fixes. * filelock.c (lock_superlock): Delete superlock file if it stayed @@ -10708,7 +10708,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> 1996-09-04 Richard Stallman <rms@ethanol.gnu.ai.mit.edu> * lisp.h: Add many declarations. - + * lisp.h (BITS_PER_EMACS_INT): New macro. (XMARKBIT): Test BITS_PER_EMACS_INT to conditionalize fast definition. * m/alpha.h (BITS_PER_EMACS_INT): New definition. @@ -10771,7 +10771,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * xterm.c (note_mouse_highlight): Pass POS argument to fast_find_position as int. - * textprop.c (set_properties, add_properties, remove_properties): + * textprop.c (set_properties, add_properties, remove_properties): Call modify_region with ints. * insdel.c (prepare_to_modify_buffer): Take integer arguments. @@ -10805,7 +10805,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * xfns.c (x_get_and_record_arg): New function. (x_icon): Use that, for Qicon_top and Qicon_left. (x_report_frame_params): Report the Qparent_id parameter. - + 1996-09-03 Paul Eggert <eggert@twinsun.com> * config.in (mktime): Define to emacs_mktime if we are using our own @@ -10879,7 +10879,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> 1996-08-31 Geoff Voelker <voelker@cs.washington.edu> - * Makefile.in (MSDOS_SUPPORT, WINNT_SUPPORT, SOME_MACHINE_LISP): + * Makefile.in (MSDOS_SUPPORT, WINNT_SUPPORT, SOME_MACHINE_LISP): Include dos-nt.elc. 1996-08-31 Richard Stallman <rms@ethanol.gnu.ai.mit.edu> @@ -10966,7 +10966,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> to the error message. * macros.h (executing_macro_iterations, executing_macro): Declared. - + * macros.c (executing_macro_iterations, executing_macro): New vars. (Fexecute_kbd_macro): Set them. @@ -11016,7 +11016,7 @@ Fri Sep 20 02:37:37 1996 Marcus Daniels <marcus@sayre.sysc.pdx.edu> * s/sunos413.h: Renamed from s/sunos4-1-3.h. * s/dgux5-4-3.h: Renamed from s/dgux5-4r3.h. * s/sunos4-1-2.h: File deleted. - + * xmenu.c (set_frame_menubar): Don't add ibw to menubar_size. * xfns.c (x_window): Don't add ibw to menubar_size. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 978bf7e0429..1c2f7820bb5 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -1089,7 +1089,7 @@ * xfns.c (Fx_show_busy_cursor): Doc-fix. (Fx_hide_busy_cursor): Ditto. -1999-11-17 Marco Walther <walther@siemens-pyramid.com> +1999-11-17 Marco Walther <walther@siemens-pyramid.com> * unexsni.c (unexec): Handle .rel.dyn section. @@ -1807,7 +1807,7 @@ Don't call XSetInputFocus because that can generate additional FocusIn events. -1999-10-07 Jeffrey C Honig <jch@bsdi.com> +1999-10-07 Jeffrey C Honig <jch@bsdi.com> * bsdos4.h [HAVE_LIBNCURSES]: Define TERMINFO and LIBS_TERMCAP. @@ -4039,7 +4039,7 @@ (Fputhash): Ditto. (Fremhash): Ditto. -1999-07-26 Gerd Moellmann <gerd@gnu.org> +1999-07-26 Gerd Moellmann <gerd@gnu.org> * widget.c (EmacsFrameSetCharSize): Don't add XtNborderWidth value to frame width and height. @@ -11346,7 +11346,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * editfns.c (Fuser_full_name): Doc fix. -1999-06-14 Tak Ota <ota@atc.sel.sony.com> +1999-06-14 Tak Ota <ota@atc.sel.sony.com> * w32bdf.c: (clear_cached_bitmap_slots): Remove. (get_bitmap_with_cache): Check if CreateBitmap failed. @@ -11355,7 +11355,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> Do cache clearing inline. Move global variables to local scope. -1999-06-13 Wolfgang Glas <Wolfgang.Glas@hfm.tu-graz.ac.at> +1999-06-13 Wolfgang Glas <Wolfgang.Glas@hfm.tu-graz.ac.at> * unexsgi.c (unexec): Dump the .rodata section from memory under IRIX6.5 in order to be able to unexec with gcc. @@ -11536,11 +11536,11 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * w32term.c (dumpglyphs): Always fill background for italic fonts. -1999-05-03 Eli Zaretskii <eliz@is.elta.co.il> +1999-05-03 Eli Zaretskii <eliz@is.elta.co.il> * dired.c (make_time): Make argument type be time_t. -1999-05-02 Eli Zaretskii <eliz@is.elta.co.il> +1999-05-02 Eli Zaretskii <eliz@is.elta.co.il> * msdos.c (unibyte_display_via_language_environment): Add extern. @@ -11813,7 +11813,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * filelock.c (get_boot_time): Test tempname, not filename. -1999-03-17 Jason Rumney <jasonr@altavista.net> +1999-03-17 Jason Rumney <jasonr@altavista.net> * w32bdf.h: Merged patches from Meadow; introduce bitmap cache to speed display. @@ -11851,7 +11851,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * macros.c (Fexecute_kbd_macro): Initialize executing_macro_iterations at beginning. -1999-03-14 Jason Rumney <jasonr@altavista.net> +1999-03-14 Jason Rumney <jasonr@altavista.net> * w32fns.c (w32_strict_fontnames): New variable. (Fx_create_frame): Formatting fix. @@ -11902,7 +11902,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * makefile.nt: Remove common multiple file compilation commands. -1999-03-04 Takeshi YAMADA <yamada@cslab.kecl.ntt.co.jp> +1999-03-04 Takeshi YAMADA <yamada@cslab.kecl.ntt.co.jp> * fns.c (Fbase64_encode_string): Allocate sufficient memory for newlines added when the arg NO-LINE-BREAK is nil. @@ -12229,7 +12229,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * makefile.nt: Use full path to temacs.exe when dumping. -1999-01-27 Jason Rumney <jasonr@altavista.net> +1999-01-27 Jason Rumney <jasonr@altavista.net> * w32fns.c (w32_load_system_font): Do not load unlisted fonts if list was reliable. @@ -12291,7 +12291,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> to set prev_from_syntax, above start of main loop. At startinstring, check syntax when checking for a match. -1999-01-22 Jason Rumney <jasonr@altavista.net> +1999-01-22 Jason Rumney <jasonr@altavista.net> * w32bdf.c: New file. * w32bdf.h: New file. @@ -12349,7 +12349,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * xterm.c (same_x_server): Detect treat ":0" and "unix:0" as the same. Treat "myname:0" as the same as those two. -1999-01-19 Jason Rumney <jasonr@altavista.net> +1999-01-19 Jason Rumney <jasonr@altavista.net> * w32fns.c (x_to_w32_charset): Add iso8859-9. (w32_to_x_charset): Fix charset mappings. @@ -13203,7 +13203,7 @@ Wed Jun 25 15:22:58 1997 Gerd Moellmann <gerd@acm.org> * m/ews4800.h, s/ux4800.h: New files. -1998-11-03 Theodore Jump <tjump@tertius.com> +1998-11-03 Theodore Jump <tjump@tertius.com> * makefile.nt: Compile multiple source files when possible. diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index 659397a3730..224b8384f5a 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 @@ -2249,7 +2249,7 @@ (live_float_p, live_misc_p): Return 1 only if the offset of the pointer in its block is >= 0. -2001-03-28 Paul Eggert <eggert@twinsun.com> +2001-03-28 Paul Eggert <eggert@twinsun.com> * editfns.c (Ffloat_time): Fix off-by-factor-of-10 bug in the microseconds calcuation. Avoid double-rounding problem. @@ -6656,7 +6656,7 @@ gai_strerror. Make sure xerrno is set if connect fails. Improve error recovery. -2000-09-29 Jason Rumney <jasonr@gnu.org> +2000-09-29 Jason Rumney <jasonr@gnu.org> * w32term.c (w32_char_font_type, w32_encode_char) (x_produce_glyphs): Distinguish single and multibyte BDF fonts. @@ -8340,7 +8340,7 @@ * keymap.c (Fsingle_key_description): Add parameter NO_ANGLES. Callers changed. -2000-08-02 Colin Walters <walters@cis.ohio-state.edu> +2000-08-02 Colin Walters <walters@cis.ohio-state.edu> * window.c (display_buffer_reuse_frames): New variable. (Fdisplay_buffer): If display_buffer_reuse_frames is set, reuse @@ -12619,7 +12619,7 @@ * msdos.c (XMenuActivate): Turn off the cursor after displaying the help message. -2000-02-07 Eli Zaretskii <eliz@is.elta.co.il> +2000-02-07 Eli Zaretskii <eliz@is.elta.co.il> * s/msdos.h (INTERNAL_TERMINAL): Add capabilities se, so, us, ue, md, mh, mb, mr, and me to the fake termcap entry. @@ -12659,7 +12659,7 @@ the string constant limit (2048 bytes) in MSVC. (main): Ditto. -2000-02-05 INOUE Seiichiro <inoue@ainet.or.jp> +2000-02-05 INOUE Seiichiro <inoue@ainet.or.jp> * xterm.c (x_display_and_set_cursor) [HAVE_X_I18N]: Set pre-edit area. (x_display_cursor) [HAVE_X_I18N]: Don't set it here. @@ -12800,7 +12800,7 @@ (create_frame_xic): Renamed from xic_create_frame. (free_frame_xic): Renamed from xic_destroy_frame. -2000-01-29 INOUE Seiichiro <inoue@ainet.or.jp> +2000-01-29 INOUE Seiichiro <inoue@ainet.or.jp> * xterm.c (XTread_socket) [HAVE_X_I18N]: If event is for none of our frames, call XFilterEvent with 2nd parameter `None'. @@ -12977,7 +12977,7 @@ (x_produce_glyphs): Calculate per char metrics for a character that we know exists in default font when font_not_found_p is true. -2000-01-22 Jason Rumney <jasonr@gnu.org> +2000-01-22 Jason Rumney <jasonr@gnu.org> * makefile.nt (intervals.obj, composite.obj): New modules. (composite.h): Added as dependency where appropriate. diff --git a/src/abbrev.c b/src/abbrev.c index 2939b138d3f..ae675bb310e 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -303,7 +303,7 @@ Returns the abbrev symbol, if expansion took place. */) c = FETCH_BYTE (idx_byte); idx++, idx_byte++; } - + if (UPPERCASEP (c)) c = DOWNCASE (c), uccount++; else if (! NOCASEP (c)) diff --git a/src/alloc.c b/src/alloc.c index 61ea3565153..20240136526 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -356,7 +356,7 @@ struct mem_node /* Node color. */ enum {MEM_BLACK, MEM_RED} color; - + /* Memory type. */ enum mem_type type; }; @@ -596,14 +596,14 @@ lisp_malloc (nbytes, type) #ifdef GC_MALLOC_CHECK allocated_mem_type = type; #endif - + val = (void *) malloc (nbytes); #if GC_MARK_STACK && !defined GC_MALLOC_CHECK if (val && type != MEM_TYPE_NON_LISP) mem_insert (val, (char *) val + nbytes, type); #endif - + UNBLOCK_INPUT; if (!val && nbytes) memory_full (); @@ -617,7 +617,7 @@ lisp_malloc (nbytes, type) struct buffer * allocate_buffer () { - struct buffer *b + struct buffer *b = (struct buffer *) lisp_malloc (sizeof (struct buffer), MEM_TYPE_BUFFER); VALIDATE_LISP_STORAGE (b, sizeof *b); @@ -674,7 +674,7 @@ emacs_blocked_free (ptr) if (ptr) { struct mem_node *m; - + m = mem_find (ptr); if (m == MEM_NIL || m->start != ptr) { @@ -689,10 +689,10 @@ emacs_blocked_free (ptr) } } #endif /* GC_MALLOC_CHECK */ - + __free_hook = old_free_hook; free (ptr); - + /* If we released our reserve (due to running out of memory), and we have a fair amount free once again, try to set aside another reserve in case we run out once more. */ @@ -762,7 +762,7 @@ emacs_blocked_malloc (size) } } #endif /* GC_MALLOC_CHECK */ - + __malloc_hook = emacs_blocked_malloc; UNBLOCK_INPUT; @@ -797,9 +797,9 @@ emacs_blocked_realloc (ptr, size) mem_delete (m); } - + /* fprintf (stderr, "%p -> realloc\n", ptr); */ - + /* Prevent malloc from registering blocks. */ dont_register_blocks = 1; #endif /* GC_MALLOC_CHECK */ @@ -820,10 +820,10 @@ emacs_blocked_realloc (ptr, size) /* Can't handle zero size regions in the red-black tree. */ mem_insert (value, (char *) value + max (size, 1), MEM_TYPE_NON_LISP); } - + /* fprintf (stderr, "%p <- realloc\n", value); */ #endif /* GC_MALLOC_CHECK */ - + __realloc_hook = emacs_blocked_realloc; UNBLOCK_INPUT; @@ -1069,13 +1069,13 @@ struct sdata struct Lisp_String *string; #ifdef GC_CHECK_STRING_BYTES - + EMACS_INT nbytes; unsigned char data[1]; - + #define SDATA_NBYTES(S) (S)->nbytes #define SDATA_DATA(S) (S)->data - + #else /* not GC_CHECK_STRING_BYTES */ union @@ -1086,7 +1086,7 @@ struct sdata /* When STRING is null. */ EMACS_INT nbytes; } u; - + #define SDATA_NBYTES(S) (S)->u.nbytes #define SDATA_DATA(S) (S)->u.data @@ -1165,7 +1165,7 @@ static int total_string_size; S must be live, i.e. S->data must not be null. S->data is actually a pointer to the `u.data' member of its sdata structure; the structure starts at a constant offset in front of that. */ - + #ifdef GC_CHECK_STRING_BYTES #define SDATA_OF_STRING(S) \ @@ -1238,7 +1238,7 @@ string_bytes (s) abort (); return nbytes; } - + /* Check validity of Lisp strings' string_bytes member in B. */ void @@ -1246,25 +1246,25 @@ check_sblock (b) struct sblock *b; { struct sdata *from, *end, *from_end; - + end = b->next_free; - + for (from = &b->first_data; from < end; from = from_end) { /* Compute the next FROM here because copying below may overwrite data we need to compute it. */ int nbytes; - + /* Check that the string size recorded in the string is the same as the one recorded in the sdata structure. */ if (from->string) CHECK_STRING_BYTES (from->string); - + if (from->string) nbytes = GC_STRING_BYTES (from->string); else nbytes = SDATA_NBYTES (from); - + nbytes = SDATA_SIZE (nbytes); from_end = (struct sdata *) ((char *) from + nbytes); } @@ -1289,7 +1289,7 @@ check_string_bytes (all_p) if (s) CHECK_STRING_BYTES (s); } - + for (b = oldest_sblock; b; b = b->next) check_sblock (b); } @@ -1395,12 +1395,12 @@ allocate_string_data (s, nchars, nbytes) #endif b = (struct sblock *) lisp_malloc (size, MEM_TYPE_NON_LISP); - + #ifdef DOUG_LEA_MALLOC /* Back to a reasonable maximum of mmap'ed areas. */ mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); #endif - + b->next_free = &b->first_data; b->first_data.string = NULL; b->next = large_sblocks; @@ -1428,7 +1428,7 @@ allocate_string_data (s, nchars, nbytes) old_data = s->data ? SDATA_OF_STRING (s) : NULL; old_nbytes = GC_STRING_BYTES (s); - + data = b->next_free; data->string = s; s->data = SDATA_DATA (data); @@ -1439,7 +1439,7 @@ allocate_string_data (s, nchars, nbytes) s->size_byte = nbytes; s->data[nbytes] = '\0'; b->next_free = (struct sdata *) ((char *) data + needed); - + /* If S had already data assigned, mark that as free by setting its string back-pointer to null, and recording the size of the data in it. */ @@ -1460,7 +1460,7 @@ sweep_strings () { struct string_block *b, *next; struct string_block *live_blocks = NULL; - + string_free_list = NULL; total_strings = total_free_strings = 0; total_string_size = 0; @@ -1484,7 +1484,7 @@ sweep_strings () { /* String is live; unmark it and its intervals. */ UNMARK_STRING (s); - + if (!NULL_INTERVAL_P (s->intervals)) UNMARK_BALANCE_INTERVALS (s->intervals); @@ -1556,7 +1556,7 @@ free_large_strings () { struct sblock *b, *next; struct sblock *live_blocks = NULL; - + for (b = large_sblocks; b; b = next) { next = b->next; @@ -1597,7 +1597,7 @@ compact_small_strings () { end = b->next_free; xassert ((char *) end <= (char *) b + SBLOCK_SIZE); - + for (from = &b->first_data; from < end; from = from_end) { /* Compute the next FROM here because copying below may @@ -1611,15 +1611,15 @@ compact_small_strings () && GC_STRING_BYTES (from->string) != SDATA_NBYTES (from)) abort (); #endif /* GC_CHECK_STRING_BYTES */ - + if (from->string) nbytes = GC_STRING_BYTES (from->string); else nbytes = SDATA_NBYTES (from); - + nbytes = SDATA_SIZE (nbytes); from_end = (struct sdata *) ((char *) from + nbytes); - + /* FROM->string non-null means it's alive. Copy its data. */ if (from->string) { @@ -1633,7 +1633,7 @@ compact_small_strings () to = &tb->first_data; to_end = (struct sdata *) ((char *) to + nbytes); } - + /* Copy, and update the string's `data' pointer. */ if (from != to) { @@ -1700,7 +1700,7 @@ Both LENGTH and INIT must be numbers. */) p += len; } } - + *p = 0; return val; } @@ -1728,16 +1728,16 @@ LENGTH must be a number. INIT matters only in whether it is t or nil. */) slot `size' of the struct Lisp_Bool_Vector. */ val = Fmake_vector (make_number (length_in_elts + 1), Qnil); p = XBOOL_VECTOR (val); - + /* Get rid of any bits that would cause confusion. */ p->vector_size = 0; XSETBOOL_VECTOR (val, p); p->size = XFASTINT (length); - + real_init = (NILP (init) ? 0 : -1); for (i = 0; i < length_in_chars ; i++) p->data[i] = real_init; - + /* Clear the extraneous bits in the last byte. */ if (XINT (length) != length_in_chars * BITS_PER_CHAR) XBOOL_VECTOR (val)->data[length_in_chars - 1] @@ -1982,7 +1982,7 @@ make_float (float_value) } XSETFLOAT (val, &float_block->floats[float_block_index++]); } - + XFLOAT_DATA (val) = float_value; XSETFASTINT (XFLOAT (val)->type, 0); /* bug chasing -wsr */ consing_since_gc += sizeof (struct Lisp_Float); @@ -2089,7 +2089,7 @@ DEFUN ("cons", Fcons, Scons, 2, 2, 0, } XSETCONS (val, &cons_block->conses[cons_block_index++]); } - + XSETCAR (val, car); XSETCDR (val, cdr); consing_since_gc += sizeof (struct Lisp_Cons); @@ -2174,17 +2174,17 @@ DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0, { val = Fcons (init, val); --size; - + if (size > 0) { val = Fcons (init, val); --size; - + if (size > 0) { val = Fcons (init, val); --size; - + if (size > 0) { val = Fcons (init, val); @@ -2196,7 +2196,7 @@ DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0, QUIT; } - + return val; } @@ -2232,15 +2232,15 @@ allocate_vectorlike (len, type) a dumped Emacs. */ mallopt (M_MMAP_MAX, 0); #endif - + nbytes = sizeof *p + (len - 1) * sizeof p->contents[0]; p = (struct Lisp_Vector *) lisp_malloc (nbytes, type); - + #ifdef DOUG_LEA_MALLOC /* Back to a reasonable maximum of mmap'ed areas. */ mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); #endif - + VALIDATE_LISP_STORAGE (p, 0); consing_since_gc += nbytes; vector_cells_consed += len; @@ -2272,11 +2272,11 @@ allocate_hash_table () EMACS_INT len = VECSIZE (struct Lisp_Hash_Table); struct Lisp_Vector *v = allocate_vectorlike (len, MEM_TYPE_HASH_TABLE); EMACS_INT i; - + v->size = len; for (i = 0; i < len; ++i) v->contents[i] = Qnil; - + return (struct Lisp_Hash_Table *) v; } @@ -2287,11 +2287,11 @@ allocate_window () EMACS_INT len = VECSIZE (struct window); struct Lisp_Vector *v = allocate_vectorlike (len, MEM_TYPE_WINDOW); EMACS_INT i; - + for (i = 0; i < len; ++i) v->contents[i] = Qnil; v->size = len; - + return (struct window *) v; } @@ -2302,7 +2302,7 @@ allocate_frame () EMACS_INT len = VECSIZE (struct frame); struct Lisp_Vector *v = allocate_vectorlike (len, MEM_TYPE_FRAME); EMACS_INT i; - + for (i = 0; i < len; ++i) v->contents[i] = make_number (0); v->size = len; @@ -2316,11 +2316,11 @@ allocate_process () EMACS_INT len = VECSIZE (struct Lisp_Process); struct Lisp_Vector *v = allocate_vectorlike (len, MEM_TYPE_PROCESS); EMACS_INT i; - + for (i = 0; i < len; ++i) v->contents[i] = Qnil; v->size = len; - + return (struct Lisp_Process *) v; } @@ -2331,11 +2331,11 @@ allocate_other_vector (len) { struct Lisp_Vector *v = allocate_vectorlike (len, MEM_TYPE_VECTOR); EMACS_INT i; - + for (i = 0; i < len; ++i) v->contents[i] = Qnil; v->size = len; - + return v; } @@ -2547,7 +2547,7 @@ Its value and function definition are void, and its property list is nil. */) } XSETSYMBOL (val, &symbol_block->symbols[symbol_block_index++]); } - + p = XSYMBOL (val); p->xname = name; p->plist = Qnil; @@ -2628,7 +2628,7 @@ allocate_misc () } XSETMISC (val, &marker_block->markers[marker_block_index++]); } - + consing_since_gc += sizeof (union Lisp_Misc); misc_objects_consed++; return val; @@ -2713,7 +2713,7 @@ make_event_array (nargs, args) characters, so we can make a string. */ { Lisp_Object result; - + result = Fmake_string (make_number (nargs), make_number (0)); for (i = 0; i < nargs; i++) { @@ -2722,7 +2722,7 @@ make_event_array (nargs, args) if (XINT (args[i]) & CHAR_META) SSET (result, i, SREF (result, i) | 0x80); } - + return result; } } @@ -2805,7 +2805,7 @@ mem_insert (start, end, type) parent = NULL; #if GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS - + while (c != MEM_NIL) { if (start >= c->start && start < c->end) @@ -2813,15 +2813,15 @@ mem_insert (start, end, type) parent = c; c = start < c->start ? c->left : c->right; } - + #else /* GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS */ - + while (c != MEM_NIL) { parent = c; c = start < c->start ? c->left : c->right; } - + #endif /* GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS */ /* Create a new node. */ @@ -2847,7 +2847,7 @@ mem_insert (start, end, type) else parent->right = x; } - else + else mem_root = x; /* Re-establish red-black tree properties. */ @@ -2868,13 +2868,13 @@ mem_insert_fixup (x) { /* X is red and its parent is red. This is a violation of red-black tree property #3. */ - + if (x->parent == x->parent->parent->left) { /* We're on the left side of our grandparent, and Y is our "uncle". */ struct mem_node *y = x->parent->parent->right; - + if (y->color == MEM_RED) { /* Uncle and parent are red but should be black because @@ -2904,7 +2904,7 @@ mem_insert_fixup (x) { /* This is the symmetrical case of above. */ struct mem_node *y = x->parent->parent->left; - + if (y->color == MEM_RED) { x->parent->color = MEM_BLACK; @@ -2919,7 +2919,7 @@ mem_insert_fixup (x) x = x->parent; mem_rotate_right (x); } - + x->parent->color = MEM_BLACK; x->parent->parent->color = MEM_RED; mem_rotate_left (x->parent->parent); @@ -2933,8 +2933,8 @@ mem_insert_fixup (x) } -/* (x) (y) - / \ / \ +/* (x) (y) + / \ / \ a (y) ===> (x) c / \ / \ b c a b */ @@ -2973,10 +2973,10 @@ mem_rotate_left (x) } -/* (x) (Y) - / \ / \ - (y) c ===> a (x) - / \ / \ +/* (x) (Y) + / \ / \ + (y) c ===> a (x) + / \ / \ a b b c */ static void @@ -2988,7 +2988,7 @@ mem_rotate_right (x) x->left = y->right; if (y->right != MEM_NIL) y->right->parent = x; - + if (y != MEM_NIL) y->parent = x->parent; if (x->parent) @@ -3000,7 +3000,7 @@ mem_rotate_right (x) } else mem_root = y; - + y->right = x; if (x != MEM_NIL) x->parent = y; @@ -3049,7 +3049,7 @@ mem_delete (z) z->end = y->end; z->type = y->type; } - + if (y->color == MEM_BLACK) mem_delete_fixup (x); @@ -3073,7 +3073,7 @@ mem_delete_fixup (x) if (x == x->parent->left) { struct mem_node *w = x->parent->right; - + if (w->color == MEM_RED) { w->color = MEM_BLACK; @@ -3081,7 +3081,7 @@ mem_delete_fixup (x) mem_rotate_left (x->parent); w = x->parent->right; } - + if (w->left->color == MEM_BLACK && w->right->color == MEM_BLACK) { w->color = MEM_RED; @@ -3106,7 +3106,7 @@ mem_delete_fixup (x) else { struct mem_node *w = x->parent->left; - + if (w->color == MEM_RED) { w->color = MEM_BLACK; @@ -3114,7 +3114,7 @@ mem_delete_fixup (x) mem_rotate_right (x->parent); w = x->parent->left; } - + if (w->right->color == MEM_BLACK && w->left->color == MEM_BLACK) { w->color = MEM_RED; @@ -3129,7 +3129,7 @@ mem_delete_fixup (x) mem_rotate_left (w); w = x->parent->left; } - + w->color = x->parent->color; x->parent->color = MEM_BLACK; w->left->color = MEM_BLACK; @@ -3138,7 +3138,7 @@ mem_delete_fixup (x) } } } - + x->color = MEM_BLACK; } @@ -3206,7 +3206,7 @@ live_symbol_p (m, p) { struct symbol_block *b = (struct symbol_block *) m->start; int offset = (char *) p - (char *) &b->symbols[0]; - + /* P must point to the start of a Lisp_Symbol, not be one of the unused cells in the current symbol block, and not be on the free-list. */ @@ -3233,7 +3233,7 @@ live_float_p (m, p) { struct float_block *b = (struct float_block *) m->start; int offset = (char *) p - (char *) &b->floats[0]; - + /* P must point to the start of a Lisp_Float, not be one of the unused cells in the current float block, and not be on the free-list. */ @@ -3260,7 +3260,7 @@ live_misc_p (m, p) { struct marker_block *b = (struct marker_block *) m->start; int offset = (char *) p - (char *) &b->markers[0]; - + /* P must point to the start of a Lisp_Misc, not be one of the unused cells in the current misc block, and not be on the free-list. */ @@ -3366,7 +3366,7 @@ mark_maybe_object (obj) { void *po = (void *) XPNTR (obj); struct mem_node *m = mem_find (po); - + if (m != MEM_NIL) { int mark_p = 0; @@ -3412,12 +3412,12 @@ mark_maybe_object (obj) case Lisp_Misc_Marker: mark_p = !XMARKBIT (XMARKER (obj)->chain); break; - + case Lisp_Misc_Buffer_Local_Value: case Lisp_Misc_Some_Buffer_Local_Value: mark_p = !XMARKBIT (XBUFFER_LOCAL_VALUE (obj)->realvalue); break; - + case Lisp_Misc_Overlay: mark_p = !XMARKBIT (XOVERLAY (obj)->plist); break; @@ -3456,30 +3456,30 @@ mark_maybe_pointer (p) assume that Lisp data is aligned on even addresses. */ if ((EMACS_INT) p & 1) return; - + m = mem_find (p); if (m != MEM_NIL) { Lisp_Object obj = Qnil; - + switch (m->type) { case MEM_TYPE_NON_LISP: /* Nothing to do; not a pointer to Lisp memory. */ break; - + case MEM_TYPE_BUFFER: if (live_buffer_p (m, p) && !XMARKBIT (((struct buffer *) p)->name)) XSETVECTOR (obj, p); break; - + case MEM_TYPE_CONS: if (live_cons_p (m, p) && !XMARKBIT (((struct Lisp_Cons *) p)->car)) XSETCONS (obj, p); break; - + case MEM_TYPE_STRING: if (live_string_p (m, p) && !STRING_MARKED_P ((struct Lisp_String *) p)) @@ -3491,20 +3491,20 @@ mark_maybe_pointer (p) { Lisp_Object tem; XSETMISC (tem, p); - + switch (XMISCTYPE (tem)) { case Lisp_Misc_Marker: if (!XMARKBIT (XMARKER (tem)->chain)) obj = tem; break; - + case Lisp_Misc_Buffer_Local_Value: case Lisp_Misc_Some_Buffer_Local_Value: if (!XMARKBIT (XBUFFER_LOCAL_VALUE (tem)->realvalue)) obj = tem; break; - + case Lisp_Misc_Overlay: if (!XMARKBIT (XOVERLAY (tem)->plist)) obj = tem; @@ -3512,19 +3512,19 @@ mark_maybe_pointer (p) } } break; - + case MEM_TYPE_SYMBOL: if (live_symbol_p (m, p) && !XMARKBIT (((struct Lisp_Symbol *) p)->plist)) XSETSYMBOL (obj, p); break; - + case MEM_TYPE_FLOAT: if (live_float_p (m, p) && !XMARKBIT (((struct Lisp_Float *) p)->type)) XSETFLOAT (obj, p); break; - + case MEM_TYPE_VECTOR: case MEM_TYPE_PROCESS: case MEM_TYPE_HASH_TABLE: @@ -3552,7 +3552,7 @@ mark_maybe_pointer (p) /* Mark Lisp objects referenced from the address range START..END. */ -static void +static void mark_memory (start, end) void *start, *end; { @@ -3593,7 +3593,7 @@ mark_memory (start, end) Here, `obj' isn't really used, and the compiler optimizes it away. The only reference to the life string is through the pointer `s'. */ - + for (pp = (void **) start; (void *) pp < end; ++pp) mark_maybe_pointer (*pp); } @@ -3783,14 +3783,14 @@ mark_stack () #ifdef sparc asm ("ta 3"); #endif - + /* Save registers that we need to see on the stack. We need to see registers used to hold register variables and registers used to pass parameters. */ #ifdef GC_SAVE_REGISTERS_ON_STACK GC_SAVE_REGISTERS_ON_STACK (end); #else /* not GC_SAVE_REGISTERS_ON_STACK */ - + #ifndef GC_SETJMP_WORKS /* If it hasn't been checked yet that setjmp will definitely work, test it and print a message with the result @@ -3801,7 +3801,7 @@ mark_stack () test_setjmp (); } #endif /* GC_SETJMP_WORKS */ - + setjmp (j); end = stack_grows_down_p ? (char *) &j + sizeof j : (char *) &j; #endif /* not GC_SAVE_REGISTERS_ON_STACK */ @@ -4146,7 +4146,7 @@ Garbage collection happens automatically if you cons more than Qt tends to return NULL, which effectively turns undo back on. So don't call truncate_undo_list if undo_list is Qt. */ if (! EQ (nextb->undo_list, Qt)) - nextb->undo_list + nextb->undo_list = truncate_undo_list (nextb->undo_list, undo_limit, undo_strong_limit); @@ -4199,7 +4199,7 @@ Garbage collection happens automatically if you cons more than XMARK (tail->var[i]); } #endif - + mark_byte_stack (); for (bind = specpdl; bind != specpdl_ptr; bind++) { @@ -4210,12 +4210,12 @@ Garbage collection happens automatically if you cons more than { mark_object (&catch->tag); mark_object (&catch->val); - } + } for (handler = handlerlist; handler; handler = handler->next) { mark_object (&handler->handler); mark_object (&handler->var); - } + } for (backlist = backtrace_list; backlist; backlist = backlist->next) { if (!XMARKBIT (*backlist->function)) @@ -4233,7 +4233,7 @@ Garbage collection happens automatically if you cons more than mark_object (&backlist->args[i]); XMARK (backlist->args[i]); } - } + } mark_kboards (); /* Look thru every buffer's undo list @@ -4300,7 +4300,7 @@ Garbage collection happens automatically if you cons more than for (i = 0; i < tail->nvars; i++) XUNMARK (tail->var[i]); #endif - + unmark_byte_stack (); for (backlist = backtrace_list; backlist; backlist = backlist->next) { @@ -4311,7 +4311,7 @@ Garbage collection happens automatically if you cons more than i = backlist->nargs - 1; for (; i >= 0; i--) XUNMARK (backlist->args[i]); - } + } XUNMARK (buffer_defaults.name); XUNMARK (buffer_local_symbols.name); @@ -4357,7 +4357,7 @@ Garbage collection happens automatically if you cons more than { /* Compute average percentage of zombies. */ double nlive = 0; - + for (i = 0; i < 7; ++i) if (CONSP (total[i])) nlive += XFASTINT (XCAR (total[i])); @@ -4408,7 +4408,7 @@ mark_glyph_matrix (matrix) { struct glyph *glyph = row->glyphs[area]; struct glyph *end_glyph = glyph + row->used[area]; - + for (; glyph < end_glyph; ++glyph) if (GC_STRINGP (glyph->object) && !STRING_MARKED_P (XSTRING (glyph->object))) @@ -4450,7 +4450,7 @@ mark_image (img) struct image *img; { mark_object (&img->spec); - + if (!NILP (img->data.lisp_val)) mark_object (&img->data.lisp_val); } @@ -4538,13 +4538,13 @@ mark_object (argptr) CHECK_ALLOCATED (); \ CHECK_LIVE (LIVEP); \ } while (0) \ - + #else /* not GC_CHECK_MARKED_OBJECTS */ - + #define CHECK_ALLOCATED() (void) 0 #define CHECK_LIVE(LIVEP) (void) 0 #define CHECK_ALLOCATED_AND_LIVE(LIVEP) (void) 0 - + #endif /* not GC_CHECK_MARKED_OBJECTS */ switch (SWITCH_ENUM_CAST (XGCTYPE (obj))) @@ -4571,7 +4571,7 @@ mark_object (argptr) && po != &buffer_local_symbols) abort (); #endif /* GC_CHECK_MARKED_OBJECTS */ - + if (GC_BUFFERP (obj)) { if (!XMARKBIT (XBUFFER (obj)->name)) @@ -4602,7 +4602,7 @@ mark_object (argptr) if (size & ARRAY_MARK_FLAG) break; /* Already marked */ - + CHECK_LIVE (live_vector_p); ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */ size &= PSEUDOVECTOR_SIZE_MASK; @@ -4695,18 +4695,18 @@ mark_object (argptr) { struct Lisp_Hash_Table *h = XHASH_TABLE (obj); EMACS_INT size = h->size; - + /* Stop if already marked. */ if (size & ARRAY_MARK_FLAG) break; - + /* Mark it. */ CHECK_LIVE (live_vector_p); h->size |= ARRAY_MARK_FLAG; /* Mark contents. */ /* Do not mark next_free or next_weak. - Being in the next_weak chain + Being in the next_weak chain should not keep the hash table alive. No need to mark `count' since it is an integer. */ mark_object (&h->test); @@ -4725,7 +4725,7 @@ mark_object (argptr) mark_object (&h->key_and_value); else XVECTOR (h->key_and_value)->size |= ARRAY_MARK_FLAG; - + } else { @@ -4759,7 +4759,7 @@ mark_object (argptr) if (!PURE_POINTER_P (XSTRING (ptr->xname))) MARK_STRING (XSTRING (ptr->xname)); MARK_INTERVAL_TREE (STRING_INTERVALS (ptr->xname)); - + /* Note that we do not mark the obarray of the symbol. It is safe not to do so because nothing accesses that slot except to check whether it is nil. */ @@ -4933,7 +4933,7 @@ mark_buffer (buf) /* If this is an indirect buffer, mark its base buffer. */ if (buffer->base_buffer && !XMARKBIT (buffer->base_buffer->name)) { - XSETBUFFER (base_buffer, buffer->base_buffer); + XSETBUFFER (base_buffer, buffer->base_buffer); mark_buffer (base_buffer); } } @@ -4975,7 +4975,7 @@ survives_gc_p (obj) Lisp_Object obj; { int survives_p; - + switch (XGCTYPE (obj)) { case Lisp_Int: @@ -4992,12 +4992,12 @@ survives_gc_p (obj) case Lisp_Misc_Marker: survives_p = XMARKBIT (obj); break; - + case Lisp_Misc_Buffer_Local_Value: case Lisp_Misc_Some_Buffer_Local_Value: survives_p = XMARKBIT (XBUFFER_LOCAL_VALUE (obj)->realvalue); break; - + case Lisp_Misc_Intfwd: case Lisp_Misc_Boolfwd: case Lisp_Misc_Objfwd: @@ -5005,7 +5005,7 @@ survives_gc_p (obj) case Lisp_Misc_Kboard_Objfwd: survives_p = 1; break; - + case Lisp_Misc_Overlay: survives_p = XMARKBIT (XOVERLAY (obj)->plist); break; @@ -5071,7 +5071,7 @@ gc_sweep () register int num_free = 0, num_used = 0; cons_free_list = 0; - + for (cblk = cons_block; cblk; cblk = *cprev) { register int i; @@ -5121,7 +5121,7 @@ gc_sweep () register int num_free = 0, num_used = 0; float_free_list = 0; - + for (fblk = float_block; fblk; fblk = *fprev) { register int i; @@ -5221,7 +5221,7 @@ gc_sweep () register int num_free = 0, num_used = 0; symbol_free_list = NULL; - + for (sblk = symbol_block; sblk; sblk = *sprev) { int this_free = 0; @@ -5234,7 +5234,7 @@ gc_sweep () it might be pointed to by pure bytecode which we don't trace, so we conservatively assume that it is live. */ int pure_p = PURE_POINTER_P (XSTRING (sym->xname)); - + if (!XMARKBIT (sym->plist) && !pure_p) { *(struct Lisp_Symbol **) &sym->value = symbol_free_list; @@ -5252,7 +5252,7 @@ gc_sweep () XUNMARK (sym->plist); } } - + lim = SYMBOL_BLOCK_SIZE; /* If this block contains only free symbols and we have already seen more than two blocks worth of free symbols then deallocate @@ -5284,7 +5284,7 @@ gc_sweep () register int num_free = 0, num_used = 0; marker_free_list = 0; - + for (mblk = marker_block; mblk; mblk = *mprev) { register int i; @@ -5414,7 +5414,7 @@ gc_sweep () prev = vector, vector = vector->next; } } - + #ifdef GC_CHECK_STRING_BYTES if (!noninteractive) check_string_bytes (1); diff --git a/src/alloca.s b/src/alloca.s index 5277586a2ea..0833cba997c 100644 --- a/src/alloca.s +++ b/src/alloca.s @@ -59,7 +59,7 @@ lose!! data text globl _alloca -_alloca +_alloca move.l (sp)+,a0 ; pop return addr from top of stack move.l (sp)+,d0 ; pop size in bytes from top of stack add.l #ROUND,d0 ; round size up to long word @@ -112,7 +112,7 @@ copy_regs_loop: /* save caller's saved registers */ alloca: #ifdef MOTOROLA_DELTA /* slightly modified version of alloca to motorola sysV/68 pcc - based - compiler. + compiler. this compiler saves used registers relative to %sp instead of %fp. alright, just make new copy of saved register set whenever we allocate new space from stack.. @@ -251,9 +251,9 @@ alloca: * We have to copy registers, and therefore waste 32 bytes. * * Stack layout: - * new sp -> junk + * new sp -> junk * registers (copy) - * r0 -> new data + * r0 -> new data * | (orig retval) * | (orig arg) * old sp -> regs (orig) diff --git a/src/atimer.c b/src/atimer.c index 492aa4ec04e..25b48c5857a 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -132,12 +132,12 @@ start_atimer (type, time, fn, client_data) case ATIMER_ABSOLUTE: t->expiration = time; break; - + case ATIMER_RELATIVE: EMACS_GET_TIME (t->expiration); EMACS_ADD_TIME (t->expiration, t->expiration, time); break; - + case ATIMER_CONTINUOUS: EMACS_GET_TIME (t->expiration); EMACS_ADD_TIME (t->expiration, t->expiration, time); @@ -151,7 +151,7 @@ start_atimer (type, time, fn, client_data) /* Arrange for a SIGALRM at the time the next atimer is ripe. */ set_alarm (); - + return t; } @@ -163,14 +163,14 @@ cancel_atimer (timer) struct atimer *timer; { int i; - + BLOCK_ATIMERS; for (i = 0; i < 2; ++i) { struct atimer *t, *prev; struct atimer **list = i ? &stopped_atimers : &atimers; - + /* See if TIMER is active or stopped. */ for (t = *list, prev = NULL; t && t != timer; prev = t, t = t->next) ; @@ -184,7 +184,7 @@ cancel_atimer (timer) prev->next = t->next; else *list = t->next; - + t->next = free_atimers; free_atimers = t; break; @@ -209,7 +209,7 @@ append_atimer_lists (list1, list2) else { struct atimer *p; - + for (p = list1; p->next; p = p->next) ; p->next = list2; @@ -225,11 +225,11 @@ stop_other_atimers (t) struct atimer *t; { BLOCK_ATIMERS; - + if (t) { struct atimer *p, *prev; - + /* See if T is active. */ for (p = atimers, prev = 0; p && p != t; p = p->next) ; @@ -246,7 +246,7 @@ stop_other_atimers (t) /* T is not active. Let's handle this like T == 0. */ t = NULL; } - + stopped_atimers = append_atimer_lists (atimers, stopped_atimers); atimers = t; UNBLOCK_ATIMERS; @@ -263,18 +263,18 @@ run_all_atimers () { struct atimer *t = atimers; struct atimer *next; - + BLOCK_ATIMERS; atimers = stopped_atimers; stopped_atimers = NULL; - + while (t) { next = t->next; schedule_atimer (t); t = next; } - + UNBLOCK_ATIMERS; } } @@ -301,7 +301,7 @@ set_alarm () must reestablish each time. */ signal (SIGALRM, alarm_signal_handler); #endif /* USG */ - + if (atimers) { EMACS_TIME now, time; @@ -320,7 +320,7 @@ set_alarm () EMACS_SET_SECS (time, 0); EMACS_SET_USECS (time, 1000); } - + bzero (&it, sizeof it); it.it_value = time; setitimer (ITIMER_REAL, &it, 0); @@ -350,7 +350,7 @@ schedule_atimer (t) prev->next = t; else atimers = t; - + t->next = a; } @@ -363,20 +363,20 @@ alarm_signal_handler (signo) int signo; { EMACS_TIME now; - + EMACS_GET_TIME (now); pending_atimers = 0; - + while (atimers && (pending_atimers = interrupt_input_blocked) == 0 && EMACS_TIME_LE (atimers->expiration, now)) { struct atimer *t; - + t = atimers; atimers = atimers->next; t->fn (t); - + if (t->type == ATIMER_CONTINUOUS) { EMACS_ADD_TIME (t->expiration, now, t->interval); @@ -387,10 +387,10 @@ alarm_signal_handler (signo) t->next = free_atimers; free_atimers = t; } - + EMACS_GET_TIME (now); } - + set_alarm (); } diff --git a/src/atimer.h b/src/atimer.h index 7c1fb0544c6..4a487cdbb30 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -51,7 +51,7 @@ struct atimer { /* The type of this timer. */ enum atimer_type type; - + /* Time when this timer is ripe. */ EMACS_TIME expiration; diff --git a/src/blockinput.h b/src/blockinput.h index 6d4fde2c9b9..c5485fa4801 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -42,7 +42,7 @@ Boston, MA 02111-1307, USA. */ BLOCK_INPUT and UNBLOCK_INPUT may be nested. * Any complicated interrupt handling code should test - interrupt_input_blocked, and put off its work until later. + interrupt_input_blocked, and put off its work until later. * If the interrupt handling code wishes, it may set interrupt_input_pending to a non-zero value. If that flag is set diff --git a/src/buffer.c b/src/buffer.c index 49813b38d37..06663c9abd7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -464,13 +464,13 @@ copy_overlays (b, list) OVERLAY_START (overlay) = start; OVERLAY_END (overlay) = end; OVERLAY_PLIST (overlay) = Fcopy_sequence (OVERLAY_PLIST (old_overlay)); - + result = Fcons (overlay, result); } return Fnreverse (result); } - + /* Clone per-buffer values of buffer FROM. @@ -487,7 +487,7 @@ clone_per_buffer_values (from, to) int offset; XSETBUFFER (to_buffer, to); - + for (offset = PER_BUFFER_VAR_OFFSET (name) + sizeof (Lisp_Object); offset < sizeof *to; offset += sizeof (Lisp_Object)) @@ -507,7 +507,7 @@ clone_per_buffer_values (from, to) } bcopy (from->local_flags, to->local_flags, sizeof to->local_flags); - + to->overlays_before = copy_overlays (to, from->overlays_before); to->overlays_after = copy_overlays (to, from->overlays_after); } @@ -816,7 +816,7 @@ If BUFFER is not indirect, return nil. */) } DEFUN ("buffer-local-value", Fbuffer_local_value, - Sbuffer_local_value, 2, 2, 0, + Sbuffer_local_value, 2, 2, 0, doc: /* Return the value of VARIABLE in BUFFER. If VARIABLE does not have a buffer-local binding in BUFFER, the value is the default binding of variable. */) @@ -833,7 +833,7 @@ is the default binding of variable. */) /* Look in local_var_list */ result = Fassoc (symbol, buf->local_var_alist); - if (NILP (result)) + if (NILP (result)) { int offset, idx; int found = 0; @@ -846,8 +846,8 @@ is the default binding of variable. */) { idx = PER_BUFFER_IDX (offset); if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) - && SYMBOLP (PER_BUFFER_SYMBOL (offset)) - && EQ (PER_BUFFER_SYMBOL (offset), symbol)) + && SYMBOLP (PER_BUFFER_SYMBOL (offset)) + && EQ (PER_BUFFER_SYMBOL (offset), symbol)) { result = PER_BUFFER_VALUE (buf, offset); found = 1; @@ -1005,7 +1005,7 @@ A non-nil FLAG means mark the buffer modified. */) #endif /* CLASH_DETECTION */ SAVE_MODIFF = NILP (flag) ? MODIFF : 0; - + /* Set update_mode_lines only if buffer is displayed in some window. Packages like jit-lock or lazy-lock preserve a buffer's modified state by recording/restoring the state around blocks of code. @@ -1024,7 +1024,7 @@ A non-nil FLAG means mark the buffer modified. */) ++update_mode_lines; current_buffer->prevent_redisplay_optimizations_p = 1; } - + return flag; } @@ -1038,7 +1038,7 @@ state of the current buffer. Use with care. */) { #ifdef CLASH_DETECTION Lisp_Object fn; - + /* If buffer becoming modified, lock the file. If buffer becoming unmodified, unlock the file. */ @@ -1053,7 +1053,7 @@ state of the current buffer. Use with care. */) unlock_file (fn); } #endif /* CLASH_DETECTION */ - + SAVE_MODIFF = NILP (flag) ? MODIFF : 0; return flag; } @@ -1152,7 +1152,7 @@ If BUFFER is omitted or nil, some interesting buffer is returned. */) /* Consider buffers that have been seen in the selected frame before other buffers. */ - + tem = frame_buffer_list (frame); add_ons = Qnil; while (CONSP (tem)) @@ -1354,7 +1354,7 @@ with SIGHUP. */) UNGCPRO; } - + /* Make this buffer not be current. In the process, notice if this is the sole visible buffer and give up if so. */ @@ -1495,7 +1495,7 @@ record_buffer (buf) Vbuffer_alist = XCDR (Vbuffer_alist); else XSETCDR (prev, XCDR (XCDR (prev))); - + XSETCDR (link, Vbuffer_alist); Vbuffer_alist = link; @@ -1519,7 +1519,7 @@ record_buffer (buf) XCDR (frame_buffer_list (frame))); else XSETCDR (prev, XCDR (XCDR (prev))); - + XSETCDR (link, frame_buffer_list (frame)); set_frame_buffer_list (frame, link); } @@ -1549,7 +1549,7 @@ the current buffer's major mode. */) && NILP (Fget (current_buffer->major_mode, Qmode_class))) function = current_buffer->major_mode; } - + if (NILP (function) || EQ (function, Qfundamental_mode)) return Qnil; @@ -1709,7 +1709,7 @@ set_buffer_internal_1 (b) if (b->text->beg == NULL) enlarge_buffer_text (b, 0); #endif /* USE_MMAP_FOR_BUFFERS */ - + if (current_buffer == b) return; @@ -1937,7 +1937,7 @@ selected window if it is displayed there. */) else { Lisp_Object buf1; - + buf1 = Fget_buffer (buffer); if (NILP (buf1)) nsberror (buffer); @@ -2175,7 +2175,7 @@ but the contents viewed as characters do change. */) p = GAP_END_ADDR; stop = Z; } - + if (UNIBYTE_STR_AS_MULTIBYTE_P (p, stop - pos, bytes)) p += bytes, pos += bytes; else @@ -2328,7 +2328,7 @@ the normal hook `change-major-mode-hook'. */) /* Any which are supposed to be permanent, make local again, with the same values they had. */ - + for (alist = oalist; !NILP (alist); alist = XCDR (alist)) { sym = XCAR (XCAR (alist)); @@ -2390,7 +2390,7 @@ swap_out_buffer_local_variables (b) } /* Find all the overlays in the current buffer that contain position POS. - Return the number found, and store them in a vector in *VEC_PTR. + Return the number found, and store them in a vector in *VEC_PTR. Store in *LEN_PTR the size allocated for the vector. Store in *NEXT_PTR the next position after POS where an overlay starts, or ZV if there are no more overlays. @@ -2542,7 +2542,7 @@ overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr, change_req) /* Find all the overlays in the current buffer that overlap the range BEG-END or are empty at BEG. - Return the number found, and store them in a vector in *VEC_PTR. + Return the number found, and store them in a vector in *VEC_PTR. Store in *LEN_PTR the size allocated for the vector. Store in *NEXT_PTR the next position after POS where an overlay starts, or ZV if there are no more overlays. @@ -2691,7 +2691,7 @@ mouse_face_overlay_overlaps (overlay) int end = OVERLAY_POSITION (OVERLAY_END (overlay)); int n, i, size; Lisp_Object *v, tem; - + size = 10; v = (Lisp_Object *) alloca (size * sizeof *v); n = overlays_in (start, end, 0, &v, &size, NULL, NULL); @@ -3545,7 +3545,7 @@ rear delimiter advance when text is inserted there. */) XOVERLAY (overlay)->end = end; XOVERLAY (overlay)->plist = Qnil; - /* Put the new overlay on the wrong list. */ + /* Put the new overlay on the wrong list. */ end = OVERLAY_END (overlay); if (OVERLAY_POSITION (end) < XINT (b->overlay_center)) b->overlays_after = Fcons (overlay, b->overlays_after); @@ -3576,7 +3576,7 @@ modify_overlay (buf, start, end) } BUF_COMPUTE_UNCHANGED (buf, start, end); - + /* If this is a buffer not in the selected window, we must do other windows. */ if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) @@ -3682,7 +3682,7 @@ buffer. */) Fset_marker (OVERLAY_START (overlay), beg, buffer); Fset_marker (OVERLAY_END (overlay), end, buffer); - /* Put the overlay on the wrong list. */ + /* Put the overlay on the wrong list. */ end = OVERLAY_END (overlay); if (OVERLAY_POSITION (end) < XINT (b->overlay_center)) b->overlays_after = Fcons (overlay, b->overlays_after); @@ -3712,7 +3712,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, b = XBUFFER (buffer); specbind (Qinhibit_quit, Qt); - + b->overlays_before = Fdelq (overlay, b->overlays_before); b->overlays_after = Fdelq (overlay, b->overlays_after); modify_overlay (b, @@ -4276,21 +4276,21 @@ buffer_slot_type_mismatch (offset) { Lisp_Object sym; char *type_name; - + switch (XINT (PER_BUFFER_TYPE (offset))) { case Lisp_Int: type_name = "integers"; break; - + case Lisp_String: type_name = "strings"; break; - + case Lisp_Symbol: type_name = "symbols"; break; - + default: abort (); } @@ -4353,7 +4353,7 @@ struct mmap_region { /* User-specified size. */ size_t nbytes_specified; - + /* Number of bytes mapped */ size_t nbytes_mapped; @@ -4444,7 +4444,7 @@ mmap_find (start, end) { struct mmap_region *r; char *s = (char *) start, *e = (char *) end; - + for (r = mmap_regions; r; r = r->next) { char *rstart = (char *) r; @@ -4478,7 +4478,7 @@ mmap_free_1 (r) r->prev->next = r->next; else mmap_regions = r->next; - + if (munmap ((POINTER_TYPE *) r, r->nbytes_mapped) == -1) { fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); @@ -4516,7 +4516,7 @@ mmap_enlarge (r, npages) else if (npages > 0) { nbytes = npages * mmap_page_size; - + /* Try to map additional pages at the end of the region. We cannot do this if the address range is already occupied by something else because mmap deletes any previous mapping. @@ -4524,7 +4524,7 @@ mmap_enlarge (r, npages) if (!MMAP_ALLOCATED_P (region_end, region_end + nbytes)) { POINTER_TYPE *p; - + p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0); if (p == MAP_FAILED) @@ -4605,7 +4605,7 @@ mmap_alloc (var, nbytes) map = ROUND (nbytes + MMAP_REGION_STRUCT_SIZE, mmap_page_size); p = mmap (NULL, map, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, mmap_fd, 0); - + if (p == MAP_FAILED) { if (errno != ENOMEM) @@ -4615,7 +4615,7 @@ mmap_alloc (var, nbytes) else { struct mmap_region *r = (struct mmap_region *) p; - + r->nbytes_specified = nbytes; r->nbytes_mapped = map; r->var = var; @@ -4624,10 +4624,10 @@ mmap_alloc (var, nbytes) if (r->next) r->next->prev = r; mmap_regions = r; - + p = MMAP_USER_AREA (p); } - + return *var = p; } @@ -4643,12 +4643,12 @@ mmap_realloc (var, nbytes) size_t nbytes; { POINTER_TYPE *result; - + mmap_init (); if (*var == NULL) result = mmap_alloc (var, nbytes); - else if (nbytes == 0) + else if (nbytes == 0) { mmap_free (var); result = mmap_alloc (var, nbytes); @@ -4657,7 +4657,7 @@ mmap_realloc (var, nbytes) { struct mmap_region *r = MMAP_REGION (*var); size_t room = r->nbytes_mapped - MMAP_REGION_STRUCT_SIZE; - + if (room < nbytes) { /* Must enlarge. */ @@ -4718,7 +4718,7 @@ mmap_free (var) POINTER_TYPE **var; { mmap_init (); - + if (*var) { mmap_free_1 (MMAP_REGION (*var)); @@ -4747,11 +4747,11 @@ mmap_init () if (mmap_initialized_p) return; mmap_initialized_p = 1; - + #if MAP_ANON != 0 mmap_fd = -1; #endif - + mmap_page_size = getpagesize (); } @@ -4778,7 +4778,7 @@ alloc_buffer_text (b, nbytes) size_t nbytes; { POINTER_TYPE *p; - + BLOCK_INPUT; #if defined USE_MMAP_FOR_BUFFERS p = mmap_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); @@ -4787,7 +4787,7 @@ alloc_buffer_text (b, nbytes) #else p = xmalloc (nbytes); #endif - + if (p == NULL) { UNBLOCK_INPUT; @@ -4817,7 +4817,7 @@ enlarge_buffer_text (b, delta) #else p = xrealloc (b->text->beg, nbytes); #endif - + if (p == NULL) { UNBLOCK_INPUT; @@ -4844,7 +4844,7 @@ free_buffer_text (b) #else xfree (b->text->beg); #endif - + BUF_BEG_ADDR (b) = NULL; UNBLOCK_INPUT; } @@ -4975,7 +4975,7 @@ init_buffer_once () XSETFASTINT (buffer_local_flags.cache_long_line_scans, idx); ++idx; XSETFASTINT (buffer_local_flags.category_table, idx); ++idx; XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx; - XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx); + XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx); /* Make this one a permanent local. */ buffer_permanent_local_flags[idx++] = 1; XSETFASTINT (buffer_local_flags.left_margin_width, idx); ++idx; @@ -4991,7 +4991,7 @@ init_buffer_once () if (idx >= MAX_PER_BUFFER_VARS) abort (); last_per_buffer_idx = idx; - + Vbuffer_alist = Qnil; current_buffer = 0; all_buffers = 0; @@ -5036,13 +5036,13 @@ init_buffer () text pointers will have been set to null in the dumped Emacs. Map new memory. */ struct buffer *b; - + for (b = all_buffers; b; b = b->next) if (b->text->beg == NULL) enlarge_buffer_text (b, 0); } #endif /* USE_MMAP_FOR_BUFFERS */ - + Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); if (NILP (buffer_defaults.enable_multibyte_characters)) Fset_buffer_multibyte (Qnil); @@ -5181,17 +5181,17 @@ This is the same as (default-value 'ctl-arrow). */); &buffer_defaults.direction_reversed, doc: /* Default value of `direction_reversed' for buffers that do not override it. This is the same as (default-value 'direction-reversed). */); - + DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters", &buffer_defaults.enable_multibyte_characters, doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it. This is the same as (default-value 'enable-multibyte-characters). */); - + DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system", &buffer_defaults.buffer_file_coding_system, doc: /* Default value of `buffer-file-coding-system' for buffers not overriding it. This is the same as (default-value 'buffer-file-coding-system). */); - + DEFVAR_LISP_NOPRO ("default-truncate-lines", &buffer_defaults.truncate_lines, doc: /* Default value of `truncate-lines' for buffers that do not override it. @@ -5218,7 +5218,7 @@ This is the same as (default-value 'tab-width). */); This is the same as (default-value 'case-fold-search). */); #ifdef DOS_NT - DEFVAR_LISP_NOPRO ("default-buffer-file-type", + DEFVAR_LISP_NOPRO ("default-buffer-file-type", &buffer_defaults.buffer_file_type, doc: /* Default file type for buffers that do not override it. This is the same as (default-value 'buffer-file-type). @@ -5234,31 +5234,31 @@ This is the same as (default-value 'left-margin-width). */); &buffer_defaults.right_margin_width, doc: /* Default value of `right_margin_width' for buffers that don't override it. This is the same as (default-value 'right-margin-width). */); - + DEFVAR_LISP_NOPRO ("default-indicate-empty-lines", &buffer_defaults.indicate_empty_lines, doc: /* Default value of `indicate-empty-lines' for buffers that don't override it. This is the same as (default-value 'indicate-empty-lines). */); - + DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", &buffer_defaults.scroll_up_aggressively, doc: /* Default value of `scroll-up-aggressively'. This value applies in buffers that don't have their own local values. This variable is an alias for (default-value 'scroll-up-aggressively). */); - + DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively", &buffer_defaults.scroll_down_aggressively, doc: /* Default value of `scroll-down-aggressively'. This value applies in buffers that don't have their own local values. This variable is an alias for (default-value 'scroll-down-aggressively). */); - + DEFVAR_PER_BUFFER ("header-line-format", ¤t_buffer->header_line_format, Qnil, doc: /* Analogous to `mode-line-format', but controls the header line. The header line appears, optionally, at the top of a window; the mode line appears at the bottom. */); - + DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, Qnil, doc: /* Template for displaying mode line for current buffer. @@ -5269,7 +5269,7 @@ For a symbol, its value is used (but it is ignored if t or nil). A string appearing directly as the value of a symbol is processed verbatim in that the %-constructs below are not recognized. Note that unless the symbol is marked as a `risky-local-variable', all - properties in any strings, as well as all :eval and :propertize forms + properties in any strings, as well as all :eval and :propertize forms in the value of that symbol will be ignored. For a list of the form `(:eval FORM)', FORM is evaluated and the result is used as a mode line element. Be careful--FORM should not load any files, @@ -5506,18 +5506,18 @@ See also the functions `display-table-slot' and `set-display-table-slot'. */); Qnil, doc: /* *Width of left marginal area for display of a buffer. A value of nil means no marginal area. */); - + DEFVAR_PER_BUFFER ("right-margin-width", ¤t_buffer->right_margin_width, Qnil, doc: /* *Width of right marginal area for display of a buffer. A value of nil means no marginal area. */); - + DEFVAR_PER_BUFFER ("indicate-empty-lines", ¤t_buffer->indicate_empty_lines, Qnil, doc: /* *Visually indicate empty lines after the buffer end. If non-nil, a bitmap is displayed in the left fringe of a window on window-systems. */); - + DEFVAR_PER_BUFFER ("scroll-up-aggressively", ¤t_buffer->scroll_up_aggressively, Qnil, doc: /* How far to scroll windows upward. @@ -5530,7 +5530,7 @@ case that you moved off with C-f means scrolling just one line. 1.0 means point goes at the top, so that in that simple case, the window window scrolls by a full window height. Meaningful values are between 0.0 and 1.0, inclusive. */); - + DEFVAR_PER_BUFFER ("scroll-down-aggressively", ¤t_buffer->scroll_down_aggressively, Qnil, doc: /* How far to scroll windows downward. @@ -5543,7 +5543,7 @@ case that you moved off with C-b means scrolling just one line. 1.0 means point goes at the bottom, so that in that simple case, the window window scrolls by a full window height. Meaningful values are between 0.0 and 1.0, inclusive. */); - + /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, "Don't ask."); */ diff --git a/src/buffer.h b/src/buffer.h index 890cabe24ec..7dd1e967afd 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -25,52 +25,52 @@ Boston, MA 02111-1307, USA. */ /* These macros come in pairs, one for the char position and one for the byte position. */ -/* Position of beginning of buffer. */ +/* Position of beginning of buffer. */ #define BEG (1) #define BEG_BYTE (1) -/* Position of beginning of accessible range of buffer. */ +/* Position of beginning of accessible range of buffer. */ #define BEGV (current_buffer->begv) #define BEGV_BYTE (current_buffer->begv_byte) /* Position of point in buffer. The "+ 0" makes this - not an l-value, so you can't assign to it. Use SET_PT instead. */ + not an l-value, so you can't assign to it. Use SET_PT instead. */ #define PT (current_buffer->pt + 0) #define PT_BYTE (current_buffer->pt_byte + 0) -/* Position of gap in buffer. */ +/* Position of gap in buffer. */ #define GPT (current_buffer->text->gpt) #define GPT_BYTE (current_buffer->text->gpt_byte) -/* Position of end of accessible range of buffer. */ +/* Position of end of accessible range of buffer. */ #define ZV (current_buffer->zv) #define ZV_BYTE (current_buffer->zv_byte) -/* Position of end of buffer. */ +/* Position of end of buffer. */ #define Z (current_buffer->text->z) #define Z_BYTE (current_buffer->text->z_byte) /* Macros for the addresses of places in the buffer. */ -/* Address of beginning of buffer. */ +/* Address of beginning of buffer. */ #define BEG_ADDR (current_buffer->text->beg) -/* Address of beginning of accessible range of buffer. */ +/* Address of beginning of accessible range of buffer. */ #define BEGV_ADDR (BYTE_POS_ADDR (current_buffer->begv_byte)) -/* Address of point in buffer. */ +/* Address of point in buffer. */ #define PT_ADDR (BYTE_POS_ADDR (current_buffer->pt_byte)) -/* Address of beginning of gap in buffer. */ +/* Address of beginning of gap in buffer. */ #define GPT_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte - 1) /* Address of end of gap in buffer. */ #define GAP_END_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte + current_buffer->text->gap_size - 1) -/* Address of end of accessible range of buffer. */ +/* Address of end of accessible range of buffer. */ #define ZV_ADDR (BYTE_POS_ADDR (current_buffer->zv_byte)) -/* Address of end of buffer. */ +/* Address of end of buffer. */ #define Z_ADDR (current_buffer->text->beg + current_buffer->text->gap_size + current_buffer->text->z_byte - 1) /* Size of gap. */ @@ -101,27 +101,27 @@ Boston, MA 02111-1307, USA. */ /* Similar macros to operate on a specified buffer. Note that many of these evaluate the buffer argument more than once. */ -/* Position of beginning of buffer. */ +/* Position of beginning of buffer. */ #define BUF_BEG(buf) (1) #define BUF_BEG_BYTE(buf) (1) -/* Position of beginning of accessible range of buffer. */ +/* Position of beginning of accessible range of buffer. */ #define BUF_BEGV(buf) ((buf)->begv) #define BUF_BEGV_BYTE(buf) ((buf)->begv_byte) -/* Position of point in buffer. */ +/* Position of point in buffer. */ #define BUF_PT(buf) ((buf)->pt) #define BUF_PT_BYTE(buf) ((buf)->pt_byte) -/* Position of gap in buffer. */ +/* Position of gap in buffer. */ #define BUF_GPT(buf) ((buf)->text->gpt) #define BUF_GPT_BYTE(buf) ((buf)->text->gpt_byte) -/* Position of end of accessible range of buffer. */ +/* Position of end of accessible range of buffer. */ #define BUF_ZV(buf) ((buf)->zv) #define BUF_ZV_BYTE(buf) ((buf)->zv_byte) -/* Position of end of buffer. */ +/* Position of end of buffer. */ #define BUF_Z(buf) ((buf)->text->z) #define BUF_Z_BYTE(buf) ((buf)->text->z_byte) @@ -197,7 +197,7 @@ Boston, MA 02111-1307, USA. */ } \ } \ while (0) - + /* Macros to set PT in the current buffer, or another buffer. */ @@ -336,14 +336,14 @@ extern int _fetch_multibyte_char_len; or converting between byte positions and addresses, in a specified buffer. */ -/* Return the address of character at byte position POS in buffer BUF. +/* Return the address of character at byte position POS in buffer BUF. Note that both arguments can be computed more than once. */ #define BUF_BYTE_ADDRESS(buf, pos) \ ((buf)->text->beg + (pos) - 1 \ + ((pos) >= (buf)->text->gpt_byte ? (buf)->text->gap_size : 0)) -/* Return the address of character at char position POS in buffer BUF. +/* Return the address of character at char position POS in buffer BUF. Note that both arguments can be computed more than once. */ #define BUF_CHAR_ADDRESS(buf, pos) \ @@ -396,7 +396,7 @@ struct buffer_text e.g. happen when malloc is called. So, don't pass a pointer into a buffer's text to functions that malloc. */ unsigned char *beg; - + int gpt; /* Char pos of gap in buffer. */ int z; /* Char pos of end of buffer. */ int gpt_byte; /* Byte pos of gap in buffer. */ @@ -487,7 +487,7 @@ struct buffer this means the variable is always local in all buffers. */ #define MAX_PER_BUFFER_VARS 50 char local_flags[MAX_PER_BUFFER_VARS]; - + /* Set to the modtime of the visited file when read or written. -1 means visited file was nonexistent. 0 means visited file modtime unknown; in no case complain @@ -579,7 +579,7 @@ struct buffer So we copy it around in set_buffer_internal. This comes before `name' because it is marked in a special way. */ Lisp_Object undo_list; - + /* Analogous to mode_line_format for the line displayed at the top of windows. Nil means don't display that line. */ Lisp_Object header_line_format; @@ -712,7 +712,7 @@ struct buffer /* Incremented each time the buffer is displayed in a window. */ Lisp_Object display_count; - + /* Widths of left and right marginal areas for windows displaying this buffer. */ Lisp_Object left_margin_width, right_margin_width; @@ -729,7 +729,7 @@ struct buffer that point ends up this number of lines from the top of the window. Nil means that scrolling method isn't used. */ Lisp_Object scroll_up_aggressively; - + /* If scrolling the display because point is above the top of a window showing this buffer, try to choose a window start so that point ends up this number of lines from the bottom of the diff --git a/src/callint.c b/src/callint.c index 4552b2274b1..6ce9fb12387 100644 --- a/src/callint.c +++ b/src/callint.c @@ -743,7 +743,7 @@ supply if the command inquires which events were used to invoke it. */) args[i] = Qnil; varies[i] = -1; } - else + else { args[i] = Fread_non_nil_coding_system (build_string (callint_message)); @@ -820,7 +820,7 @@ supply if the command inquires which events were used to invoke it. */) UNGCPRO; return unbind_to (speccount, val); } -} +} DEFUN ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value, 1, 1, 0, @@ -831,7 +831,7 @@ Its numeric meaning is what you would get from `(interactive "p")'. */) Lisp_Object raw; { Lisp_Object val; - + if (NILP (raw)) XSETFASTINT (val, 1); else if (EQ (raw, Qminus)) diff --git a/src/callproc.c b/src/callproc.c index d1e62de0705..0e9b51920e5 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -253,7 +253,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) #ifndef subprocesses /* Without asynchronous processes we cannot have BUFFER == 0. */ - if (nargs >= 3 + if (nargs >= 3 && (INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2]))) error ("Operating system cannot handle asynchronous subprocesses"); #endif /* subprocesses */ @@ -339,7 +339,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) CHECK_BUFFER (buffer); } } - else + else buffer = Qnil; /* Make sure that the child will be able to chdir to the current @@ -431,7 +431,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) *tempfile = '\0'; } dostounix_filename (tempfile); - if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/') + if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/') strcat (tempfile, "/"); strcat (tempfile, "detmp.XXX"); mktemp (tempfile); @@ -545,7 +545,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) code does not handle passing the environment to the synchronous Mac subprocess. */ char *infn, *outfn, *errfn, *currdn; - + /* close these files so subprocess can write to them */ close (outfilefd); if (fd_error != outfilefd) @@ -780,7 +780,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) /* Now NREAD is the total amount of data in the buffer. */ immediate_quit = 0; - + if (!NILP (buffer)) { if (! CODING_MAY_REQUIRE_DECODING (&process_coding)) @@ -793,7 +793,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) repeat_decoding: size = decoding_buffer_size (&process_coding, nread); decoding_buf = (char *) xmalloc (size); - + /* We can't use the macro CODING_REQUIRE_DETECTION because it always returns nonzero if the coding system requires EOL detection. Here, we have to @@ -807,10 +807,10 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) } if (process_coding.cmp_data) process_coding.cmp_data->char_offset = PT; - + decode_coding (&process_coding, bufptr, decoding_buf, nread, size); - + if (display_on_the_fly && saved_coding.type == coding_type_undecided && process_coding.type != coding_type_undecided) @@ -825,7 +825,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) carryover = nread; continue; } - + if (process_coding.produced > 0) insert_1_both (decoding_buf, process_coding.produced_char, process_coding.produced, 0, 1, 0); @@ -840,9 +840,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) /* CRs have been replaced with LFs. Undo that in the text inserted above. */ unsigned char *p; - + move_gap_both (PT, PT_BYTE); - + p = BYTE_POS_ADDR (pt_byte_orig); for (; p < GPT_ADDR; ++p) if (*p == '\n') @@ -858,7 +858,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) old_pt = PT; old_pt_byte = PT_BYTE; nCR = 0; - + for (bytepos = PT_BYTE - 1; bytepos >= pt_byte_orig; --bytepos) @@ -882,13 +882,13 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) coding = AREF (eol_type, CODING_EOL_LF); else coding = saved_coding.symbol; - + process_coding.symbol = coding; process_coding.eol_type = CODING_EOL_LF; process_coding.mode &= ~CODING_MODE_INHIBIT_INCONSISTENT_EOL; } - + nread -= process_coding.consumed; carryover = nread; if (carryover > 0) @@ -1106,7 +1106,7 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r unbind_to (count1, Qnil); } - /* Note that Fcall_process takes care of binding + /* Note that Fcall_process takes care of binding coding-system-for-read. */ record_unwind_protect (delete_temp_file, filename_string); @@ -1144,7 +1144,7 @@ static int relocate_fd (); of environ around the vfork and the call to this function. SET_PGRP is nonzero if we should put the subprocess into a separate - process group. + process group. CURRENT_DIR is an elisp string giving the path of the current directory the subprocess should have. Since we can't really signal @@ -1467,7 +1467,7 @@ egetenv (var) #endif /* not VMS */ /* This is run before init_cmdargs. */ - + void init_callproc_1 () { @@ -1475,7 +1475,7 @@ init_callproc_1 () char *doc_dir = egetenv ("EMACSDOC"); Vdata_directory - = Ffile_name_as_directory (build_string (data_dir ? data_dir + = Ffile_name_as_directory (build_string (data_dir ? data_dir : PATH_DATA)); Vdoc_directory = Ffile_name_as_directory (build_string (doc_dir ? doc_dir @@ -1494,7 +1494,7 @@ void init_callproc () { char *data_dir = egetenv ("EMACSDATA"); - + register char * sh; Lisp_Object tempdir; @@ -1512,7 +1512,7 @@ init_callproc () Vexec_path = Fcons (tem, Vexec_path); Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path); } - + Vexec_directory = Ffile_name_as_directory (tem); #endif /* not DOS_NT */ diff --git a/src/casetab.c b/src/casetab.c index 6056af54682..306c7df3281 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -71,7 +71,7 @@ check_case_table (obj) while (tem = Fcase_table_p (obj), NILP (tem)) obj = wrong_type_argument (Qcase_table_p, obj); return (obj); -} +} DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0, doc: /* Return the case table of the current buffer. */) diff --git a/src/category.c b/src/category.c index c7ae2ccf90d..4846ae8f7f6 100644 --- a/src/category.c +++ b/src/category.c @@ -167,7 +167,7 @@ check_category_table (table) while (tem = Fcategory_table_p (table), NILP (tem)) table = wrong_type_argument (Qcategory_table_p, table); return table; -} +} DEFUN ("category-table", Fcategory_table, Scategory_table, 0, 0, 0, doc: /* Return the current category table. @@ -377,7 +377,7 @@ then delete CATEGORY from the category set instead of adding it. */) if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) error ("Undefined category: %c", XFASTINT (category)); - + set_value = NILP (reset) ? Qt : Qnil; if (c < CHAR_TABLE_SINGLE_BYTE_SLOTS) @@ -534,7 +534,7 @@ init_category_once () Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2)); Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil); - /* Set a category set which contains nothing to the default. */ + /* Set a category set which contains nothing to the default. */ XCHAR_TABLE (Vstandard_category_table)->defalt = MAKE_CATEGORY_SET; Fset_char_table_extra_slot (Vstandard_category_table, make_number (0), Fmake_vector (make_number (95), Qnil)); diff --git a/src/category.h b/src/category.h index 3b2e609bdd3..d48d99df805 100644 --- a/src/category.h +++ b/src/category.h @@ -109,7 +109,7 @@ extern Lisp_Object _temp_category_set; #else #define CATEGORY_SET(c) \ Faref (current_buffer->category_table, make_number (c)) -#endif +#endif /* Return the doc string of CATEGORY in category table TABLE. */ #define CATEGORY_DOCSTRING(table, category) \ diff --git a/src/ccl.c b/src/ccl.c index 3b8eb62db9a..e82eea542c2 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -426,7 +426,7 @@ Lisp_Object Vtranslation_hash_table_vector; extended_command (rrr,RRR,Rrr,ARGS) */ -/* +/* Here after, Extended CCL Instructions. Bit length of extended command is 14. Therefore, the instruction code range is 0..16384(0x3fff). @@ -484,7 +484,7 @@ Lisp_Object Vtranslation_hash_table_vector; 3:MAP-ID1 4:MAP-ID2 ... - */ + */ /* Map the code in reg[rrr] by MAPs starting from the Nth (N = reg[RRR]) map. @@ -562,7 +562,7 @@ Lisp_Object Vtranslation_hash_table_vector; where STARTPOINT is an offset to be used for indexing a map, ENDPOINT is a maximum index number of a map, - VAL and VALn is a number, nil, t, or lambda. + VAL and VALn is a number, nil, t, or lambda. Valid index range of a map of type (a) is: STARTPOINT <= index < STARTPOINT + map_size - 1 @@ -862,7 +862,7 @@ struct ccl_prog_stack int ic; /* Instruction Counter. */ }; -/* For the moment, we only support depth 256 of stack. */ +/* For the moment, we only support depth 256 of stack. */ static struct ccl_prog_stack ccl_prog_stack_struct[256]; int @@ -1096,7 +1096,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) } CCL_INVALID_CMD; } - + ccl_prog_stack_struct[stack_idx].ccl_prog = ccl_prog; ccl_prog_stack_struct[stack_idx].ic = ic; stack_idx++; @@ -1260,7 +1260,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) src++; goto ccl_read_multibyte_character_suspend; } - + if (!ccl->multibyte) { int bytes; @@ -1274,7 +1274,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) i = *src++; if (i == '\n' && ccl->eol_type != CODING_EOL_LF) { - /* We are encoding. */ + /* We are encoding. */ if (ccl->eol_type == CODING_EOL_CRLF) { if (ccl->cr_consumed) @@ -1399,7 +1399,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) SPLIT_CHAR (op, reg[RRR], i, j); if (j != -1) i = (i << 7) | j; - + reg[rrr] = i; break; @@ -1411,14 +1411,14 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) SPLIT_CHAR (op, reg[RRR], i, j); if (j != -1) i = (i << 7) | j; - + reg[rrr] = i; break; case CCL_LookupIntConstTbl: op = XINT (ccl_prog[ic]); /* table */ ic++; - { + { struct Lisp_Hash_Table *h = GET_HASH_TABLE (op); op = hash_lookup (h, make_number (reg[RRR]), NULL); @@ -1443,7 +1443,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) op = XINT (ccl_prog[ic]); /* table */ ic++; CCL_MAKE_CHAR (reg[RRR], reg[rrr], i); - { + { struct Lisp_Hash_Table *h = GET_HASH_TABLE (op); op = hash_lookup (h, make_number (i), NULL); @@ -1517,7 +1517,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) else continue; } - else + else continue; if (NILP (content)) @@ -1553,7 +1553,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) ic = fin_ic; } break; - + case CCL_MapMultiple: { Lisp_Object map, content, attrib, value; @@ -1640,7 +1640,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) } } map_vector_size = ASIZE (Vcode_conversion_map_vector); - + do { for (;map_set_rest_length > 0;i++, ic++, map_set_rest_length--) { @@ -1690,7 +1690,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) else continue; } - else + else continue; if (NILP (content)) @@ -1808,7 +1808,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) } } break; - + default: CCL_INVALID_CMD; } @@ -1881,7 +1881,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) bcopy (msg, dst, msglen); dst += msglen; } - + if (ccl->status == CCL_STAT_INVALID_CMD) { #if 0 /* If the remaining bytes contain 0x80..0x9F, copying them @@ -2317,7 +2317,7 @@ Return index number of the registered map. */) CHECK_SYMBOL (symbol); CHECK_VECTOR (map); - + for (i = 0; i < len; i++) { Lisp_Object slot = AREF (Vcode_conversion_map_vector, i); diff --git a/src/ccl.h b/src/ccl.h index ed89bf5e6d8..f5344ff0d07 100644 --- a/src/ccl.h +++ b/src/ccl.h @@ -44,7 +44,7 @@ struct ccl_program { int private_state; /* CCL instruction may use this for private use, mainly for saving internal states on suspending. - This variable is set to 0 when ccl is + This variable is set to 0 when ccl is set up. */ int last_block; /* Set to 1 while processing the last block. */ diff --git a/src/charset.c b/src/charset.c index a0ab20c26a7..af5c6ff7068 100644 --- a/src/charset.c +++ b/src/charset.c @@ -210,7 +210,7 @@ char_to_string_1 (c, str) /* If C still has any modifier bits, just ignore it. */ c &= ~CHAR_MODIFIER_MASK; } - + if (SINGLE_BYTE_CHAR_P (c)) { if (ASCII_BYTE_P (c) || c >= 0xA0) @@ -345,7 +345,7 @@ char_printable_p (c) return 0; else if (c >= MAX_CHAR) return 0; - + SPLIT_CHAR (c, charset, c1, c2); if (! CHARSET_DEFINED_P (charset)) return 0; @@ -817,7 +817,7 @@ find_charset_in_text (ptr, nchars, nbytes, charsets, table) { maskbits |= (*ptr < 0x80 ? 1 : *ptr < 0xA0 ? 2 : 4); ptr++; - } + } if (maskbits & 1) charsets[CHARSET_ASCII] = 1; @@ -1548,7 +1548,7 @@ str_as_multibyte (str, len, nbytes, nchars) { while (n--) *to++ = *p++; - } + } else { *to++ = LEADING_CODE_8_BIT_CONTROL; @@ -1600,7 +1600,7 @@ str_to_multibyte (str, len, bytes) endp = str + len; safe_bcopy (p, endp - bytes, bytes); p = endp - bytes; - while (p < endp) + while (p < endp) { if (*p < 0x80 || *p >= 0xA0) *to++ = *p++; @@ -1624,7 +1624,7 @@ str_as_unibyte (str, bytes) while (p < endp && *p != LEADING_CODE_8_BIT_CONTROL) p++; to = p; - while (p < endp) + while (p < endp) { if (*p == LEADING_CODE_8_BIT_CONTROL) *to++ = *(p + 1) - 0x20, p += 2; @@ -224,7 +224,7 @@ calccost (srcy, srcx, dsty, dstx, doit) if (doit) while (--deltay >= 0) tputs (p, 1, cmputc); -x: +x: if ((deltax = dstx - srcx) == 0) goto done; if (deltax < 0) { @@ -235,7 +235,7 @@ x: if (Wcm.cc_tab >= BIG || !Wcm.cm_usetabs) goto olddelta; /* forget it! */ - /* + /* * ntabs is # tabs towards but not past dstx; n2tabs is one more * (ie past dstx), but this is only valid if that is not past the * right edge of the screen. We can check that at the same time @@ -251,7 +251,7 @@ x: if (tab2x >= Wcm.cm_cols) /* too far (past edge) */ n2tabs = 0; - /* + /* * Now set tabcost to the cost for using ntabs, and c to the cost * for using n2tabs, then pick the minimum. */ @@ -270,7 +270,7 @@ x: if (tabcost >= BIG) /* caint use tabs */ goto newdelta; - /* + /* * See if tabcost is less than just moving right */ @@ -282,20 +282,20 @@ x: srcx = tabx; } - /* + /* * Now might as well just recompute the delta. */ -newdelta: +newdelta: if ((deltax = dstx - srcx) == 0) goto done; -olddelta: +olddelta: if (deltax > 0) p = Wcm.cm_right, c = Wcm.cc_right; else p = Wcm.cm_left, c = Wcm.cc_left, deltax = -deltax; -dodelta: +dodelta: if (c == BIG) { /* caint get thar from here */ fail: if (doit) @@ -306,7 +306,7 @@ fail: if (doit) while (--deltax >= 0) tputs (p, 1, cmputc); -done: +done: return totalcost; } @@ -379,7 +379,7 @@ cmgoto (row, col) dcm = Wcm.cm_abs; } - /* + /* * In the following comparison, the = in <= is because when the costs * are the same, it looks nicer (I think) to move directly there. */ @@ -400,17 +400,17 @@ cmgoto (row, col) switch (use) { - case USEHOME: + case USEHOME: tputs (Wcm.cm_home, 1, cmputc); curY = 0, curX = 0; break; - case USELL: + case USELL: tputs (Wcm.cm_ll, 1, cmputc); curY = Wcm.cm_rows - 1, curX = 0; break; - case USECR: + case USECR: tputs (Wcm.cm_cr, 1, cmputc); if (Wcm.cm_autolf) curY++; diff --git a/src/coding.c b/src/coding.c index fb7cd0cd9db..9dde90af15e 100644 --- a/src/coding.c +++ b/src/coding.c @@ -6514,7 +6514,7 @@ find_safe_codings_2 (p, pend, safe_codings, work_table, single_byte_char_found) int c, len, i; Lisp_Object val, ch; Lisp_Object prev, tail; - + while (p < pend) { c = STRING_CHAR_AND_LENGTH (p, pend - p, len); @@ -6635,7 +6635,7 @@ DEFUN ("find-coding-systems-region-internal-2", else /* ... and append generic coding systems. */ val = Fcopy_sequence (XCAR (Vcoding_system_safe_chars)); - + for (; CONSP (safe_codings); safe_codings = XCDR (safe_codings)) val = Fcons (XCAR (XCAR (safe_codings)), val); safe_codings = val; diff --git a/src/composite.c b/src/composite.c index 7bd50a23396..cc05a869126 100644 --- a/src/composite.c +++ b/src/composite.c @@ -249,7 +249,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string) } /* This composition is a new one. We must register it. */ - + /* Check if we have sufficient memory to store this information. */ if (composition_table_size == 0) { @@ -485,7 +485,7 @@ update_compositions (from, to, check_mask) if (inhibit_modification_hooks) return; - + /* If FROM and TO are not in a valid range, do nothing. */ if (! (BEGV <= from && from <= to && to <= ZV)) return; @@ -754,7 +754,7 @@ for the composition. See `compose-string' for more detail. */) } DEFUN ("find-composition-internal", Ffind_composition_internal, - Sfind_composition_internal, 4, 4, 0, + Sfind_composition_internal, 4, 4, 0, doc: /* Internal use only. Return information about composition at or nearest to position POS. @@ -775,7 +775,7 @@ See `find-composition' for more detail. */) } else end = -1; - + if (!NILP (string)) { CHECK_STRING (string); @@ -839,7 +839,7 @@ syms_of_composite () { Lisp_Object args[6]; extern Lisp_Object QCsize; - + args[0] = QCtest; args[1] = Qequal; args[2] = QCweakness; diff --git a/src/composite.h b/src/composite.h index ce47aee7098..620d5d4ce28 100644 --- a/src/composite.h +++ b/src/composite.h @@ -147,7 +147,7 @@ extern Lisp_Object composition_temp; When a composition is assigned an ID number (by get_composition_id), this structure is allocated for the - composition and linked in composition_table[ID]. + composition and linked in composition_table[ID]. Identical compositions appearing at different places have the same ID, and thus share the same instance of this structure. */ diff --git a/src/config.in b/src/config.in index 5a22b7c3c50..c86215d823f 100644 --- a/src/config.in +++ b/src/config.in @@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */ /* No code in Emacs #includes config.h twice, but some bits of code - intended to work with other packages as well (like gmalloc.c) + intended to work with other packages as well (like gmalloc.c) think they can include it as many times as they like. */ #ifndef EMACS_CONFIG_H #define EMACS_CONFIG_H @@ -999,7 +999,7 @@ typedef unsigned size_t; #ifdef __GNUC__ # ifndef GC_SETJMP_WORKS /* GC_SETJMP_WORKS is nearly always appropriate for GCC -- - see NON_SAVING_SETJMP in the target descriptions. */ + see NON_SAVING_SETJMP in the target descriptions. */ /* Exceptions (see NON_SAVING_SETJMP in target description) are ns32k, SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86. Fixme: Deal with ns32k, SVR3. */ @@ -1022,7 +1022,7 @@ typedef unsigned size_t; #endif /* EMACS_CONFIG_H */ -/* +/* Local Variables: mode: c End: diff --git a/src/dired.c b/src/dired.c index e1aca66ba16..54f96ba82f1 100644 --- a/src/dired.c +++ b/src/dired.c @@ -130,7 +130,7 @@ directory_files_internal_unwind (dh) return Qnil; } -/* Function shared by Fdirectory_files and Fdirectory_files_and_attributes. +/* Function shared by Fdirectory_files and Fdirectory_files_and_attributes. When ATTRS is zero, return a list of directory filenames; when non-zero, return a list of directory filenames and their attributes. */ @@ -187,7 +187,7 @@ directory_files_internal (directory, full, match, nosort, attrs) have to make sure it gets closed, and setting up an unwind_protect to do so would be a pain. */ retry: - + d = opendir (SDATA (dirfilename)); if (d == NULL) report_file_error ("Opening directory", Fcons (directory, Qnil)); @@ -219,7 +219,7 @@ directory_files_internal (directory, full, match, nosort, attrs) if (dp == NULL && errno == EAGAIN) continue; #endif - + if (dp == NULL) break; @@ -233,7 +233,7 @@ directory_files_internal (directory, full, match, nosort, attrs) len = NAMLEN (dp); name = finalname = make_unibyte_string (dp->d_name, len); GCPRO2 (finalname, name); - + /* Note: ENCODE_FILE can GC; it should protect its argument, though. */ name = DECODE_FILE (name); @@ -261,24 +261,24 @@ directory_files_internal (directory, full, match, nosort, attrs) fullname = make_uninit_multibyte_string (nbytes, nbytes); bcopy (SDATA (directory), SDATA (fullname), directory_nbytes); - + if (needsep) SSET (fullname, directory_nbytes, DIRECTORY_SEP); - + bcopy (SDATA (name), SDATA (fullname) + directory_nbytes + needsep, len); - + nchars = chars_in_text (SDATA (fullname), nbytes); /* Some bug somewhere. */ if (nchars > nbytes) abort (); - + STRING_SET_CHARS (fullname, nchars); if (nchars == nbytes) STRING_SET_UNIBYTE (fullname); - + finalname = fullname; } else @@ -328,7 +328,7 @@ directory_files_internal (directory, full, match, nosort, attrs) if (NILP (nosort)) list = Fsort (Fnreverse (list), attrs ? Qfile_attributes_lessp : Qstring_lessp); - + RETURN_UNGCPRO (list); } @@ -686,7 +686,7 @@ file_name_completion (file, dirname, all_flag, ver_flag) /* This tests that the current file is an exact match but BESTMATCH is not (it is too long). */ if ((matchsize == len - && matchsize + !!directoryp + && matchsize + !!directoryp < SCHARS (bestmatch)) || /* If there is no exact match ignoring case, @@ -699,7 +699,7 @@ file_name_completion (file, dirname, all_flag, ver_flag) either both or neither are exact. */ (((matchsize == len) == - (matchsize + !!directoryp + (matchsize + !!directoryp == SCHARS (bestmatch))) && !bcmp (p2, SDATA (encoded_file), SCHARS (encoded_file)) && bcmp (p1, SDATA (encoded_file), SCHARS (encoded_file)))) diff --git a/src/dispextern.h b/src/dispextern.h index ec5e16b2bca..48732088e28 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -112,7 +112,7 @@ extern int trace_redisplay_p; #endif /* GLYPH_DEBUG == 0 */ - + /*********************************************************************** Text positions @@ -121,7 +121,7 @@ extern int trace_redisplay_p; /* Starting with Emacs 20.3, characters from strings and buffers have both a character and a byte position associated with them. The following structure holds such a pair of positions. */ - + struct text_pos { /* Character position. */ @@ -177,7 +177,7 @@ struct text_pos #define SET_MARKER_FROM_TEXT_POS(MARKER, POS) \ set_marker_both ((MARKER), Qnil, CHARPOS ((POS)), BYTEPOS ((POS))) - + /* Value is non-zero if character and byte positions of POS1 and POS2 are equal. */ @@ -224,7 +224,7 @@ struct display_pos enum glyph_type { /* Glyph describes a character. */ - CHAR_GLYPH, + CHAR_GLYPH, /* Glyph describes a composition sequence. */ COMPOSITE_GLYPH, @@ -255,7 +255,7 @@ struct glyph int charpos; /* Lisp object source of this glyph. Currently either a buffer or - a string, if the glyph was produced from characters which came from + a string, if the glyph was produced from characters which came from a buffer or a string; or 0 if the glyph was inserted by redisplay for its own purposes such as padding. */ Lisp_Object object; @@ -334,7 +334,7 @@ struct glyph unsigned ascent : 16; } stretch; - + /* Used to compare all bit-fields above in one step. */ unsigned val; } u; @@ -347,7 +347,7 @@ struct glyph (GLYPH_FROM_CHAR_GLYPH ((GLYPH)) == SPACEGLYPH) /* Are glyphs *X and *Y displayed equal? */ - + #define GLYPH_EQUAL_P(X, Y) \ ((X)->type == (Y)->type \ && (X)->u.val == (Y)->u.val \ @@ -367,7 +367,7 @@ struct glyph /* Fill a character glyph GLYPH. CODE, FACE_ID, PADDING_P correspond to the bits defined for the typedef `GLYPH' in lisp.h. */ - + #define SET_CHAR_GLYPH(GLYPH, CODE, FACE_ID, PADDING_P) \ do \ { \ @@ -379,7 +379,7 @@ struct glyph /* Fill a character type glyph GLYPH from a glyph typedef FROM as defined in lisp.h. */ - + #define SET_CHAR_GLYPH_FROM_GLYPH(GLYPH, FROM) \ SET_CHAR_GLYPH ((GLYPH), \ FAST_GLYPH_CHAR ((FROM)), \ @@ -389,14 +389,14 @@ struct glyph /* Construct a glyph code from a character glyph GLYPH. If the character is multibyte, return -1 as we can't use glyph table for a multibyte character. */ - + #define GLYPH_FROM_CHAR_GLYPH(GLYPH) \ ((GLYPH).u.ch < 256 \ ? ((GLYPH).u.ch | ((GLYPH).face_id << CHARACTERBITS)) \ : -1) /* Is GLYPH a padding glyph? */ - + #define CHAR_GLYPH_PADDING_P(GLYPH) (GLYPH).padding_p @@ -557,7 +557,7 @@ enum glyph_row_area Each row is partitioned into three areas. The start and end of each area is recorded in a pointer as shown below. - + +--------------------+-------------+---------------------+ | left margin area | text area | right margin area | +--------------------+-------------+---------------------+ @@ -565,13 +565,13 @@ enum glyph_row_area glyphs[LEFT_MARGIN_AREA] glyphs[RIGHT_MARGIN_AREA] | | glyphs[TEXT_AREA] | - glyphs[LAST_AREA] + glyphs[LAST_AREA] Rows in frame matrices reference glyph memory allocated in a frame glyph pool (see the description of struct glyph_pool). Rows in window matrices on frames having frame matrices reference slices of the glyphs of corresponding rows in the frame matrix. - + Rows in window matrices on frames having no frame matrices point to glyphs allocated from the heap via xmalloc; glyphs[LEFT_MARGIN_AREA] is the start address of the allocated @@ -655,7 +655,7 @@ struct glyph_row /* 1 means the overlay arrow is on this line. */ unsigned overlay_arrow_p : 1; - + /* 1 means that this row displays a continued line, i.e. it has a continuation mark at the right side. */ unsigned continued_p : 1; @@ -695,7 +695,7 @@ struct glyph_row of more than one glyph. Some glyphs have been put in this row, the rest are put in rows below this one. */ unsigned ends_in_middle_of_char_p : 1; - + /* 1 means this line starts in the middle of a character consisting of more than one glyph. Some glyphs have been put in the previous row, the rest are put in this row. */ @@ -726,7 +726,7 @@ struct glyph_row *matrix_row P_ ((struct glyph_matrix *, int)); #define MATRIX_ROW(MATRIX, ROW) ((MATRIX)->rows + (ROW)) #endif -/* Return a pointer to the row reserved for the mode line in MATRIX. +/* Return a pointer to the row reserved for the mode line in MATRIX. Row MATRIX->nrows - 1 is always reserved for the mode line. */ #define MATRIX_MODE_LINE_ROW(MATRIX) \ @@ -751,29 +751,29 @@ struct glyph_row *matrix_row P_ ((struct glyph_matrix *, int)); (MATRIX_ROW ((MATRIX), (ROW))->glyphs[TEXT_AREA]) /* Return the number of used glyphs in the text area of a row. */ - + #define MATRIX_ROW_USED(MATRIX, ROW) \ (MATRIX_ROW ((MATRIX), (ROW))->used[TEXT_AREA]) /* Return the character/ byte position at which the display of ROW starts. */ - + #define MATRIX_ROW_START_CHARPOS(ROW) ((ROW)->start.pos.charpos) #define MATRIX_ROW_START_BYTEPOS(ROW) ((ROW)->start.pos.bytepos) /* Return the character/ byte position at which ROW ends. */ - + #define MATRIX_ROW_END_CHARPOS(ROW) ((ROW)->end.pos.charpos) #define MATRIX_ROW_END_BYTEPOS(ROW) ((ROW)->end.pos.bytepos) /* Return the vertical position of ROW in MATRIX. */ - + #define MATRIX_ROW_VPOS(ROW, MATRIX) ((ROW) - (MATRIX)->rows) /* Return the last glyph row + 1 in MATRIX on window W reserved for text. If W has a mode line, the last row in the matrix is reserved for it. */ - + #define MATRIX_BOTTOM_TEXT_ROW(MATRIX, W) \ ((MATRIX)->rows \ + (MATRIX)->nrows \ @@ -781,46 +781,46 @@ struct glyph_row *matrix_row P_ ((struct glyph_matrix *, int)); /* Non-zero if the face of the last glyph in ROW's text area has to be drawn to the end of the text area. */ - + #define MATRIX_ROW_EXTENDS_FACE_P(ROW) ((ROW)->fill_line_p) /* Set and query the enabled_p flag of glyph row ROW in MATRIX. */ - + #define SET_MATRIX_ROW_ENABLED_P(MATRIX, ROW, VALUE) \ (MATRIX_ROW ((MATRIX), (ROW))->enabled_p = (VALUE) != 0) - + #define MATRIX_ROW_ENABLED_P(MATRIX, ROW) \ (MATRIX_ROW ((MATRIX), (ROW))->enabled_p) /* Non-zero if ROW displays text. Value is non-zero if the row is blank but displays a line end. */ - + #define MATRIX_ROW_DISPLAYS_TEXT_P(ROW) ((ROW)->displays_text_p) /* Non-zero if ROW is not completely visible in window W. */ - + #define MATRIX_ROW_PARTIALLY_VISIBLE_P(ROW) \ ((ROW)->height != (ROW)->visible_height) /* Non-zero if ROW is partially visible at the top of window W. */ - + #define MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P(W, ROW) \ (MATRIX_ROW_PARTIALLY_VISIBLE_P ((ROW)) \ && (ROW)->y < WINDOW_DISPLAY_HEADER_LINE_HEIGHT ((W))) /* Non-zero if ROW is partially visible at the bottom of window W. */ - + #define MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P(W, ROW) \ (MATRIX_ROW_PARTIALLY_VISIBLE_P ((ROW)) \ && (ROW)->y + (ROW)->height > WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE ((W))) /* Return the bottom Y + 1 of ROW. */ - + #define MATRIX_ROW_BOTTOM_Y(ROW) ((ROW)->y + (ROW)->height) /* Is ROW the last visible one in the display described by the iterator structure pointed to by IT?. */ - + #define MATRIX_ROW_LAST_VISIBLE_P(ROW, IT) \ (MATRIX_ROW_BOTTOM_Y ((ROW)) >= (IT)->last_visible_y) @@ -844,7 +844,7 @@ struct glyph_row *matrix_row P_ ((struct glyph_matrix *, int)); ((ROW)->end.overlay_string_index >= 0) /* Non-zero if ROW starts in the middle of a character. See above. */ - + #define MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P(ROW) \ ((ROW)->start.dpvec_index >= 0 \ || (ROW)->starts_in_middle_of_char_p \ @@ -1016,14 +1016,14 @@ extern struct glyph_row scratch_glyph_row; * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W)))))) /* Height of the display region of W, including a mode line, if any. */ - + #define WINDOW_DISPLAY_PIXEL_HEIGHT(W) \ (XFASTINT ((W)->height) \ * CANON_Y_UNIT (XFRAME (WINDOW_FRAME ((W))))) /* Height in pixels of the mode line. May be zero if W doesn't have a mode line. */ - + #define WINDOW_DISPLAY_MODE_LINE_HEIGHT(W) \ (WINDOW_WANTS_MODELINE_P ((W)) \ ? CURRENT_MODE_LINE_HEIGHT (W) \ @@ -1031,27 +1031,27 @@ extern struct glyph_row scratch_glyph_row; /* Height in pixels of the header line. Zero if W doesn't have a header line. */ - + #define WINDOW_DISPLAY_HEADER_LINE_HEIGHT(W) \ (WINDOW_WANTS_HEADER_LINE_P ((W)) \ ? CURRENT_HEADER_LINE_HEIGHT (W) \ : 0) /* Pixel height of window W without mode line. */ - + #define WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE(W) \ (WINDOW_DISPLAY_PIXEL_HEIGHT ((W)) \ - WINDOW_DISPLAY_MODE_LINE_HEIGHT ((W))) /* Pixel height of window W without mode and header line. */ - + #define WINDOW_DISPLAY_TEXT_HEIGHT(W) \ (WINDOW_DISPLAY_PIXEL_HEIGHT ((W)) \ - WINDOW_DISPLAY_MODE_LINE_HEIGHT ((W)) \ - WINDOW_DISPLAY_HEADER_LINE_HEIGHT ((W))) /* Left edge of W in pixels relative to its frame. */ - + #define WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X(W) \ (FRAME_INTERNAL_BORDER_WIDTH_SAFE (XFRAME (WINDOW_FRAME ((W)))) \ + (WINDOW_LEFT_MARGIN ((W)) \ @@ -1059,54 +1059,54 @@ extern struct glyph_row scratch_glyph_row; + FRAME_LEFT_FRINGE_WIDTH (XFRAME (WINDOW_FRAME ((W))))) /* Right edge of window W in pixels, relative to its frame. */ - + #define WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X(W) \ (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X ((W)) \ + WINDOW_DISPLAY_PIXEL_WIDTH ((W))) /* Top edge of W in pixels relative to its frame. */ - + #define WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y(W) \ (FRAME_INTERNAL_BORDER_WIDTH_SAFE (XFRAME (WINDOW_FRAME ((W)))) \ + (XFASTINT ((W)->top) \ * CANON_Y_UNIT (XFRAME (WINDOW_FRAME ((W)))))) /* Bottom edge of window W relative to its frame. */ - + #define WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y(W) \ (WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y ((W)) \ + WINDOW_DISPLAY_PIXEL_HEIGHT ((W))) - + /* Convert window W relative pixel X to frame pixel coordinates. */ - + #define WINDOW_TO_FRAME_PIXEL_X(W, X) \ ((X) + WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X ((W))) /* Convert window W relative pixel Y to frame pixel coordinates. */ - + #define WINDOW_TO_FRAME_PIXEL_Y(W, Y) \ ((Y) + WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y ((W))) /* Convert frame relative pixel X to window relative pixel X. */ - + #define FRAME_TO_WINDOW_PIXEL_X(W, X) \ ((X) - WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X ((W))) /* Convert frame relative pixel Y to window relative pixel Y. */ - + #define FRAME_TO_WINDOW_PIXEL_Y(W, Y) \ ((Y) - WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y ((W))) /* Width of left margin area in pixels. */ - + #define WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH(W) \ (NILP ((W)->left_margin_width) \ ? 0 \ : (XINT ((W)->left_margin_width) \ * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W)))))) - + /* Width of right marginal area in pixels. */ - + #define WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH(W) \ (NILP ((W)->right_margin_width) \ ? 0 \ @@ -1114,7 +1114,7 @@ extern struct glyph_row scratch_glyph_row; * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W)))))) /* Width of text area in pixels. */ - + #define WINDOW_DISPLAY_TEXT_AREA_PIXEL_WIDTH(W) \ (WINDOW_DISPLAY_PIXEL_WIDTH ((W)) \ - WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH ((W)) \ @@ -1147,7 +1147,7 @@ extern struct glyph_row scratch_glyph_row; : (((AREA) == LEFT_MARGIN_AREA) \ ? WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH ((W)) \ : WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH ((W)))) - + /* Value is non-zero if window W wants a mode line. */ #define WINDOW_WANTS_MODELINE_P(W) \ @@ -1168,11 +1168,11 @@ extern struct glyph_row scratch_glyph_row; && !NILP (XBUFFER ((W)->buffer)->header_line_format) \ && XFASTINT ((W)->height) > 1 + !NILP (XBUFFER ((W)->buffer)->mode_line_format)) - + /*********************************************************************** Faces ***********************************************************************/ - + /* Indices of face attributes in Lisp face vectors. Slot zero is the symbol `face'. */ @@ -1230,11 +1230,11 @@ struct face int id; #ifdef HAVE_WINDOW_SYSTEM - + /* If non-zero, this is a GC that we can use without modification for drawing the characters in this face. */ GC gc; - + /* Font used for this face, or null if the font could not be loaded for some reason. This points to a `font' slot of a struct font_info, and we should not call XFreeFont on it because the @@ -1255,7 +1255,7 @@ struct face /* Pixel value of foreground color for X frames. Color index for tty frames. */ unsigned long foreground; - + /* Pixel value or color index of background color. */ unsigned long background; @@ -1283,10 +1283,10 @@ struct face Otherwise, a specific font is loaded from the set of fonts specified by the fontset given by the family attribute of the face. */ int fontset; - + /* Pixmap width and height. */ unsigned int pixmap_w, pixmap_h; - + /* Non-zero means characters in this face have a box that thickness around them. If it is negative, the absolute value indicates the thickness, and the horizontal lines of box (top and bottom) are @@ -1335,7 +1335,7 @@ struct face /* 1 means that either no color is specified for underlining or that the specified color couldn't be loaded. Use the foreground color when drawing in that case. */ - unsigned underline_defaulted_p : 1; + unsigned underline_defaulted_p : 1; /* 1 means that either no color is specified for the corresponding attribute or that the specified color couldn't be loaded. @@ -1415,7 +1415,7 @@ struct face_cache { /* Hash table of cached realized faces. */ struct face **buckets; - + /* Back-pointer to the frame this cache belongs to. */ struct frame *f; @@ -1460,7 +1460,7 @@ struct face_cache /* Return the id of the realized face on frame F that is like the face with id ID but is suitable for displaying character CHAR. This macro is only meaningful for multibyte character CHAR. */ - + #define FACE_FOR_CHAR(F, FACE, CHAR) \ (SINGLE_BYTE_CHAR_P (CHAR) \ ? (FACE)->ascii_face->id \ @@ -1690,7 +1690,7 @@ struct it /* Stack pointer. */ int sp; - + /* Setting of buffer-local variable selective-display-ellipsis. */ unsigned selective_display_ellipsis_p : 1; @@ -1715,7 +1715,7 @@ struct it /* Non-null means that the current character is the first in a run of characters with box face. */ unsigned start_of_box_run_p : 1; - + /* Non-zero means that the current character is the last in a run of characters with box face. */ unsigned end_of_box_run_p : 1; @@ -1809,7 +1809,7 @@ struct it /* Number of glyphs needed for the last character requested via produce_glyphs. This is 1 except for tabs. */ int nglyphs; - + /* Width of the display element in pixels. Result of produce_glyphs. */ int pixel_width; @@ -1925,7 +1925,7 @@ struct redisplay_interface /* Produce glyphs/get display metrics for the display element IT is loaded with. */ void (*produce_glyphs) P_ ((struct it *it)); - + /* Write or insert LEN glyphs from STRING at the nominal output position. */ void (*write_glyphs) P_ ((struct glyph *string, int len)); @@ -1934,7 +1934,7 @@ struct redisplay_interface /* Clear from nominal output position to X. X < 0 means clear to right end of display. */ void (*clear_end_of_line) P_ ((int x)); - + /* Function to call to scroll the display as described by RUN on window W. */ void (*scroll_run_hook) P_ ((struct window *w, struct run *run)); @@ -1955,7 +1955,7 @@ struct redisplay_interface have to update the mouse highlight. */ void (*update_window_end_hook) P_ ((struct window *w, int cursor_on_p, int mouse_face_overwritten_p)); - + /* Move cursor to row/column position VPOS/HPOS, pixel coordinates Y/X. HPOS/VPOS are window-relative row and column numbers and X/Y are window-relative pixel positions. */ diff --git a/src/dispnew.c b/src/dispnew.c index 4ea59834762..1318bcb851f 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -317,7 +317,7 @@ struct redisplay_interface *rif; int fonts_changed_p; -/* Convert vpos and hpos from frame to window and vice versa. +/* Convert vpos and hpos from frame to window and vice versa. This may only be used for terminal frames. */ #if GLYPH_DEBUG @@ -368,12 +368,12 @@ add_window_display_history (w, msg, paused_p) int paused_p; { char *buf; - + if (history_idx >= REDISPLAY_HISTORY_SIZE) history_idx = 0; buf = redisplay_history[history_idx].trace; ++history_idx; - + sprintf (buf, "%d: window %p (`%s')%s\n", history_tick++, w, @@ -396,12 +396,12 @@ add_frame_display_history (f, paused_p) int paused_p; { char *buf; - + if (history_idx >= REDISPLAY_HISTORY_SIZE) history_idx = 0; buf = redisplay_history[history_idx].trace; ++history_idx; - + sprintf (buf, "%d: update frame %p%s", history_tick++, f, paused_p ? " ***paused***" : ""); @@ -490,7 +490,7 @@ safe_bcopy (from, to, size) bcopy (from, to, endt - from); } } -} +} @@ -530,7 +530,7 @@ new_glyph_matrix (pool) is freed. If the count gets negative, more structures were freed than allocated, i.e. one matrix was freed more than once or a bogus pointer was passed to this function. - + If MATRIX->pool is null, this means that the matrix manages its own glyph memory---this is done for matrices on X frames. Freeing the matrix also frees the glyph memory in this case. */ @@ -552,7 +552,7 @@ free_glyph_matrix (matrix) if (matrix->pool == NULL) for (i = 0; i < matrix->rows_allocated; ++i) xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); - + /* Free row structures and the matrix itself. */ xfree (matrix->rows); xfree (matrix); @@ -655,7 +655,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim) && matrix->window_width == window_width) return; } - + /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ if (matrix->rows_allocated < dim.height) { @@ -675,7 +675,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim) if (matrix->pool) { xassert (matrix->pool->glyphs); - + if (w) { left = margin_glyphs_to_reserve (w, dim.width, @@ -685,16 +685,16 @@ adjust_glyph_matrix (w, matrix, x, y, dim) } else left = right = 0; - + for (i = 0; i < dim.height; ++i) { struct glyph_row *row = &matrix->rows[i]; - - row->glyphs[LEFT_MARGIN_AREA] + + row->glyphs[LEFT_MARGIN_AREA] = (matrix->pool->glyphs + (y + i) * matrix->pool->ncolumns + x); - + if (w == NULL || row == matrix->rows + dim.height - 1 || (row == matrix->rows && matrix->header_line_p)) @@ -716,7 +716,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim) = row->glyphs[LEFT_MARGIN_AREA] + dim.width; } } - + matrix->left_margin_glyphs = left; matrix->right_margin_glyphs = right; } @@ -731,14 +731,14 @@ adjust_glyph_matrix (w, matrix, x, y, dim) { struct glyph_row *row = matrix->rows; struct glyph_row *end = row + matrix->rows_allocated; - + while (row < end) { row->glyphs[LEFT_MARGIN_AREA] = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], (dim.width * sizeof (struct glyph))); - + /* The mode line never has marginal areas. */ if (row == matrix->rows + dim.height - 1 || (row == matrix->rows && matrix->header_line_p)) @@ -767,7 +767,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim) matrix->left_margin_glyphs = left; matrix->right_margin_glyphs = right; } - + /* Number of rows to be used by MATRIX. */ matrix->nrows = dim.height; xassert (matrix->nrows >= 0); @@ -782,7 +782,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim) building desired matrices when this function runs. */ if (window_width < 0) window_width = window_box_width (w, -1); - + /* Optimize the case that only the height has changed (C-x 2, upper window). Invalidate all rows that are no longer part of the window. */ @@ -807,7 +807,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim) if (INTEGERP (w->window_end_vpos) && XFASTINT (w->window_end_vpos) >= i) w->window_end_valid = Qnil; - + while (i < matrix->nrows) matrix->rows[i++].enabled_p = 0; } @@ -827,8 +827,8 @@ adjust_glyph_matrix (w, matrix, x, y, dim) matrix->rows[i].enabled_p = 0; } } - - + + /* Remember last values to be able to optimize frame redraws. */ matrix->matrix_x = x; matrix->matrix_y = y; @@ -939,7 +939,7 @@ enable_glyph_matrix_rows (matrix, start, end, enabled_p) xassert (start <= end); xassert (start >= 0 && start < matrix->nrows); xassert (end >= 0 && end <= matrix->nrows); - + for (; start < end; ++start) matrix->rows[start].enabled_p = enabled_p != 0; } @@ -965,7 +965,7 @@ clear_glyph_matrix (matrix) matrix->no_scrolling_p = 0; } } - + /* Shift part of the glyph matrix MATRIX of window W up or down. Increment y-positions in glyph rows between START and END by DY, @@ -978,21 +978,21 @@ shift_glyph_matrix (w, matrix, start, end, dy) int start, end, dy; { int min_y, max_y; - + xassert (start <= end); xassert (start >= 0 && start < matrix->nrows); xassert (end >= 0 && end <= matrix->nrows); - + min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w); - + for (; start < end; ++start) { struct glyph_row *row = &matrix->rows[start]; - + row->y += dy; row->visible_height = row->height; - + if (row->y < min_y) row->visible_height -= min_y - row->y; if (row->y + row->height > max_y) @@ -1037,7 +1037,7 @@ clear_desired_matrices (f) { if (f->desired_matrix) clear_glyph_matrix (f->desired_matrix); - + if (WINDOWP (f->menu_bar_window)) clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); @@ -1142,16 +1142,16 @@ blank_row (w, row, y) int y; { int min_y, max_y; - + min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w); - + clear_glyph_row (row); row->y = y; row->ascent = row->phys_ascent = 0; row->height = row->phys_height = CANON_Y_UNIT (XFRAME (w->frame)); row->visible_height = row->height; - + if (row->y < min_y) row->visible_height -= min_y - row->y; if (row->y + row->height > max_y) @@ -1290,7 +1290,7 @@ copy_glyph_row_contents (to, from, delta, delta_bytes) /* Copy glyphs from FROM to TO. */ for (area = 0; area < LAST_AREA; ++area) if (from->used[area]) - bcopy (from->glyphs[area], to->glyphs[area], + bcopy (from->glyphs[area], to->glyphs[area], from->used[area] * sizeof (struct glyph)); /* Increment buffer positions in TO by DELTA. */ @@ -1383,7 +1383,7 @@ line_hash_code (row) struct glyph_row *row; { int hash = 0; - + if (row->enabled_p) { struct glyph *glyph = row->glyphs[TEXT_AREA]; @@ -1431,7 +1431,7 @@ line_draw_cost (matrix, vpos) while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) --end; - /* All blank line. */ + /* All blank line. */ if (end == beg) return 0; @@ -1452,17 +1452,17 @@ line_draw_cost (matrix, vpos) while (beg < end) { GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg); - + if (g < 0 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) len += 1; else len += GLYPH_LENGTH (glyph_table_base, g); - + ++beg; } } - + return len; } @@ -1473,7 +1473,7 @@ line_draw_cost (matrix, vpos) visibility. MOUSE_FACE_P non-zero means compare the mouse_face_p flags of A and B, too. */ -static INLINE int +static INLINE int row_equal_p (w, a, b, mouse_face_p) struct window *w; struct glyph_row *a, *b; @@ -1496,15 +1496,15 @@ row_equal_p (w, a, b, mouse_face_p) { if (a->used[area] != b->used[area]) return 0; - + a_glyph = a->glyphs[area]; a_end = a_glyph + a->used[area]; b_glyph = b->glyphs[area]; - + while (a_glyph < a_end && GLYPH_EQUAL_P (a_glyph, b_glyph)) ++a_glyph, ++b_glyph; - + if (a_glyph != a_end) return 0; } @@ -1551,10 +1551,10 @@ new_glyph_pool () /* Allocate a new glyph_pool and clear it. */ result = (struct glyph_pool *) xmalloc (sizeof *result); bzero (result, sizeof *result); - + /* For memory leak and double deletion checking. */ ++glyph_pool_count; - + return result; } @@ -1626,7 +1626,7 @@ realloc_glyph_pool (pool, matrix_dim) determine pointers to rows of window sub-matrices. */ pool->nrows = matrix_dim.height; pool->ncolumns = matrix_dim.width; - + return changed_p; } @@ -1659,7 +1659,7 @@ check_matrix_pointer_lossage (matrix) struct glyph_matrix *matrix; { int i, j; - + for (i = 0; i < matrix->nrows; ++i) for (j = 0; j < matrix->nrows; ++j) xassert (i == j @@ -1684,7 +1684,7 @@ matrix_row (matrix, row) #if 0 check_matrix_pointer_lossage (matrix); #endif - + return matrix->rows + row; } @@ -1707,7 +1707,7 @@ check_matrix_invariants (w) struct buffer *saved = current_buffer; struct buffer *buffer = XBUFFER (w->buffer); int c; - + /* This can sometimes happen for a fresh window. */ if (matrix->nrows < 2) return; @@ -1870,18 +1870,18 @@ allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); /* For WINDOW and all windows on the same level. */ - do + do { w = XWINDOW (window); /* Get the dimension of the window sub-matrix for W, depending on whether this is a combination or a leaf window. */ if (!NILP (w->hchild)) - dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, + dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, dim_only_p, window_change_flags); else if (!NILP (w->vchild)) - dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, + dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, dim_only_p, window_change_flags); else @@ -1893,7 +1893,7 @@ allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, w->current_matrix = new_glyph_matrix (f->current_pool); *window_change_flags |= NEW_LEAF_MATRIX; } - + /* Width and height MUST be chosen so that there are no holes in the frame matrix. */ dim.width = required_matrix_width (w); @@ -1929,7 +1929,7 @@ allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, below W. */ if (in_horz_combination_p) x += dim.width; - else + else y += dim.height; /* Remember maximum glyph matrix dimensions. */ @@ -1952,7 +1952,7 @@ allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, total.width = x - x0; total.height = hmax; } - else + else { total.width = wmax; total.height = y - y0; @@ -1970,7 +1970,7 @@ required_matrix_height (w) { #ifdef HAVE_WINDOW_SYSTEM struct frame *f = XFRAME (w->frame); - + if (FRAME_WINDOW_P (f)) { int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); @@ -1984,7 +1984,7 @@ required_matrix_height (w) + 2); } #endif /* HAVE_WINDOW_SYSTEM */ - + return XINT (w->height); } @@ -2001,7 +2001,7 @@ required_matrix_width (w) { int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f); int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f); - + /* Compute number of glyphs needed in a glyph row. */ return (((window_pixel_width + ch_width - 1) / ch_width) @@ -2020,7 +2020,7 @@ required_matrix_width (w) /* Allocate window matrices for window-based redisplay. W is the window whose matrices must be allocated/reallocated. CH_DIM is the size of the smallest character that could potentially be used on W. */ - + static void allocate_matrices_for_window_redisplay (w) struct window *w; @@ -2048,7 +2048,7 @@ allocate_matrices_for_window_redisplay (w) adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); } - + w = NILP (w->next) ? NULL : XWINDOW (w->next); } } @@ -2072,7 +2072,7 @@ adjust_glyphs (f) else { Lisp_Object tail, lisp_frame; - + FOR_EACH_FRAME (tail, lisp_frame) adjust_frame_glyphs (XFRAME (lisp_frame)); } @@ -2082,9 +2082,9 @@ adjust_glyphs (f) /* Adjust frame glyphs when Emacs is initialized. - - To be called from init_display. - + + To be called from init_display. + We need a glyph matrix because redraw will happen soon. Unfortunately, window sizes on selected_frame are not yet set to meaningful values. I believe we can assume that there are only two @@ -2115,7 +2115,7 @@ adjust_frame_glyphs_initially () adjust_frame_glyphs (sf); glyphs_initialized_initially_p = 1; } - + /* Allocate/reallocate glyph matrices of a single frame F. */ @@ -2127,7 +2127,7 @@ adjust_frame_glyphs (f) adjust_frame_glyphs_for_window_redisplay (f); else adjust_frame_glyphs_for_frame_redisplay (f); - + /* Don't forget the message buffer and the buffer for decode_mode_spec. */ adjust_frame_message_buffer (f); @@ -2145,11 +2145,11 @@ fake_current_matrices (window) Lisp_Object window; { struct window *w; - + for (; !NILP (window); window = w->next) { w = XWINDOW (window); - + if (!NILP (w->hchild)) fake_current_matrices (w->hchild); else if (!NILP (w->vchild)) @@ -2163,7 +2163,7 @@ fake_current_matrices (window) xassert (m->matrix_h == XFASTINT (w->height)); xassert (m->matrix_w == XFASTINT (w->width)); - + for (i = 0; i < m->matrix_h; ++i) { struct glyph_row *r = m->rows + i; @@ -2238,7 +2238,7 @@ restore_current_matrix (f, saved) to->used[TEXT_AREA] = from->used[TEXT_AREA]; xfree (from->glyphs[TEXT_AREA]); } - + xfree (saved->rows); xfree (saved); } @@ -2264,7 +2264,7 @@ adjust_frame_glyphs_for_frame_redisplay (f) /* Determine the smallest character in any font for F. On console windows, all characters have dimension (1, 1). */ ch_dim.width = ch_dim.height = 1; - + top_window_y = FRAME_TOP_MARGIN (f); /* Allocate glyph pool structures if not already done. */ @@ -2280,7 +2280,7 @@ adjust_frame_glyphs_for_frame_redisplay (f) f->desired_matrix = new_glyph_matrix (f->desired_pool); f->current_matrix = new_glyph_matrix (f->current_pool); } - + /* Compute window glyph matrices. (This takes the mini-buffer window into account). The result is the size of the frame glyph matrix needed. The variable window_change_flags is set to a bit @@ -2301,7 +2301,7 @@ adjust_frame_glyphs_for_frame_redisplay (f) pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); realloc_glyph_pool (f->current_pool, matrix_dim); - /* Set up glyph pointers within window matrices. Do this only if + /* Set up glyph pointers within window matrices. Do this only if absolutely necessary since it requires a frame redraw. */ if (pool_changed_p || window_change_flags) { @@ -2315,7 +2315,7 @@ adjust_frame_glyphs_for_frame_redisplay (f) to the frame width (from CHANGE_FRAME_SIZE_1). */ xassert (matrix_dim.width == FRAME_WIDTH (f) && matrix_dim.height == FRAME_HEIGHT (f)); - + /* Pointers to glyph memory in glyph rows are exchanged during the update phase of redisplay, which means in general that a frame's current matrix consists of pointers into both the @@ -2357,7 +2357,7 @@ adjust_frame_glyphs_for_window_redisplay (f) struct window *w; xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); - + /* Get minimum sizes. */ #ifdef HAVE_WINDOW_SYSTEM ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f); @@ -2365,7 +2365,7 @@ adjust_frame_glyphs_for_window_redisplay (f) #else ch_dim.width = ch_dim.height = 1; #endif - + /* Allocate/reallocate window matrices. */ allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); @@ -2416,7 +2416,7 @@ adjust_frame_glyphs_for_window_redisplay (f) } -/* Adjust/ allocate message buffer of frame F. +/* Adjust/ allocate message buffer of frame F. Note that the message buffer is never freed. Since I could not find a free in 19.34, I assume that freeing it would be @@ -2474,7 +2474,7 @@ free_glyphs (f) event while we're in an inconsistent state. */ BLOCK_INPUT; f->glyphs_initialized_p = 0; - + /* Release window sub-matrices. */ if (!NILP (f->root_window)) free_window_matrices (XWINDOW (f->root_window)); @@ -2516,7 +2516,7 @@ free_glyphs (f) free_glyph_pool (f->current_pool); f->desired_pool = f->current_pool = NULL; } - + UNBLOCK_INPUT; } } @@ -2536,7 +2536,7 @@ free_window_matrices (w) free_window_matrices (XWINDOW (w->hchild)); else if (!NILP (w->vchild)) free_window_matrices (XWINDOW (w->vchild)); - else + else { /* This is a leaf window. Free its memory and reset fields to zero in case this function is called a second time for @@ -2611,7 +2611,7 @@ check_glyph_memory () up glyph lengths of the window matrices. A line in the frame matrix is enabled, if a corresponding line in a window matrix is enabled. - + After building the desired frame matrix, it will be passed to terminal code, which will manipulate both the desired and current frame matrix. Changes applied to the frame's current matrix have @@ -2624,7 +2624,7 @@ check_glyph_memory () contents needed in a frame matrix. Thus, any modification of glyphs done in terminal code will be reflected in window matrices automatically. - + 2. Exchanges of rows in a frame matrix done by terminal code are intercepted by hook functions so that corresponding row operations on window matrices can be performed. This is necessary because we @@ -2649,7 +2649,7 @@ build_frame_matrix (f) /* F must have a frame matrix when this function is called. */ xassert (!FRAME_WINDOW_P (f)); - + /* Clear all rows in the frame matrix covered by window matrices. Menu bar lines are not covered by windows. */ for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) @@ -2747,7 +2747,7 @@ build_frame_matrix_from_leaf_window (frame_matrix, w) window_row = w->current_matrix->rows + window_y; current_row_p = 1; } - + if (current_row_p) { /* Copy window row to frame row. */ @@ -2758,11 +2758,11 @@ build_frame_matrix_from_leaf_window (frame_matrix, w) else { xassert (window_row->enabled_p); - + /* Only when a desired row has been displayed, we want the corresponding frame row to be updated. */ frame_row->enabled_p = 1; - + /* Maybe insert a vertical border between horizontally adjacent windows. */ if (right_border_glyph) @@ -2774,10 +2774,10 @@ build_frame_matrix_from_leaf_window (frame_matrix, w) /* Window row window_y must be a slice of frame row frame_y. */ xassert (glyph_row_slice_p (window_row, frame_row)); - + /* If rows are in sync, we don't have to copy glyphs because frame and window share glyphs. */ - + #if GLYPH_DEBUG strcpy (w->current_matrix->method, w->desired_matrix->method); add_window_display_history (w, w->current_matrix->method, 0); @@ -2787,7 +2787,7 @@ build_frame_matrix_from_leaf_window (frame_matrix, w) /* Set number of used glyphs in the frame matrix. Since we fill up with spaces, and visit leaf windows from left to right it can be done simply. */ - frame_row->used[TEXT_AREA] + frame_row->used[TEXT_AREA] = window_matrix->matrix_x + window_matrix->matrix_w; /* Next row. */ @@ -2853,7 +2853,7 @@ fill_up_frame_row_with_spaces (row, upto) { int i = row->used[TEXT_AREA]; struct glyph *glyph = row->glyphs[TEXT_AREA]; - + while (i < upto) glyph[i++] = space_glyph; @@ -2949,7 +2949,7 @@ mirror_make_current (w, frame_row) current_row->enabled_p = 1; } } - + w = NILP (w->next) ? 0 : XWINDOW (w->next); } } @@ -2964,7 +2964,7 @@ mirror_make_current (w, frame_row) row 0 <= I < NLINES which is empty. This function is called from do_scrolling and do_direct_scrolling. */ - + void mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, retained_p) @@ -2978,7 +2978,7 @@ mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, /* Rows to assign to. */ struct glyph_row *new_rows = MATRIX_ROW (matrix, unchanged_at_top); - + int i; /* Make a copy of the original rows. */ @@ -3030,7 +3030,7 @@ sync_window_with_frame_matrix_rows (w) window_row = w->current_matrix->rows; window_row_end = window_row + w->current_matrix->nrows; frame_row = f->current_matrix->rows + XFASTINT (w->top); - + for (; window_row < window_row_end; ++window_row, ++frame_row) { window_row->glyphs[LEFT_MARGIN_AREA] @@ -3054,7 +3054,7 @@ frame_row_to_window (w, row) int row; { struct window *found = NULL; - + while (w && !found) { if (!NILP (w->hchild)) @@ -3064,7 +3064,7 @@ frame_row_to_window (w, row) else if (row >= XFASTINT (w->top) && row < XFASTINT (w->top) + XFASTINT (w->height)) found = w; - + w = NILP (w->next) ? 0 : XWINDOW (w->next); } @@ -3114,36 +3114,36 @@ mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) { /* Frame relative line assigned to. */ int frame_to = i + unchanged_at_top; - + /* Frame relative line assigned. */ int frame_from = copy_from[i] + unchanged_at_top; - + /* Window relative line assigned to. */ int window_to = frame_to - m->matrix_y; - + /* Window relative line assigned. */ int window_from = frame_from - m->matrix_y; - + /* Is assigned line inside window? */ int from_inside_window_p = window_from >= 0 && window_from < m->matrix_h; - + /* Is assigned to line inside window? */ int to_inside_window_p = window_to >= 0 && window_to < m->matrix_h; - + if (from_inside_window_p && to_inside_window_p) { /* Enabled setting before assignment. */ int enabled_before_p; - + /* Do the assignment. The enabled_p flag is saved over the assignment because the old redisplay did that. */ enabled_before_p = m->rows[window_to].enabled_p; m->rows[window_to] = old_rows[window_from]; m->rows[window_to].enabled_p = enabled_before_p; - + /* If frame line is empty, window line is empty, too. */ if (!retained_p[copy_from[i]]) m->rows[window_to].enabled_p = 0; @@ -3163,7 +3163,7 @@ mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) m2_from = frame_from - m2->matrix_y; copy_row_except_pointers (m->rows + window_to, m2->rows + m2_from); - + /* If frame line is empty, window line is empty, too. */ if (!retained_p[copy_from[i]]) m->rows[window_to].enabled_p = 0; @@ -3177,7 +3177,7 @@ mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) pointers are in sync with the frame matrix. */ if (sync_p) sync_window_with_frame_matrix_rows (w); - + /* Check that no pointers are lost. */ CHECK_MATRIX (m); } @@ -3212,7 +3212,7 @@ check_window_matrix_pointers (w) check_matrix_pointers (w->desired_matrix, f->desired_matrix); check_matrix_pointers (w->current_matrix, f->current_matrix); } - + w = NILP (w->next) ? 0 : XWINDOW (w->next); } } @@ -3233,7 +3233,7 @@ check_matrix_pointers (window_matrix, frame_matrix) /* Row number corresponding to I in FRAME_MATRIX. */ int j = window_matrix->matrix_y; - /* For all rows check that the row in the window matrix is a + /* For all rows check that the row in the window matrix is a slice of the row in the frame matrix. If it isn't we didn't mirror an operation on the frame matrix correctly. */ while (i < window_matrix->nrows) @@ -3264,7 +3264,7 @@ window_to_frame_vpos (w, vpos) int vpos; { struct frame *f = XFRAME (w->frame); - + xassert (!FRAME_WINDOW_P (f)); xassert (vpos >= 0 && vpos <= w->desired_matrix->nrows); vpos += XFASTINT (w->top); @@ -3282,12 +3282,12 @@ window_to_frame_hpos (w, hpos) int hpos; { struct frame *f = XFRAME (w->frame); - + xassert (!FRAME_WINDOW_P (f)); hpos += XFASTINT (w->left); return hpos; } - + #endif /* GLYPH_DEBUG */ @@ -3429,8 +3429,8 @@ direct_output_for_insert (g) is handled specially there (see display_line). */ || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) /* Give up if overwriting in the middle of a line. */ - || (overwrite_p - && PT != ZV + || (overwrite_p + && PT != ZV && FETCH_BYTE (PT) != '\n') /* Give up for tabs and line ends. */ || g == '\t' @@ -3474,7 +3474,7 @@ direct_output_for_insert (g) glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); if (glyph_row->mouse_face_p) return 0; - + /* Give up if highlighting trailing whitespace and we have trailing whitespace in glyph_row. We would have to remove the trailing whitespace face in that case. */ @@ -3494,7 +3494,7 @@ direct_output_for_insert (g) if the overlay string has newlines in it. */ if (STRINGP (it.string)) return 0; - + it.hpos = w->cursor.hpos; it.vpos = w->cursor.vpos; it.current_x = w->cursor.x + it.first_visible_x; @@ -3505,7 +3505,7 @@ direct_output_for_insert (g) /* More than one display element may be returned for PT - 1 if (i) it's a control character which is translated into `\003' or - `^C', or (ii) it has a display table entry, or (iii) it's a + `^C', or (ii) it has a display table entry, or (iii) it's a combination of both. */ delta = delta_bytes = 0; while (get_next_display_element (&it)) @@ -3562,7 +3562,7 @@ direct_output_for_insert (g) bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, end - glyph_row->glyphs[TEXT_AREA]); - + /* Compute new line width. */ glyph = glyph_row->glyphs[TEXT_AREA]; end = glyph + glyph_row->used[TEXT_AREA]; @@ -3573,18 +3573,18 @@ direct_output_for_insert (g) ++glyph; } - /* Increment buffer positions for glyphs following the newly + /* Increment buffer positions for glyphs following the newly inserted ones. */ for (glyph = glyphs + n; glyph < end; ++glyph) if (glyph->charpos > 0 && BUFFERP (glyph->object)) glyph->charpos += delta; - + if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) { MATRIX_ROW_END_CHARPOS (glyph_row) += delta; MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; } - + /* Adjust positions in lines following the one we are in. */ increment_matrix_positions (w->current_matrix, w->cursor.vpos + 1, @@ -3611,7 +3611,7 @@ direct_output_for_insert (g) if (rif) { rif->update_window_begin_hook (w); - + if (glyphs == end - n /* In front of a space added by append_space. */ || (glyphs == end - n - 1 @@ -3684,8 +3684,8 @@ direct_output_forward_char (n) /* Give up if face attributes have been changed. */ if (face_change_count) return 0; - - /* Give up if current matrix is not up to date or we are + + /* Give up if current matrix is not up to date or we are displaying a message. */ if (!display_completed || cursor_in_echo_area) return 0; @@ -3712,7 +3712,7 @@ direct_output_forward_char (n) if (XWINDOW (minibuf_window) == w && EQ (minibuf_window, echo_area_window)) return 0; - + /* Give up if we don't know where the cursor is. */ if (w->cursor.vpos < 0) return 0; @@ -3725,13 +3725,13 @@ direct_output_forward_char (n) return 0; set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); - + w->last_cursor = w->cursor; XSETFASTINT (w->last_point, PT); xassert (w->cursor.hpos >= 0 && w->cursor.hpos < w->desired_matrix->matrix_w); - + if (FRAME_WINDOW_P (f)) rif->cursor_to (w->cursor.vpos, w->cursor.hpos, w->cursor.y, w->cursor.x); @@ -3745,7 +3745,7 @@ direct_output_forward_char (n) y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); cursor_to (y, x); } - + fflush (stdout); redisplay_performed_directly_p = 1; return 1; @@ -3762,7 +3762,7 @@ direct_output_forward_char (n) If FORCE_P is non-zero, don't let redisplay be stopped by detecting pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try scrolling. - + Value is non-zero if redisplay was stopped due to pending input. */ int @@ -3812,12 +3812,12 @@ update_frame (f, force_p, inhibit_hairy_id_p) f->desired_tool_bar_string = tem; } } - + /* Update windows. */ paused_p = update_window_tree (root_window, force_p); update_end (f); - + #if 0 /* This flush is a performance bottleneck under X, and it doesn't seem to be necessary anyway. */ rif->flush_display (f); @@ -3831,7 +3831,7 @@ update_frame (f, force_p, inhibit_hairy_id_p) /* Build F's desired matrix from window matrices. */ build_frame_matrix (f); - + /* Update the display */ update_begin (f); paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); @@ -3850,7 +3850,7 @@ update_frame (f, force_p, inhibit_hairy_id_p) /* Reset flags indicating that a window should be updated. */ set_window_update_flags (root_window, 0); - + display_completed = !paused_p; return paused_p; } @@ -3870,7 +3870,7 @@ update_window_tree (w, force_p) int force_p; { int paused_p = 0; - + while (w && !paused_p) { if (!NILP (w->hchild)) @@ -3922,7 +3922,7 @@ redraw_overlapped_rows (w, yb) int yb; { int i; - + /* If rows overlapping others have been changed, the rows being overlapped have to be redrawn. This won't draw lines that have already been drawn in update_window_line because overlapped_p in @@ -3936,11 +3936,11 @@ redraw_overlapped_rows (w, yb) break; else if (row->mode_line_p) continue; - + if (row->overlapped_p) { enum glyph_row_area area; - + for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) { updated_row = row; @@ -3950,7 +3950,7 @@ redraw_overlapped_rows (w, yb) rif->write_glyphs (row->glyphs[area], row->used[area]); rif->clear_end_of_line (-1); } - + row->overlapped_p = 0; } @@ -3970,7 +3970,7 @@ redraw_overlapping_rows (w, yb) { int i, bottom_y; struct glyph_row *row; - + for (i = 0; i < w->current_matrix->nrows; ++i) { row = w->current_matrix->rows + i; @@ -3979,17 +3979,17 @@ redraw_overlapping_rows (w, yb) break; else if (row->mode_line_p) continue; - + bottom_y = MATRIX_ROW_BOTTOM_Y (row); if (row->overlapping_p && i > 0 && bottom_y < yb) { if (row->used[LEFT_MARGIN_AREA]) rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA); - + if (row->used[TEXT_AREA]) rif->fix_overlapping_area (w, row, TEXT_AREA); - + if (row->used[RIGHT_MARGIN_AREA]) rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA); @@ -4078,7 +4078,7 @@ update_window (w, force_p) Adjust y-positions of other rows by the header line height. */ row = desired_matrix->rows; end = row + desired_matrix->nrows - 1; - + if (row->mode_line_p) { header_line_row = row; @@ -4103,7 +4103,7 @@ update_window (w, force_p) be also completely empty matrices. */ while (row < end && !row->enabled_p) ++row; - + /* Try reusing part of the display by copying. */ if (row < end && !desired_matrix->no_scrolling_p) { @@ -4136,7 +4136,7 @@ update_window (w, force_p) { int vpos = MATRIX_ROW_VPOS (row, desired_matrix); int i; - + /* We'll have to play a little bit with when to detect_input_pending. If it's done too often, scrolling large windows with repeated scroll-up @@ -4163,9 +4163,9 @@ update_window (w, force_p) /* Was display preempted? */ paused_p = row < end; - + set_cursor: - + /* Fix the appearance of overlapping/overlapped rows. */ if (!paused_p && !w->pseudo_window_p) { @@ -4174,7 +4174,7 @@ update_window (w, force_p) redraw_overlapped_rows (w, yb); redraw_overlapping_rows (w, yb); } - + /* Make cursor visible at cursor position of W. */ set_window_cursor_after_update (w); @@ -4202,7 +4202,7 @@ update_window (w, force_p) /* check_current_matrix_flags (w); */ add_window_display_history (w, w->current_matrix->method, paused_p); #endif - + clear_glyph_matrix (desired_matrix); return paused_p; @@ -4248,7 +4248,7 @@ update_text_area (w, vpos) /* Let functions in xterm.c know what area subsequent X positions will be relative to. */ updated_area = TEXT_AREA; - + /* If rows are at different X or Y, or rows have different height, or the current row is marked invalid, write the entire line. */ if (!current_row->enabled_p @@ -4262,11 +4262,11 @@ update_text_area (w, vpos) || current_row->x != desired_row->x) { rif->cursor_to (vpos, 0, desired_row->y, desired_row->x); - + if (desired_row->used[TEXT_AREA]) rif->write_glyphs (desired_row->glyphs[TEXT_AREA], desired_row->used[TEXT_AREA]); - + /* Clear to end of window. */ rif->clear_end_of_line (-1); changed_p = 1; @@ -4294,7 +4294,7 @@ update_text_area (w, vpos) extension actually takes place. */ if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) --desired_stop_pos; - + stop = min (current_row->used[TEXT_AREA], desired_stop_pos); i = 0; x = desired_row->x; @@ -4304,7 +4304,7 @@ update_text_area (w, vpos) while (i < stop) { int can_skip_p = 1; - + /* Skip over glyphs that both rows have in common. These don't have to be written. We can't skip if the last current glyph overlaps the glyph to its right. For @@ -4317,12 +4317,12 @@ update_text_area (w, vpos) { struct glyph *glyph = ¤t_row->glyphs[TEXT_AREA][i - 1]; int left, right; - + rif->get_glyph_overhangs (glyph, XFRAME (w->frame), &left, &right); can_skip_p = right == 0; } - + if (can_skip_p) { while (i < stop @@ -4347,7 +4347,7 @@ update_text_area (w, vpos) != desired_row->used[TEXT_AREA])) { int left, right; - + rif->get_glyph_overhangs (current_glyph, XFRAME (w->frame), &left, &right); while (left > 0 && i > 0) @@ -4358,7 +4358,7 @@ update_text_area (w, vpos) } } } - + /* Try to avoid writing the entire rest of the desired row by looking for a resync point. This mainly prevents mode line flickering in the case the mode line is in @@ -4395,7 +4395,7 @@ update_text_area (w, vpos) changed_p = 1; } } - + /* Write the rest. */ if (i < desired_row->used[TEXT_AREA]) { @@ -4403,7 +4403,7 @@ update_text_area (w, vpos) rif->write_glyphs (desired_glyph, desired_row->used[TEXT_AREA] - i); changed_p = 1; } - + /* Maybe clear to end of line. */ if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) { @@ -4427,7 +4427,7 @@ update_text_area (w, vpos) /* Otherwise clear to the end of the old row. Everything after that position should be clear already. */ int x; - + if (i >= desired_row->used[TEXT_AREA]) rif->cursor_to (vpos, i, desired_row->y, desired_row->x + desired_row->pixel_width); @@ -4470,8 +4470,8 @@ update_window_line (w, vpos, mouse_face_overwritten_p) know what line height values are in effect. */ updated_row = desired_row; - /* A row can be completely invisible in case a desired matrix was - built with a vscroll and then make_cursor_line_fully_visible shifts + /* A row can be completely invisible in case a desired matrix was + built with a vscroll and then make_cursor_line_fully_visible shifts the matrix. Make sure to make such rows current anyway, since we need the correct y-position, for example, in the current matrix. */ if (desired_row->mode_line_p @@ -4486,7 +4486,7 @@ update_window_line (w, vpos, mouse_face_overwritten_p) changed_p = 1; update_marginal_area (w, LEFT_MARGIN_AREA, vpos); } - + /* Update the display of the text area. */ if (update_text_area (w, vpos)) { @@ -4494,7 +4494,7 @@ update_window_line (w, vpos, mouse_face_overwritten_p) if (current_row->mouse_face_p) *mouse_face_overwritten_p = 1; } - + /* Update display of the right margin area, if there is one. */ if (!desired_row->full_width_p && !NILP (w->right_margin_width)) @@ -4502,7 +4502,7 @@ update_window_line (w, vpos, mouse_face_overwritten_p) changed_p = 1; update_marginal_area (w, RIGHT_MARGIN_AREA, vpos); } - + /* Draw truncation marks etc. */ if (!current_row->enabled_p || desired_row->y != current_row->y @@ -4518,7 +4518,7 @@ update_window_line (w, vpos, mouse_face_overwritten_p) != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) rif->after_update_window_line_hook (desired_row); } - + /* Update current_row from desired_row. */ make_current (w->desired_matrix, w->current_matrix, vpos); updated_row = NULL; @@ -4538,7 +4538,7 @@ set_window_cursor_after_update (w) /* Not intended for frame matrix updates. */ xassert (FRAME_WINDOW_P (f)); - + if (cursor_in_echo_area && !NILP (echo_area_buffer[0]) /* If we are showing a message instead of the mini-buffer, @@ -4573,7 +4573,7 @@ set_window_cursor_after_update (w) last_row = row; ++row; } - + if (last_row) { struct glyph *start = last_row->glyphs[TEXT_AREA]; @@ -4581,7 +4581,7 @@ set_window_cursor_after_update (w) while (last > start && last->charpos < 0) --last; - + for (glyph = start; glyph < last; ++glyph) { cx += glyph->pixel_width; @@ -4629,7 +4629,7 @@ set_window_update_flags (w, on_p) w = NILP (w->next) ? 0 : XWINDOW (w->next); } -} +} @@ -4643,16 +4643,16 @@ struct row_entry { /* Number of occurrences of this row in desired and current matrix. */ int old_uses, new_uses; - + /* Vpos of row in new matrix. */ int new_line_number; /* Bucket index of this row_entry in the hash table row_table. */ int bucket; - + /* The row described by this entry. */ struct glyph_row *row; - + /* Hash collision chain. */ struct row_entry *next; }; @@ -4700,11 +4700,11 @@ add_row_entry (w, row) { struct row_entry *entry; int i = row->hash % row_table_size; - + entry = row_table[i]; while (entry && !row_equal_p (w, entry->row, row, 1)) entry = entry->next; - + if (entry == NULL) { entry = row_entry_pool + row_entry_idx++; @@ -4781,7 +4781,7 @@ scrolling_window (w, header_line_p) /* Give up if some rows in the desired matrix are not enabled. */ if (!MATRIX_ROW (desired_matrix, i)->enabled_p) return -1; - + first_old = first_new = i; /* Set last_new to the index + 1 of the last enabled row in the @@ -4833,14 +4833,14 @@ scrolling_window (w, header_line_p) return 0; /* Reallocate vectors, tables etc. if necessary. */ - + if (current_matrix->nrows > old_lines_size) { old_lines_size = current_matrix->nrows; nbytes = old_lines_size * sizeof *old_lines; old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); } - + if (desired_matrix->nrows > new_lines_size) { new_lines_size = desired_matrix->nrows; @@ -4878,7 +4878,7 @@ scrolling_window (w, header_line_p) /* Add rows from the current and desired matrix to the hash table row_hash_table to be able to find equal ones quickly. */ - + for (i = first_old; i < last_old; ++i) { if (MATRIX_ROW (current_matrix, i)->enabled_p) @@ -4927,8 +4927,8 @@ scrolling_window (w, header_line_p) && old_lines[j] == new_lines[k]) { int h = MATRIX_ROW (current_matrix, j)->height; - --run->current_vpos; - --run->desired_vpos; + --run->current_vpos; + --run->desired_vpos; ++run->nrows; run->height += h; run->desired_y -= h; @@ -4944,7 +4944,7 @@ scrolling_window (w, header_line_p) && old_lines[j] == new_lines[k]) { int h = MATRIX_ROW (current_matrix, j)->height; - ++run->nrows; + ++run->nrows; run->height += h; ++j, ++k; } @@ -4994,7 +4994,7 @@ scrolling_window (w, header_line_p) for (j = i + 1; j < nruns; ++j) { struct run *p = runs[j]; - + if ((p->current_y >= r->desired_y && p->current_y < r->desired_y + r->height) || (p->current_y + p->height >= r->desired_y @@ -5126,7 +5126,7 @@ update_frame_1 (f, force_p, inhibit_id_p) update_frame_line (f, i); } } - + pause = (i < FRAME_HEIGHT (f) - 1) ? i : 0; /* Now just clean up termcap drivers and set cursor, etc. */ @@ -5161,11 +5161,11 @@ update_frame_1 (f, force_p, inhibit_id_p) is several lines high, find the last line that has any text on it. */ row = FRAME_HEIGHT (f); - do + do { --row; col = 0; - + if (MATRIX_ROW_ENABLED_P (current_matrix, row)) { /* Frame rows are filled up with spaces that @@ -5178,7 +5178,7 @@ update_frame_1 (f, force_p, inhibit_id_p) while (last > start && (last - 1)->charpos < 0) --last; - + col = last - start; } } @@ -5219,7 +5219,7 @@ update_frame_1 (f, force_p, inhibit_id_p) if (INTEGERP (w->left_margin_width)) x += XFASTINT (w->left_margin_width); - + /* x = max (min (x, FRAME_WINDOW_WIDTH (f) - 1), 0); */ cursor_to (y, x); } @@ -5334,7 +5334,7 @@ count_blanks (r, len) int len; { int i; - + for (i = 0; i < len; ++i) if (!CHAR_GLYPH_SPACE_P (r[i])) break; @@ -5353,12 +5353,12 @@ count_match (str1, end1, str2, end2) { struct glyph *p1 = str1; struct glyph *p2 = str2; - + while (p1 < end1 && p2 < end2 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) ++p1, ++p2; - + return p1 - str1; } @@ -5403,7 +5403,7 @@ update_frame_line (f, vpos) { obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); olen = current_row->used[TEXT_AREA]; - + /* Ignore trailing spaces, if we can. */ if (!write_spaces_p) while (olen > 0 && CHAR_GLYPH_SPACE_P (obody[olen-1])) @@ -5438,7 +5438,7 @@ update_frame_line (f, vpos) cursor_to (vpos, 0); write_glyphs (nbody, nlen); } - + /* Don't call clear_end_of_line if we already wrote the whole line. The cursor will not be at the right margin in that case but in the line below. */ @@ -5451,7 +5451,7 @@ update_frame_line (f, vpos) /* Make sure we are in the right row, otherwise cursor movement with cmgoto might use `ch' in the wrong row. */ cursor_to (vpos, 0); - + make_current (desired_matrix, current_matrix, vpos); return; } @@ -5480,8 +5480,8 @@ update_frame_line (f, vpos) || !GLYPH_EQUAL_P (nbody + j, obody + j) || CHAR_GLYPH_PADDING_P (nbody[j]))) ++j; - - /* Output this run of non-matching chars. */ + + /* Output this run of non-matching chars. */ cursor_to (vpos, i); write_glyphs (nbody + i, j - i); i = j - 1; @@ -5641,17 +5641,17 @@ update_frame_line (f, vpos) int del; cursor_to (vpos, nsp + begmatch); - + /* Calculate columns we can actually overwrite. */ while (CHAR_GLYPH_PADDING_P (nbody[nsp + begmatch + out])) out--; write_glyphs (nbody + nsp + begmatch, out); - + /* If we left columns to be overwritten, we must delete them. */ del = olen - tem - out; if (del > 0) delete_glyphs (del); - + /* At last, we insert columns not yet written out. */ insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del); olen = nlen; @@ -5705,11 +5705,11 @@ buffer_posn_from_coords (w, x, y, object, pos) CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); start_display (&it, w, startp); - + left_area_width = WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH (w); move_it_to (&it, -1, *x + it.first_visible_x - left_area_width, *y, -1, MOVE_TO_X | MOVE_TO_Y); - + *x = it.current_x - it.first_visible_x + left_area_width; *y = it.current_y; current_buffer = old_current_buffer; @@ -5873,7 +5873,7 @@ do_pending_window_change (safe) /* If window_change_signal should have run before, run it now. */ if (redisplaying_p && !safe) return; - + while (delayed_size_change) { Lisp_Object tail, frame; @@ -5895,7 +5895,7 @@ do_pending_window_change (safe) /* Change the frame height and/or width. Values may be given as zero to - indicate no change is to take place. + indicate no change is to take place. If DELAY is non-zero, then assume we're being called from a signal handler, and queue the change for later - perhaps the next @@ -6017,7 +6017,7 @@ change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) { struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); int text_area_x, text_area_y, text_area_width, text_area_height; - + window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, &text_area_height); if (w->cursor.x >= text_area_x + text_area_width) @@ -6190,14 +6190,14 @@ Emacs was built without floating point support. #ifdef VMS sys_sleep (sec); #else /* not VMS */ -/* The reason this is done this way +/* The reason this is done this way (rather than defined (H_S) && defined (H_T)) is because the VMS preprocessor doesn't grok `defined'. */ #ifdef HAVE_SELECT EMACS_GET_TIME (end_time); EMACS_SET_SECS_USECS (timeout, sec, usec); EMACS_ADD_TIME (end_time, end_time, timeout); - + while (1) { EMACS_GET_TIME (timeout); @@ -6210,7 +6210,7 @@ Emacs was built without floating point support. sleep (sec); #endif /* HAVE_SELECT */ #endif /* not VMS */ - + immediate_quit = 0; #endif /* no subprocesses */ @@ -6439,7 +6439,7 @@ init_display () display_arg = (display != 0 && *display != 0); } - if (!inhibit_window_system && display_arg + if (!inhibit_window_system && display_arg #ifndef CANNOT_DUMP && initialized #endif @@ -6463,7 +6463,7 @@ init_display () #endif /* HAVE_X_WINDOWS */ #ifdef HAVE_NTGUI - if (!inhibit_window_system) + if (!inhibit_window_system) { Vwindow_system = intern ("w32"); Vwindow_system_version = make_number (1); @@ -6473,7 +6473,7 @@ init_display () #endif /* HAVE_NTGUI */ #ifdef MAC_OS - if (!inhibit_window_system) + if (!inhibit_window_system) { Vwindow_system = intern ("mac"); Vwindow_system_version = make_number (1); @@ -6518,11 +6518,11 @@ For types not defined in VMS, use define emacs_term \"TYPE\".\n\ *p = tolower (*p); terminal_type = new; - } + } #endif /* VMS */ term_init (terminal_type); - + { struct frame *sf = SELECTED_FRAME (); int width = FRAME_WINDOW_WIDTH (sf); @@ -6591,7 +6591,7 @@ don't show a cursor. */) window = selected_window; else CHECK_WINDOW (window); - + XWINDOW (window)->cursor_off_p = NILP (show); } @@ -6607,14 +6607,14 @@ WINDOW nil or omitted means report on the selected window. */) Lisp_Object window; { struct window *w; - + if (NILP (window)) window = selected_window; else CHECK_WINDOW (window); - + w = XWINDOW (window); - return w->cursor_off_p ? Qnil : Qt; + return w->cursor_off_p ? Qnil : Qt; } @@ -6652,34 +6652,34 @@ syms_of_display () doc: /* *The output baud rate of the terminal. On most systems, changing this value will affect the amount of padding and the other strategic decisions made during redisplay. */); - + DEFVAR_BOOL ("inverse-video", &inverse_video, doc: /* *Non-nil means invert the entire frame display. This means everything is in inverse video which otherwise would not be. */); - + DEFVAR_BOOL ("visible-bell", &visible_bell, doc: /* *Non-nil means try to flash the frame to represent a bell. See also `ring-bell-function'. */); - + DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, doc: /* *Non-nil means no need to redraw entire frame after suspending. A non-nil value is useful if the terminal can automatically preserve Emacs's frame display when you reenter Emacs. It is up to you to set this variable if your terminal can do that. */); - + DEFVAR_LISP ("window-system", &Vwindow_system, doc: /* Name of window system that Emacs is displaying through. The value is a symbol--for instance, `x' for X windows. The value is nil if Emacs is using a text-only terminal. */); - + DEFVAR_LISP ("window-system-version", &Vwindow_system_version, doc: /* The version number of the window system in use. For X windows, this is 10 or 11. */); - + DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */); - + DEFVAR_LISP ("glyph-table", &Vglyph_table, doc: /* Table defining how to output a glyph code to the frame. If not nil, this is a vector indexed by glyph code to define the glyph. diff --git a/src/doc.c b/src/doc.c index 473ba911023..3a53dc5174e 100644 --- a/src/doc.c +++ b/src/doc.c @@ -151,7 +151,7 @@ get_doc_string (filepos, unibyte, definition) if (!STRINGP (file)) return Qnil; - + /* Put the file name in NAME as a C string. If it is relative, combine it with Vdoc_directory. */ @@ -375,12 +375,12 @@ string is passed through `substitute-command-keys'. */) documentation: doc = Qnil; - + if (SYMBOLP (function) && (tem = Fget (function, Qfunction_documentation), !NILP (tem))) return Fdocumentation_property (function, Qfunction_documentation, raw); - + fun = Findirect_function (function); if (SUBRP (fun)) { @@ -487,7 +487,7 @@ aren't strings. */) Lisp_Object tem; documentation_property: - + tem = Fget (symbol, prop); if (EQ (tem, make_number (0))) tem = Qnil; @@ -512,7 +512,7 @@ aren't strings. */) else if (!STRINGP (tem)) /* Feval protects its argument. */ tem = Feval (tem); - + if (NILP (raw) && STRINGP (tem)) tem = Fsubstitute_command_keys (tem); return tem; @@ -918,7 +918,7 @@ syms_of_doc () { Qfunction_documentation = intern ("function-documentation"); staticpro (&Qfunction_documentation); - + DEFVAR_LISP ("internal-doc-file-name", &Vdoc_file_name, doc: /* Name of file containing documentation strings of built-in symbols. */); Vdoc_file_name = Qnil; diff --git a/src/ecrt0.c b/src/ecrt0.c index ac23259de4f..17bd4841002 100644 --- a/src/ecrt0.c +++ b/src/ecrt0.c @@ -348,7 +348,7 @@ _start () { #ifdef sun finitfp_(); -#endif +#endif /* On 68000, _start pushes a6 onto stack */ start1 (); } diff --git a/src/editfns.c b/src/editfns.c index d5293e170c8..0c012514f93 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -289,16 +289,16 @@ region_limit (beginningp) { extern Lisp_Object Vmark_even_if_inactive; /* Defined in callint.c. */ Lisp_Object m; - + if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive) && NILP (current_buffer->mark_active)) Fsignal (Qmark_inactive, Qnil); - + m = Fmarker_position (current_buffer->mark); if (NILP (m)) error ("The mark is not set now, so there is no region"); - + if ((PT < XFASTINT (m)) == beginningp) m = make_number (PT); return m; @@ -456,7 +456,7 @@ get_pos_property (position, prop, object) } } } - + } { /* Now check the text-properties. */ @@ -881,7 +881,7 @@ save_excursion_restore (info) /* visible */ info = XCDR (info); visible_p = !NILP (XCAR (info)); - + #if 0 /* We used to make the current buffer visible in the selected window if that was true previously. That avoids some anomalies. But it creates others, and it wasn't documented, and it is simpler @@ -2952,7 +2952,7 @@ save_restriction_restore (data) clip_to_bounds (beg->charpos, pt, end->charpos), clip_to_bounds (beg->bytepos, BUF_PT_BYTE (buf), end->bytepos)); - + buf->clip_changed = 1; /* Remember that the narrowing changed. */ } } diff --git a/src/eval.c b/src/eval.c index 5cd50271292..9d63da194a8 100644 --- a/src/eval.c +++ b/src/eval.c @@ -234,13 +234,13 @@ call_debugger (arg) int debug_while_redisplaying; int count = SPECPDL_INDEX (); Lisp_Object val; - + if (lisp_eval_depth + 20 > max_lisp_eval_depth) max_lisp_eval_depth = lisp_eval_depth + 20; - + if (specpdl_size + 40 > max_specpdl_size) max_specpdl_size = specpdl_size + 40; - + #ifdef HAVE_X_WINDOWS if (display_hourglass_p) cancel_hourglass (); @@ -261,7 +261,7 @@ call_debugger (arg) redisplay, which necessarily leads to display problems. */ specbind (Qinhibit_eval_during_redisplay, Qt); #endif - + val = apply1 (Vdebugger, arg); /* Interrupting redisplay and resuming it later is not safe under @@ -535,7 +535,7 @@ usage: (setq SYM VAL SYM VAL ...) */) UNGCPRO; return val; } - + DEFUN ("quote", Fquote, Squote, 1, UNEVALLED, 0, doc: /* Return the argument, without evaluating it. `(quote x)' yields `x'. usage: (quote ARG) */) @@ -544,7 +544,7 @@ usage: (quote ARG) */) { return Fcar (args); } - + DEFUN ("function", Ffunction, Sfunction, 1, UNEVALLED, 0, doc: /* Like `quote', but preferred for objects which are functions. In byte compilation, `function' causes its argument to be compiled. @@ -614,7 +614,7 @@ interactive_p (exclude_subrs_p) fun = Findirect_function (*btp->function); if (exclude_subrs_p && SUBRP (fun)) return 0; - + /* btp points to the frame of a Lisp function that called interactive-p. Return t if that function was called interactively. */ if (btp && btp->next && EQ (*btp->next->function, Qcall_interactively)) @@ -694,7 +694,7 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...) */) call2 (Vmacro_declaration_function, fn_name, Fcar (tail)); UNGCPRO; } - + tail = Fcdr (tail); } @@ -703,7 +703,7 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...) */) else tail = Fcons (lambda_list, Fcons (doc, tail)); defn = Fcons (Qmacro, Fcons (Qlambda, tail)); - + if (!NILP (Vpurify_flag)) defn = Fpurecopy (defn); if (CONSP (XSYMBOL (fn_name)->function) @@ -835,7 +835,7 @@ value of `standard-value' or of `custom-autoload' on its property list). */) Lisp_Object variable; { Lisp_Object documentation; - + if (!SYMBOLP (variable)) return Qnil; @@ -856,7 +856,7 @@ value of `standard-value' or of `custom-autoload' on its property list). */) || (!NILP (Fget (variable, intern ("custom-autoload"))))) return Qt; return Qnil; -} +} DEFUN ("let*", FletX, SletX, 1, UNEVALLED, 0, doc: /* Bind variables according to VARLIST then eval BODY. @@ -1168,7 +1168,7 @@ unwind_to_catch (catch, value) #endif backtrace_list = catch->backlist; lisp_eval_depth = catch->lisp_eval_depth; - + _longjmp (catch->jmp, 1); } @@ -1207,7 +1207,7 @@ usage: (unwind-protect BODYFORM UNWINDFORMS...) */) record_unwind_protect (0, Fcdr (args)); val = Feval (Fcar (args)); - return unbind_to (count, val); + return unbind_to (count, val); } /* Chain of condition handlers currently in effect. @@ -1288,7 +1288,7 @@ usage: (condition-case VAR BODYFORM HANDLERS...) */) } c.next = catchlist; catchlist = &c; - + h.var = var; h.handler = handlers; h.next = handlerlist; @@ -1486,7 +1486,7 @@ See also the function `condition-case'. */) if (display_hourglass_p) cancel_hourglass (); #endif -#endif +#endif /* This hook is used by edebug. */ if (! NILP (Vsignal_hook_function) @@ -1512,13 +1512,13 @@ See also the function `condition-case'. */) for (; handlerlist; handlerlist = handlerlist->next) { register Lisp_Object clause; - + if (lisp_eval_depth + 20 > max_lisp_eval_depth) max_lisp_eval_depth = lisp_eval_depth + 20; - + if (specpdl_size + 40 > max_specpdl_size) max_specpdl_size = specpdl_size + 40; - + clause = find_handler_clause (handlerlist->handler, conditions, error_symbol, data, &debugger_value); @@ -1608,7 +1608,7 @@ skip_debugger (conditions, data) error_message = Ferror_message_string (data); first_string = 0; } - + if (fast_string_match (XCAR (tail), error_message) >= 0) return 1; } @@ -1933,7 +1933,7 @@ do_autoload (fundef, funname) /* Preserve the match data. */ record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); - + /* Value saved here is to be restored into Vautoload_queue. */ record_unwind_protect (un_autoload, Vautoload_queue); Vautoload_queue = Qt; @@ -1981,7 +1981,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0, if (handling_signal) abort (); - + if (SYMBOLP (form)) return Fsymbol_value (form); if (!CONSP (form)) @@ -2162,7 +2162,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0, #ifdef HAVE_CARBON mac_check_for_quit_char(); -#endif +#endif return val; } @@ -2185,7 +2185,7 @@ usage: (apply FUNCTION &rest ARGUMENTS) */) funcall_args = 0; spread_arg = args [nargs - 1]; CHECK_LIST (spread_arg); - + numargs = XINT (Flength (spread_arg)); if (numargs == 0) @@ -2280,7 +2280,7 @@ usage: (run-hooks &rest HOOKS) */) return Qnil; } - + DEFUN ("run-hook-with-args", Frun_hook_with_args, Srun_hook_with_args, 1, MANY, 0, doc: /* Run HOOK with the specified arguments ARGS. @@ -2523,7 +2523,7 @@ call1 (fn, arg1) { struct gcpro gcpro1; #ifdef NO_ARG_ARRAY - Lisp_Object args[2]; + Lisp_Object args[2]; args[0] = fn; args[1] = arg1; @@ -2779,7 +2779,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */) default: /* If a subr takes more than 8 arguments without using MANY - or UNEVALLED, we need to extend this function to support it. + or UNEVALLED, we need to extend this function to support it. Until this is done, there is no way to call the function. */ abort (); } @@ -2887,11 +2887,11 @@ funcall_lambda (fun, nargs, arg_vector) for (; CONSP (syms_left); syms_left = XCDR (syms_left)) { QUIT; - + next = XCAR (syms_left); while (!SYMBOLP (next)) next = Fsignal (Qinvalid_function, Fcons (fun, Qnil)); - + if (EQ (next, Qand_rest)) rest = 1; else if (EQ (next, Qand_optional)) @@ -2928,7 +2928,7 @@ funcall_lambda (fun, nargs, arg_vector) AREF (fun, COMPILED_CONSTANTS), AREF (fun, COMPILED_STACK_DEPTH)); } - + return unbind_to (count, val); } @@ -3006,7 +3006,7 @@ specbind (symbol, value) else { Lisp_Object valcontents; - + ovalue = find_symbol_value (symbol); specpdl_ptr->func = 0; specpdl_ptr->old_value = ovalue; @@ -3020,7 +3020,7 @@ specbind (symbol, value) Lisp_Object where, current_buffer; current_buffer = Fcurrent_buffer (); - + /* For a local variable, record both the symbol and which buffer's or frame's value we are saving. */ if (!NILP (Flocal_variable_p (symbol, Qnil))) @@ -3112,7 +3112,7 @@ unbind_to (count, value) Fset_default (symbol, specpdl_ptr->old_value); else if (BUFFERP (where)) set_internal (symbol, specpdl_ptr->old_value, XBUFFER (where), 1); - else + else set_internal (symbol, specpdl_ptr->old_value, NULL, 1); } else @@ -3126,7 +3126,7 @@ unbind_to (count, value) set_internal (specpdl_ptr->symbol, specpdl_ptr->old_value, 0, 1); } } - + if (NILP (Vquit_flag) && quitf) Vquit_flag = Qt; @@ -3300,7 +3300,7 @@ before making `inhibit-quit' nil. */); Qdeclare = intern ("declare"); staticpro (&Qdeclare); - + /* Note that the process handling also uses Qexit, but we don't want to staticpro it twice, so we just do it here. */ Qexit = intern ("exit"); diff --git a/src/filelock.c b/src/filelock.c index 33de9a4e7db..bcad75199cd 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -80,14 +80,14 @@ Lisp_Object Vtemporary_file_directory; #ifndef WTMP_FILE #define WTMP_FILE "/var/log/wtmp" #endif - + /* The strategy: to lock a file FN, create a symlink .#FN in FN's directory, with link data `user@host.pid'. This avoids a single mount (== failure) point for lock files. When the host in the lock data is the current host, we can check if the pid is valid with kill. - + Otherwise, we could look at a separate file that maps hostnames to reboot times to see if the remote pid can possibly be valid, since we don't want Emacs to have to communicate via pipes or sockets or @@ -105,15 +105,15 @@ Lisp_Object Vtemporary_file_directory; files to be useful on old systems lacking symlinks, nowadays virtually all such systems are probably single-user anyway, so it didn't seem worth the complication. - + Similarly, we don't worry about a possible 14-character limit on file names, because those are all the same systems that don't have symlinks. - + This is compatible with the locking scheme used by Interleaf (which has contributed this implementation for Emacs), and was designed by Ethan Jacobson, Kimbo Mundy, and others. - + --karl@cs.umb.edu/karl@hq.ileaf.com. */ @@ -344,7 +344,7 @@ fill_in_lock_file_name (lockfile, fn) do something to support 14-character-max file names. */ for (p = lockfile + strlen (lockfile); p != lockfile && *p != '/'; p--) p[2] = *p; - + /* Insert the `.#'. */ p[1] = '.'; p[2] = '#'; @@ -368,7 +368,7 @@ fill_in_lock_file_name (lockfile, fn) static int lock_file_1 (lfname, force) - char *lfname; + char *lfname; int force; { register int err; @@ -394,7 +394,7 @@ lock_file_1 (lfname, force) (unsigned long) getpid (), (unsigned long) boot_time); else sprintf (lock_info_str, "%s@%s.%lu", user_name, host_name, - (unsigned long) getpid ()); + (unsigned long) getpid ()); err = symlink (lock_info_str, lfname); if (errno == EEXIST && force) @@ -448,7 +448,7 @@ current_lock_owner (owner, lfname) #endif } while (len >= bufsize); - + /* If nonexistent lock file, all is well; otherwise, got strange error. */ if (len == -1) { @@ -458,7 +458,7 @@ current_lock_owner (owner, lfname) /* Link info exists, so `len' is its length. Null terminate. */ lfinfo[len] = 0; - + /* Even if the caller doesn't want the owner info, we still have to read it to determine return value, so allocate it. */ if (!owner) @@ -466,7 +466,7 @@ current_lock_owner (owner, lfname) owner = (lock_info_type *) alloca (sizeof (lock_info_type)); local_owner = 1; } - + /* Parse USER@HOST.PID:BOOT_TIME. If can't parse, return -1. */ /* The USER is everything before the first @. */ at = index (lfinfo, '@'); @@ -480,7 +480,7 @@ current_lock_owner (owner, lfname) owner->user = (char *) xmalloc (len + 1); strncpy (owner->user, lfinfo, len); owner->user[len] = 0; - + /* The PID is everything from the last `.' to the `:'. */ owner->pid = atoi (dot + 1); colon = dot; @@ -500,7 +500,7 @@ current_lock_owner (owner, lfname) /* We're done looking at the link info. */ xfree (lfinfo); - + /* On current host? */ if (STRINGP (Fsystem_name ()) && strcmp (owner->host, SDATA (Fsystem_name ())) == 0) @@ -524,7 +524,7 @@ current_lock_owner (owner, lfname) here's where we'd do it. */ ret = 1; } - + /* Avoid garbage. */ if (local_owner || ret <= 0) { @@ -543,7 +543,7 @@ current_lock_owner (owner, lfname) static int lock_if_free (clasher, lfname) lock_info_type *clasher; - register char *lfname; + register char *lfname; { while (lock_file_1 (lfname, 0) == 0) { @@ -551,7 +551,7 @@ lock_if_free (clasher, lfname) if (errno != EEXIST) return -1; - + locker = current_lock_owner (clasher, lfname); if (locker == 2) { @@ -634,7 +634,7 @@ lock_file (fn) sprintf (locker, "%s@%s (pid %lu)", lock_info.user, lock_info.host, lock_info.pid); FREE_LOCK_INFO (lock_info); - + attack = call2 (intern ("ask-user-about-lock"), fn, build_string (locker)); if (!NILP (attack)) /* User says take the lock */ @@ -691,7 +691,7 @@ or else nothing is done if current buffer isn't visiting a file. */) if (SAVE_MODIFF < MODIFF && !NILP (file)) lock_file (file); - return Qnil; + return Qnil; } DEFUN ("unlock-buffer", Funlock_buffer, Sunlock_buffer, diff --git a/src/floatfns.c b/src/floatfns.c index 08405c307a7..b7d6412fdbf 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -468,7 +468,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, x = XINT (arg1); y = XINT (arg2); acc = 1; - + if (y < 0) { if (x == 1) @@ -992,7 +992,7 @@ float_error (signo) #endif /* FLOAT_CATCH_SIGILL */ #ifdef HAVE_MATHERR -int +int matherr (x) struct exception *x; { @@ -1026,7 +1026,7 @@ init_floatfns () { #ifdef FLOAT_CATCH_SIGILL signal (SIGILL, float_error); -#endif +#endif in_float = 0; } diff --git a/src/fontset.h b/src/fontset.h index 1a920ac69ec..634711110bc 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -97,7 +97,7 @@ struct font_info `ascent'. In other words, the value indicates how many bits higher we should draw a character of the font than normal ASCII text for a better looking. - + We also have to consider the fact that the concept of `baseline' differs among languages to which each character belongs. For instance, baseline should be at the bottom most position of all @@ -195,7 +195,7 @@ EXFUN (Fquery_fontset, 2); extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int)); extern Lisp_Object Qfontset; -extern Lisp_Object Vuse_default_ascent; +extern Lisp_Object Vuse_default_ascent; extern Lisp_Object Vignore_relative_composition; extern Lisp_Object Valternate_fontname_alist; extern Lisp_Object Vfontset_alias_alist; diff --git a/src/frame.c b/src/frame.c index b8fb2e1546d..d3d84ff1394 100644 --- a/src/frame.c +++ b/src/frame.c @@ -92,7 +92,7 @@ set_menu_bar_lines_1 (window, n) XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->top, XFASTINT (w->top) + n); XSETFASTINT (w->height, XFASTINT (w->height) - n); - + if (INTEGERP (w->orig_top)) XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n); if (INTEGERP (w->orig_height)) @@ -367,7 +367,7 @@ make_frame_without_minibuffer (mini_window, kb, display) call1 (intern ("make-initial-minibuffer-frame"), display); UNGCPRO; } - + mini_window = XFRAME (kb->Vdefault_minibuffer_frame)->minibuffer_window; } @@ -576,7 +576,7 @@ do_switch_frame (frame, track, for_deletion) int track, for_deletion; { struct frame *sf = SELECTED_FRAME (); - + /* If FRAME is a switch-frame event, extract the frame we should switch to. */ if (CONSP (frame) @@ -774,7 +774,7 @@ If omitted, FRAME defaults to the currently selected frame. */) Lisp_Object frame; { Lisp_Object window; - + if (NILP (frame)) window = SELECTED_FRAME ()->root_window; else @@ -782,7 +782,7 @@ If omitted, FRAME defaults to the currently selected frame. */) CHECK_LIVE_FRAME (frame); window = XFRAME (frame)->root_window; } - + return window; } @@ -794,7 +794,7 @@ If omitted, FRAME defaults to the currently selected frame. */) Lisp_Object frame; { Lisp_Object window; - + if (NILP (frame)) window = SELECTED_FRAME ()->selected_window; else @@ -816,7 +816,7 @@ If FRAME is the selected frame, this makes WINDOW the selected window. */) { if (NILP (frame)) frame = selected_frame; - + CHECK_LIVE_FRAME (frame); CHECK_LIVE_WINDOW (window); @@ -1016,7 +1016,7 @@ Otherwise, include all frames. */) { if (NILP (frame)) frame = selected_frame; - + CHECK_LIVE_FRAME (frame); return next_frame (frame, miniframe); } @@ -1211,8 +1211,8 @@ The functions are run with one arg, the frame to be deleted. */) x_clear_frame_selections (f); #endif - /* Free glyphs. - This function must be called before the window tree of the + /* Free glyphs. + This function must be called before the window tree of the frame is deleted because windows contain dynamically allocated memory. */ free_glyphs (f); @@ -1592,7 +1592,7 @@ If omitted, FRAME defaults to the currently selected frame. */) { if (NILP (frame)) frame = selected_frame; - + CHECK_LIVE_FRAME (frame); #if 0 /* This isn't logically necessary, and it can do GC. */ @@ -1701,7 +1701,7 @@ doesn't support multiple overlapping frames, this function does nothing. */) frame = selected_frame; CHECK_LIVE_FRAME (frame); - + if (frame_raise_lower_hook) (*frame_raise_lower_hook) (XFRAME (frame), 0); @@ -1749,7 +1749,7 @@ The redirection lasts until `redirect-frame-focus' is called to change it. */) if (frame_rehighlight_hook) (*frame_rehighlight_hook) (XFRAME (frame)); - + return Qnil; } @@ -1949,7 +1949,7 @@ store_frame_param (f, prop, val) /* Update some other special parameters in their special places in addition to the alist. */ - + if (EQ (prop, Qbuffer_predicate)) f->buffer_predicate = val; @@ -1999,7 +1999,7 @@ If FRAME is omitted, return information on the currently selected frame. */) alist = Fcopy_alist (f->param_alist); GCPRO1 (alist); - + if (!FRAME_WINDOW_P (f)) { int fg = FRAME_FOREGROUND_PIXEL (f); @@ -2088,10 +2088,10 @@ If FRAME is nil, describe the currently selected frame. */) else CHECK_FRAME (frame); CHECK_SYMBOL (parameter); - + f = XFRAME (frame); value = Qnil; - + if (FRAME_LIVE_P (f)) { /* Avoid consing in frequent cases. */ @@ -2146,12 +2146,12 @@ If FRAME is nil, describe the currently selected frame. */) else value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); } - + return value; } -DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, +DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, Smodify_frame_parameters, 2, 2, 0, doc: /* Modify the parameters of frame FRAME according to ALIST. If FRAME is nil, it defaults to the selected frame. @@ -2278,7 +2278,7 @@ For a terminal screen, the value is always 1. */) return make_number (1); } -DEFUN ("frame-pixel-height", Fframe_pixel_height, +DEFUN ("frame-pixel-height", Fframe_pixel_height, Sframe_pixel_height, 0, 1, 0, doc: /* Return a FRAME's height in pixels. This counts only the height available for text lines, @@ -2303,7 +2303,7 @@ If FRAME is omitted, the selected frame is used. */) return make_number (FRAME_HEIGHT (f)); } -DEFUN ("frame-pixel-width", Fframe_pixel_width, +DEFUN ("frame-pixel-width", Fframe_pixel_width, Sframe_pixel_width, 0, 1, 0, doc: /* Return FRAME's width in pixels. For a terminal frame, the result really gives the width in characters. @@ -2411,7 +2411,7 @@ DEFUN ("set-frame-size", Fset_frame_size, Sset_frame_size, 3, 3, 0, return Qnil; } -DEFUN ("set-frame-position", Fset_frame_position, +DEFUN ("set-frame-position", Fset_frame_position, Sset_frame_position, 3, 3, 0, doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET. This is actually the position of the upper left corner of the frame. @@ -2525,7 +2525,7 @@ which need to do mouse handling at the Lisp level. */); Vmouse_position_function = Qnil; DEFVAR_LISP ("mouse-highlight", &Vmouse_highlight, - doc: /* If non-nil, clickable text is highlighted when mouse is over it. + doc: /* If non-nil, clickable text is highlighted when mouse is over it. If the value is an integer, highlighting is only shown after moving the mouse, while keyboard input turns off the highlight even when the mouse is over the clickable text. However, the mouse shape still indicates diff --git a/src/frame.h b/src/frame.h index af2a66bad65..25e43a9f317 100644 --- a/src/frame.h +++ b/src/frame.h @@ -150,7 +150,7 @@ struct frame or modified with modify-frame-parameters. */ Lisp_Object param_alist; - /* List of scroll bars on this frame. + /* List of scroll bars on this frame. Actually, we don't specify exactly what is stored here at all; the scroll bar implementation code can use it to store anything it likes. This field is marked by the garbage collector. It is here @@ -224,7 +224,7 @@ struct frame int tool_bar_lines; int n_tool_bar_items; - + /* A buffer for decode_mode_line. */ char *decode_mode_spec_buffer; @@ -253,7 +253,7 @@ struct frame /* A structure of auxiliary data used for displaying the contents. struct x_output is used for X window frames; - it is defined in xterm.h. + it is defined in xterm.h. struct w32_output is used for W32 window frames; it is defined in w32term.h. */ union output_data @@ -325,7 +325,7 @@ struct frame /* True if frame actually has a minibuffer window on it. 0 if using a minibuffer window that isn't on this frame. */ char has_minibuffer; - + /* 0 means, if this frame has just one window, show no modeline for that window. */ char wants_modeline; @@ -525,8 +525,8 @@ typedef struct frame *FRAME_PTR; /* The currently selected window of the window tree of frame F. */ #define FRAME_SELECTED_WINDOW(f) (f)->selected_window -#define FRAME_INSERT_COST(f) (f)->insert_line_cost -#define FRAME_DELETE_COST(f) (f)->delete_line_cost +#define FRAME_INSERT_COST(f) (f)->insert_line_cost +#define FRAME_DELETE_COST(f) (f)->delete_line_cost #define FRAME_INSERTN_COST(f) (f)->insert_n_lines_cost #define FRAME_DELETEN_COST(f) (f)->delete_n_lines_cost #define FRAME_MESSAGE_BUF(f) (f)->message_buf @@ -623,7 +623,7 @@ typedef struct frame *FRAME_PTR; /* Return the size of message_buf of the frame F. We multiply the width of the frame by 4 because multi-byte form may require at most 4-byte for a character. */ - + #define FRAME_MESSAGE_BUF_SIZE(f) (((int) (f)->width) * 4) /* Emacs's redisplay code could become confused if a frame's @@ -649,7 +649,7 @@ typedef struct frame *FRAME_PTR; Also, if a frame used to be invisible, but has just become visible, it must be marked as garbaged, since redisplay hasn't been keeping up its contents. */ - + #define FRAME_SAMPLE_VISIBILITY(f) \ (((f)->async_visible && (f)->visible != (f)->async_visible) ? \ SET_FRAME_GARBAGED (f) : 0, \ @@ -674,7 +674,7 @@ typedef struct frame *FRAME_PTR; loop will set FRAME_VAR, a Lisp_Object, to each frame in Vframe_list in succession and execute the statement. LIST_VAR should be a Lisp_Object too; it is used to iterate through the - Vframe_list. + Vframe_list. This macro is a holdover from a time when multiple frames weren't always supported. An alternate definition of the macro would expand to @@ -731,7 +731,7 @@ enum text_cursor_kinds get_window_cursor_type P_ ((struct window *, int *, int * /* Return the height in lines of the vertical scroll bar in w. If the window has a mode line, don't make the scroll bar extend that far. */ - + #define WINDOW_VERTICAL_SCROLL_BAR_HEIGHT(w) (window_internal_height (w)) /* The currently selected frame. */ @@ -779,7 +779,7 @@ extern Lisp_Object selected_frame; (FRAME_WINDOW_P (F) ? FRAME_X_LEFT_FRINGE_WIDTH (F) : 0) #define FRAME_RIGHT_FRINGE_WIDTH(F) \ (FRAME_WINDOW_P (F) ? FRAME_X_RIGHT_FRINGE_WIDTH (F) : 0) - + #else /* not HAVE_WINDOW_SYSTEM */ #define FRAME_FRINGE_WIDTH(F) 0 @@ -788,7 +788,7 @@ extern Lisp_Object selected_frame; #define FRAME_RIGHT_FRINGE_WIDTH(F) 0 #endif /* not HAVE_WINDOW_SYSTEM */ - + @@ -803,16 +803,16 @@ extern Lisp_Object selected_frame; /* Convert canonical value X to pixels. F is the frame whose canonical char width is to be used. X must be a Lisp integer or float. Value is a C integer. */ - + #define PIXEL_X_FROM_CANON_X(F, X) \ (INTEGERP (X) \ ? XINT (X) * CANON_X_UNIT (F) \ : (int) (XFLOAT_DATA (X) * CANON_X_UNIT (F))) - + /* Convert canonical value Y to pixels. F is the frame whose canonical character height is to be used. X must be a Lisp integer or float. Value is a C integer. */ - + #define PIXEL_Y_FROM_CANON_Y(F, Y) \ (INTEGERP (Y) \ ? XINT (Y) * CANON_Y_UNIT (F) \ @@ -836,6 +836,6 @@ extern Lisp_Object selected_frame; #define CANON_Y_FROM_PIXEL_Y(F, Y) \ ((Y) % CANON_Y_UNIT (F) \ ? make_float ((double) (Y) / CANON_Y_UNIT (F)) \ - : make_number ((Y) / CANON_Y_UNIT (F))) - + : make_number ((Y) / CANON_Y_UNIT (F))) + #endif /* not EMACS_FRAME_H */ diff --git a/src/gmalloc.c b/src/gmalloc.c index 77fb3197101..7c654e1ece1 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -420,7 +420,7 @@ protect_malloc_state (protect_p) last_state_size = _heaplimit * sizeof *_heapinfo; last_heapinfo = _heapinfo; - + if (protect_p != state_protected_p) { state_protected_p = protect_p; @@ -992,7 +992,7 @@ _free_internal (ptr) return; PROTECT_MALLOC_STATE (0); - + for (l = _aligned_blocks; l != NULL; l = l->next) if (l->aligned == ptr) { @@ -1214,7 +1214,7 @@ _free_internal (ptr) } break; } - + PROTECT_MALLOC_STATE (1); } @@ -1380,7 +1380,7 @@ _realloc_internal (ptr, size) block = BLOCK (ptr); PROTECT_MALLOC_STATE (0); - + type = _heapinfo[block].busy.type; switch (type) { @@ -1843,7 +1843,7 @@ freehook (ptr) __ptr_t ptr; { struct hdr *hdr; - + if (ptr) { hdr = ((struct hdr *) ptr) - 1; @@ -1853,7 +1853,7 @@ freehook (ptr) } else hdr = NULL; - + __free_hook = old_free_hook; free (hdr); __free_hook = freehook; @@ -1887,7 +1887,7 @@ reallochook (ptr, size) { struct hdr *hdr = NULL; __malloc_size_t osize = 0; - + if (ptr) { hdr = ((struct hdr *) ptr) - 1; @@ -1897,7 +1897,7 @@ reallochook (ptr, size) if (size < osize) flood ((char *) ptr + size, FREEFLOOD, osize - size); } - + __free_hook = old_free_hook; __malloc_hook = old_malloc_hook; __realloc_hook = old_realloc_hook; diff --git a/src/gtkutil.c b/src/gtkutil.c index c2da9a145e6..6b92779cbf6 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -180,7 +180,7 @@ static void xg_list_insert (xg_list_node *list, xg_list_node *node) { xg_list_node *list_start = list->next; - + if (list_start) list_start->prev = node; node->next = list_start; node->prev = 0; @@ -213,7 +213,7 @@ get_utf8_string (str) char *str; { char *utf8_str = str; - + /* If not UTF-8, try current locale. */ if (str && !g_utf8_validate (str, -1, NULL)) utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0); @@ -242,7 +242,7 @@ xg_set_geometry (f) int top = f->output_data.x->top_pos; int yneg = f->output_data.x->size_hint_flags & YNegative; char geom_str[32]; - + if (xneg) left = -left; if (yneg) @@ -260,7 +260,7 @@ xg_set_geometry (f) } } - + /* Resize the outer window of frame F after chainging the height. This happend when the menu bar or the tool bar is added or removed. COLUMNS/ROWS is the size the edit area shall have after the resize. */ @@ -299,7 +299,7 @@ xg_resize_widgets (f, pixelwidth, pixelheight) int tbheight = FRAME_TOOLBAR_HEIGHT (f); int rows = PIXEL_TO_CHAR_HEIGHT (f, pixelheight - mbheight - tbheight); int columns = PIXEL_TO_CHAR_WIDTH (f, pixelwidth); - + if (FRAME_GTK_WIDGET (f) && (columns != FRAME_WIDTH (f) || rows != FRAME_HEIGHT (f) || pixelwidth != PIXEL_WIDTH (f) || pixelheight != PIXEL_HEIGHT (f))) @@ -333,7 +333,7 @@ xg_frame_set_char_size (f, cols, rows) int pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); int pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols); - + /* Take into account the size of the scroll bar. Always use the number of columns occupied by the scroll bar here otherwise we might end up with a frame width that is not a multiple of the @@ -374,7 +374,7 @@ xg_win_to_widget (wdesc) event.any.window = gdkwin; gwdesc = gtk_get_event_widget (&event); } - + UNBLOCK_INPUT; return gwdesc; } @@ -404,13 +404,13 @@ xg_create_frame_widgets (f) GtkRcStyle *style; int i; char *title = 0; - + BLOCK_INPUT; wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL); wvbox = gtk_vbox_new (FALSE, 0); wfixed = gtk_fixed_new (); /* Must have this to place scroll bars */ - + if (! wtop || ! wvbox || ! wfixed) { if (wtop) gtk_widget_destroy (wtop); @@ -430,7 +430,7 @@ xg_create_frame_widgets (f) else if (! NILP (f->name)) title = SDATA (f->name); if (title) gtk_window_set_title (GTK_WINDOW (wtop), title); - + FRAME_GTK_OUTER_WIDGET (f) = wtop; FRAME_GTK_WIDGET (f) = wfixed; f->output_data.x->vbox_widget = wvbox; @@ -440,7 +440,7 @@ xg_create_frame_widgets (f) gtk_widget_set_size_request (wfixed, PIXEL_WIDTH (f), PIXEL_HEIGHT (f)); - + gtk_container_add (GTK_CONTAINER (wtop), wvbox); gtk_box_pack_end (GTK_BOX (wvbox), wfixed, TRUE, TRUE, 0); @@ -456,11 +456,11 @@ xg_create_frame_widgets (f) later on when tool bar items are added. */ if (FRAME_EXTERNAL_TOOL_BAR (f) && FRAME_TOOLBAR_HEIGHT (f) == 0) FRAME_TOOLBAR_HEIGHT (f) = 34; - + gtk_widget_set_double_buffered (wvbox, FALSE); gtk_widget_set_double_buffered (wfixed, FALSE); gtk_widget_set_double_buffered (wtop, FALSE); - + /* GTK documents says use gtk_window_set_resizable. But then a user can't shrink the window from its starting size. */ gtk_window_set_policy (GTK_WINDOW (wtop), TRUE, TRUE, TRUE); @@ -472,7 +472,7 @@ xg_create_frame_widgets (f) GTK is to destroy the widget. We want Emacs to do that instead. */ g_signal_connect (G_OBJECT (wtop), "delete-event", G_CALLBACK (gtk_true), 0); - + /* Convert our geometry parameters into a geometry string and specify it. GTK will itself handle calculating the real position this way. */ @@ -508,7 +508,7 @@ xg_create_frame_widgets (f) /* Must use g_strdup because gtk_widget_modify_style does g_free. */ style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>"); gtk_widget_modify_style (wfixed, style); - + /* GTK does not set any border, and they look bad with GTK. */ f->output_data.x->border_width = 0; f->output_data.x->internal_border_width = 0; @@ -538,7 +538,7 @@ x_wm_set_size_hint (f, flags, user_position) int base_width, base_height; int min_rows = 0, min_cols = 0; int win_gravity = f->output_data.x->win_gravity; - + if (flags) { memset (&size_hints, 0, sizeof (size_hints)); @@ -547,7 +547,7 @@ x_wm_set_size_hint (f, flags, user_position) } else flags = f->output_data.x->size_hint_flags; - + size_hints = f->output_data.x->size_hints; hint_flags = f->output_data.x->hint_flags; @@ -567,7 +567,7 @@ x_wm_set_size_hint (f, flags, user_position) size_hints.min_width = base_width + min_cols * size_hints.width_inc; size_hints.min_height = base_height + min_rows * size_hints.height_inc; - + /* These currently have a one to one mapping with the X values, but I don't think we should rely on that. */ hint_flags |= GDK_HINT_WIN_GRAVITY; @@ -648,7 +648,7 @@ static char * get_dialog_title (char key) { char *title = ""; - + switch (key) { case 'E': case 'e': title = "Error"; @@ -746,7 +746,7 @@ create_dialog (wv, select_cb, deactivate_cb) g_signal_connect (G_OBJECT (wdialog), "delete-event", G_CALLBACK (dialog_delete_callback), 0); - + if (deactivate_cb) { g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0); @@ -876,7 +876,7 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p) GtkFileSelection *filesel; int filesel_done = XG_FILE_NOT_DONE; char *fn = 0; - + filewin = gtk_file_selection_new (prompt); filesel = GTK_FILE_SELECTION (filewin); @@ -909,9 +909,9 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p) gtk_file_selection_hide_fileop_buttons (filesel); } - + gtk_widget_show_all (filewin); - + while (filesel_done == XG_FILE_NOT_DONE) gtk_main_iteration (); @@ -950,7 +950,7 @@ static xg_list_node xg_menu_item_cb_list; The menu bar and all sub menus under the menu bar in a frame share the same structure, hence the reference count. - + Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly allocated xg_menu_cb_data if CL_DATA is NULL. */ static xg_menu_cb_data * @@ -1069,7 +1069,7 @@ menuitem_highlight_callback (w, event, client_data) { xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data; gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : client_data; - + if (! NILP (data->help) && data->cl_data->highlight_cb) { GtkCallback func = (GtkCallback) data->cl_data->highlight_cb; @@ -1125,14 +1125,14 @@ make_widget_for_menu_item (utf8_label, utf8_key) GtkWidget *wlbl; GtkWidget *wkey; GtkWidget *wbox; - + wbox = gtk_hbox_new (FALSE, 0); wlbl = gtk_label_new_with_mnemonic (utf8_label); wkey = gtk_label_new (utf8_key); gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (wkey), 0.0, 0.5); - + gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0); @@ -1146,7 +1146,7 @@ make_widget_for_menu_item (utf8_label, utf8_key) UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally). UTF8_KEY is the text representing the key binding. ITEM is the widget_value describing the menu item. - + GROUP is an in/out parameter. If the menu item to be created is not part of any radio menu group, *GROUP contains NULL on entry and exit. If the menu item to be created is part of a radio menu group, on entry @@ -1164,10 +1164,10 @@ make_menu_item (utf8_label, utf8_key, item, group) { GtkWidget *w; GtkWidget *wtoadd = 0; - + if (utf8_key) wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); - + if (item->button_type == BUTTON_TYPE_TOGGLE) { *group = NULL; @@ -1189,7 +1189,7 @@ make_menu_item (utf8_label, utf8_key, item, group) if (utf8_key) w = gtk_menu_item_new (); else w = gtk_menu_item_new_with_mnemonic (utf8_label); } - + if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd); if (! item->enabled) gtk_widget_set_sensitive (w, FALSE); @@ -1230,7 +1230,7 @@ tearoff_remove (widget, event, client_data) /* Callback invoked when a menu is detached. It sets the xg_did_tearoff variable. WIDGET is the GtkTearoffMenuItem. - CLIENT_DATA is not used. */ + CLIENT_DATA is not used. */ static void tearoff_activate (widget, client_data) GtkWidget *widget; @@ -1257,7 +1257,7 @@ xg_keep_popup (menu, submenu) /* Find the top widget for the detached menu. */ p = gtk_widget_get_toplevel (submenu); - + /* Delay destroying the menu until the detached menu is removed. */ g_signal_connect (G_OBJECT (p), "unmap_event", G_CALLBACK (tearoff_remove), menu); @@ -1308,7 +1308,7 @@ xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) cb_data->help = item->help; cb_data->cl_data = cl_data; cb_data->call_data = item->call_data; - + g_signal_connect (G_OBJECT (w), "destroy", G_CALLBACK (menuitem_destroy_callback), @@ -1395,7 +1395,7 @@ create_menus (data, f, select_cb, deactivate_cb, highlight_cb, g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data); g_signal_connect (G_OBJECT (wmenu), "destroy", G_CALLBACK (menu_destroy_callback), cl_data); - + if (name) gtk_widget_set_name (wmenu, name); @@ -1406,7 +1406,7 @@ create_menus (data, f, select_cb, deactivate_cb, highlight_cb, g_signal_connect (G_OBJECT (wmenu), "grab-notify", G_CALLBACK (menu_grab_callback), 0); } - + if (! menu_bar_p && add_tearoff_p) { GtkWidget *tearoff = gtk_tearoff_menu_item_new (); @@ -1419,7 +1419,7 @@ create_menus (data, f, select_cb, deactivate_cb, highlight_cb, for (item = data; item; item = item->next) { GtkWidget *w; - + if (pop_up_p && !item->contents && !item->call_data && !xg_separator_p (item->name)) { @@ -1585,7 +1585,7 @@ remove_from_container (wcont, list) /* Add a ref to w so we can explicitly destroy it later. */ gtk_widget_ref (w); gtk_container_remove (GTK_CONTAINER (wcont), w); - + /* If there is a menu under this widget that has been detached, there is a reference to it, and just removing w from the container does not destroy the submenu. By explicitly @@ -1679,7 +1679,7 @@ xg_update_menubar (menubar, f, list, iter, pos, val, Current: A B C New: A C Remove B. */ - + gtk_widget_ref (GTK_WIDGET (witem)); gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem)); gtk_widget_destroy (GTK_WIDGET (witem)); @@ -1707,7 +1707,7 @@ xg_update_menubar (menubar, f, list, iter, pos, val, is up to date when leaving the minibuffer. */ GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); char *utf8_label = get_utf8_string (val->name); - + gtk_label_set_text_with_mnemonic (wlabel, utf8_label); iter = g_list_next (iter); @@ -1787,8 +1787,8 @@ xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) const char *old_label = 0; const char *old_key = 0; xg_menu_item_cb_data *cb_data; - - wchild = gtk_bin_get_child (GTK_BIN (w)); + + wchild = gtk_bin_get_child (GTK_BIN (w)); utf8_label = get_utf8_string (val->name); utf8_key = get_utf8_string (val->key); @@ -1830,10 +1830,10 @@ xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) } } - + if (wkey) old_key = gtk_label_get_label (wkey); if (wlbl) old_label = gtk_label_get_label (wlbl); - + if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0)) gtk_label_set_text (wkey, utf8_key); @@ -1842,7 +1842,7 @@ xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) if (utf8_key && utf8_key != val->key) g_free (utf8_key); if (utf8_label && utf8_label != val->name) g_free (utf8_label); - + if (! val->enabled && GTK_WIDGET_SENSITIVE (w)) gtk_widget_set_sensitive (w, FALSE); else if (val->enabled && ! GTK_WIDGET_SENSITIVE (w)) @@ -1855,7 +1855,7 @@ xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) cb_data->call_data = val->call_data; cb_data->help = val->help; cb_data->cl_data = cl_data; - + /* We assume the callback functions don't change. */ if (val->call_data && ! val->contents) { @@ -1951,10 +1951,10 @@ xg_update_submenu (submenu, f, val, widget_value *cur; int has_tearoff_p = 0; GList *first_radio = 0; - + if (submenu) list = gtk_container_get_children (GTK_CONTAINER (submenu)); - + for (cur = val, iter = list; cur && iter; iter = g_list_next (iter), cur = cur->next) @@ -2046,7 +2046,7 @@ xg_update_submenu (submenu, f, val, if (cur && first_radio) remove_from_container (submenu, first_radio); else remove_from_container (submenu, iter); } - + if (cur) { /* More items added. Create them. */ @@ -2062,7 +2062,7 @@ xg_update_submenu (submenu, f, val, cl_data, 0); } - + if (list) g_list_free (list); return newsub; @@ -2091,7 +2091,7 @@ xg_modify_menubar_widgets (menubar, f, val, deep_p, GList *list = gtk_container_get_children (GTK_CONTAINER (menubar)); if (! list) return; - + cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar), XG_FRAME_DATA); @@ -2129,7 +2129,7 @@ xg_modify_menubar_widgets (menubar, f, val, deep_p, break; } } - + newsub = xg_update_submenu (sub, f, cur->contents, @@ -2159,7 +2159,7 @@ xg_update_frame_menubar (f) { struct x_output *x = f->output_data.x; GtkRequisition req; - + if (!x->menubar_widget || GTK_WIDGET_MAPPED (x->menubar_widget)) return 0; @@ -2177,7 +2177,7 @@ xg_update_frame_menubar (f) /* The height has changed, resize outer widget and set columns rows to what we had before adding the menu bar. */ xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f)); - + SET_FRAME_GARBAGED (f); UNBLOCK_INPUT; } @@ -2311,7 +2311,7 @@ xg_gtk_scroll_destroy (widget, data) { gpointer p; int id = (int)data; - + p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA); if (p) xfree (p); xg_remove_widget_from_map (id); @@ -2355,7 +2355,7 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name) GtkWidget *wscroll; GtkObject *vadj; int scroll_id; - + /* Page, step increment values are not so important here, they will be corrected in x_set_toolkit_scroll_bar_thumb. */ vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX, @@ -2364,9 +2364,9 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name) wscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT (vadj)); gtk_widget_set_name (wscroll, scroll_bar_name); gtk_range_set_update_policy (GTK_RANGE (wscroll), GTK_UPDATE_CONTINUOUS); - + scroll_id = xg_store_widget_in_map (wscroll); - + g_signal_connect (G_OBJECT (vadj), "value-changed", scroll_callback, @@ -2386,7 +2386,7 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name) "button-release-event", G_CALLBACK (scroll_bar_button_cb), 0); - + gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), wscroll, 0, 0); @@ -2426,7 +2426,7 @@ xg_remove_scroll_bar (f, scrollbar_id) TOP/LEFT are the new pixel positions where the bar shall appear. WIDTH, HEIGHT is the size in pixels the bar shall have. */ void -xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height) +xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height) FRAME_PTR f; int scrollbar_id; int top; @@ -2483,7 +2483,7 @@ xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) gdouble shown; gdouble top; int size, value; - + adj = gtk_range_get_adjustment (GTK_RANGE (wscroll)); if (whole <= 0) @@ -2552,7 +2552,7 @@ xg_tool_bar_callback (w, client_data) return; idx *= TOOL_BAR_ITEM_NSLOTS; - + key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); XSETFRAME (frame, f); event.kind = TOOL_BAR_EVENT; @@ -2678,10 +2678,10 @@ xg_create_tool_bar (f) x->handlebox_widget = gtk_handle_box_new (); gtk_container_add (GTK_CONTAINER (x->handlebox_widget), x->toolbar_widget); - + gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget, FALSE, FALSE, 0); - + gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget, vbox_pos); @@ -2694,11 +2694,11 @@ xg_create_tool_bar (f) gtk_widget_size_request (x->toolbar_widget, &req); FRAME_TOOLBAR_HEIGHT (f) = req.height; - + /* The height has changed, resize outer widget and set columns rows to what we had before adding the tool bar. */ xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f)); - + SET_FRAME_GARBAGED (f); } @@ -2716,7 +2716,7 @@ update_frame_tool_bar (f) return; BLOCK_INPUT; - + if (! x->toolbar_widget) xg_create_tool_bar (f); @@ -2724,7 +2724,7 @@ update_frame_tool_bar (f) icon_list = gtk_container_get_children (GTK_CONTAINER (x->toolbar_widget)); iter = icon_list; - + for (i = 0; i < f->n_tool_bar_items; ++i) { #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) @@ -2775,7 +2775,7 @@ update_frame_tool_bar (f) if (wicon) gtk_widget_hide (wicon); continue; } - + if (! wicon) { GdkPixmap *gpix = gdk_pixmap_foreign_new (img->pixmap); @@ -2788,7 +2788,7 @@ update_frame_tool_bar (f) w, GTK_SIGNAL_FUNC (xg_tool_bar_callback), (gpointer)i); - + /* Save the image so we can see if an update is needed when this function is called again. */ g_object_set_data (G_OBJECT (w), XG_TOOL_BAR_IMAGE_DATA, @@ -2798,7 +2798,7 @@ update_frame_tool_bar (f) of the GtkImage parent. Go upwards until we find the button. */ while (! GTK_IS_BUTTON (w)) w = gtk_widget_get_parent (w); - + if (w) { /* Save the frame in the button so the xg_tool_bar_callback @@ -2848,7 +2848,7 @@ update_frame_tool_bar (f) gtk_widget_set_sensitive (wicon, enabled_p); gtk_widget_show (wicon); } - + #undef PROP } diff --git a/src/gtkutil.h b/src/gtkutil.h index 103b9781417..b6779b465f1 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -66,7 +66,7 @@ typedef struct xg_list_node_ typedef struct xg_menu_cb_data_ { xg_list_node ptrs; - + FRAME_PTR f; Lisp_Object menu_bar_vector; int menu_bar_items_used; @@ -85,7 +85,7 @@ typedef struct xg_menu_item_cb_data_ Lisp_Object help; gpointer call_data; xg_menu_cb_data *cl_data; - + } xg_menu_item_cb_data; @@ -98,7 +98,7 @@ typedef struct _widget_value char *name; /* value (meaning depend on widget type) */ char *value; - /* keyboard equivalent. no implications for XtTranslations */ + /* keyboard equivalent. no implications for XtTranslations */ char *key; /* Help string or nil if none. GC finds this string through the frame's menu_bar_vector diff --git a/src/hftctl.c b/src/hftctl.c index a6daf0a1f1b..272f7bad7fe 100644 --- a/src/hftctl.c +++ b/src/hftctl.c @@ -67,7 +67,7 @@ static char SCCSid[] = "com/gnuemacs/src,3.1,9021-90/05/03-5/3/90"; #define QLOC ((HFQLOCCH<<8)|HFQLOCCL) #define QPS ((HFQPRESCH<<8)|HFQPRESCL) -#ifndef TCGETS +#ifndef TCGETS #define TCGETS TCGETA #endif #ifndef TCSETS diff --git a/src/indent.h b/src/indent.h index 676f64a8ae8..0ce7238ec75 100644 --- a/src/indent.h +++ b/src/indent.h @@ -26,13 +26,13 @@ Boston, MA 02111-1307, USA. */ Example (where W_ stands for a wide-column character): ---------- abcdefgh\\ - W_ + W_ ---------- - To handle this case, we should not calculate the tab offset by + To handle this case, we should not calculate the tab offset by tab_offset += width; - Instead, we must remember tab_offset of the line. + Instead, we must remember tab_offset of the line. */ diff --git a/src/insdel.c b/src/insdel.c index 281cb010971..d4921b5f1ce 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -373,7 +373,7 @@ adjust_markers_for_delete (from, from_byte, to, to_byte) if (! m->insertion_type) /* Normal markers will end up at the beginning of the re-inserted text after undoing a deletion, and must be - adjusted to move them to the correct place. */ + adjusted to move them to the correct place. */ record_marker_adjustment (marker, from - charpos); else if (charpos < to) /* Before-insertion markers will automatically move forward @@ -536,7 +536,7 @@ make_gap_larger (nbytes_added) That won't work because so many places use `int'. Make sure we don't introduce overflows in the calculation. */ - + if (Z_BYTE - BEG_BYTE + GAP_SIZE >= (((EMACS_INT) 1 << (min (VALBITS, BITS_PER_INT) - 1)) - 1 - nbytes_added)) @@ -990,7 +990,7 @@ insert_1_both (string, nchars, nbytes, inherit, prepare, before_markers) { if (nchars == 0) return; - + if (NILP (current_buffer->enable_multibyte_characters)) nchars = nbytes; @@ -1173,7 +1173,7 @@ insert_from_string_1 (string, pos, pos_byte, nchars, nbytes, /* Get the intervals for the part of the string we are inserting. */ if (nbytes < SBYTES (string)) intervals = copy_intervals (intervals, pos, nchars); - + /* Insert those intervals. */ graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit); @@ -1239,13 +1239,13 @@ insert_from_buffer_1 (buf, from, nchars, inherit) if (chunk < incoming_nbytes) outgoing_after_gap - = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf, + = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf, from_byte + chunk), incoming_nbytes - chunk); outgoing_nbytes = outgoing_before_gap + outgoing_after_gap; } - + /* Make sure point-max won't overflow after this insertion. */ XSETINT (temp, outgoing_nbytes + Z); if (outgoing_nbytes + Z != XINT (temp)) @@ -1329,7 +1329,7 @@ insert_from_buffer_1 (buf, from, nchars, inherit) from += nchars; intervals = copy_intervals (intervals, from, nchars); } - + /* Insert those intervals. */ graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit); @@ -2129,7 +2129,7 @@ signal_after_change (charpos, lendel, lenins) return; } - if (!NILP (combine_after_change_list)) + if (!NILP (combine_after_change_list)) Fcombine_after_change_execute (); if (!NILP (Vafter_change_functions)) @@ -2260,7 +2260,7 @@ DEFUN ("combine-after-change-execute", Fcombine_after_change_execute, that was changed. */ begpos = BEG + beg; endpos = Z - end; - + /* We are about to handle these, so discard them. */ combine_after_change_list = Qnil; diff --git a/src/keyboard.c b/src/keyboard.c index 704aebccba5..5b520b9569b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -10897,7 +10897,7 @@ will be in `last-command' during the following command. */); doc: /* The command bound to the current key sequence before remapping. It equals `this-command' if the original command was not remapped through any of the active keymaps. Otherwise, the value of `this-command' is the -result of looking up the original command in the active keymaps. */); +result of looking up the original command in the active keymaps. */); Vthis_original_command = Qnil; DEFVAR_INT ("auto-save-interval", &auto_save_interval, diff --git a/src/keyboard.h b/src/keyboard.h index 87af2e84692..9d77d21ec75 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -210,7 +210,7 @@ extern Lisp_Object internal_last_event_frame; Using a Lisp vector to hold this information while we decode it takes care of protecting all the data from GC. */ extern Lisp_Object item_properties; - + /* This describes the elements of item_properties. The first element is not a property, it is a pointer to the item properties that is saved for GC protection. */ diff --git a/src/lread.c b/src/lread.c index 5d5e6e67500..e32f669ecf2 100644 --- a/src/lread.c +++ b/src/lread.c @@ -215,7 +215,7 @@ static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object)); The READCHAR and UNREAD macros are meant for reading/unreading a byte code; they do not handle multibyte characters. The caller should manage them if necessary. - + [ Actually that seems to be a lie; READCHAR will definitely read multibyte characters from buffer sources, at least. Is the comment just out of date? @@ -233,7 +233,7 @@ readchar (readcharfun) register int c; readchar_count++; - + if (BUFFERP (readcharfun)) { register struct buffer *inbuffer = XBUFFER (readcharfun); @@ -411,7 +411,7 @@ unreadchar (readcharfun, c) static Lisp_Object read_internal_start P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); static Lisp_Object read0 P_ ((Lisp_Object)); -static Lisp_Object read1 P_ ((Lisp_Object, int *, int)); +static Lisp_Object read1 P_ ((Lisp_Object, int *, int)); static Lisp_Object read_list P_ ((int, Lisp_Object)); static Lisp_Object read_vector P_ ((Lisp_Object, int)); @@ -457,7 +457,7 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii, if (display_hourglass_p) cancel_hourglass (); #endif - + delayed_switch_frame = Qnil; /* Read until we get an acceptable event. */ @@ -498,7 +498,7 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii, XSETFASTINT (val, XINT (tem1) | XINT (Fcar (Fcdr (tem)))); } } - + /* If we don't have a character now, deal with it appropriately. */ if (!INTEGERP (val)) { @@ -709,7 +709,7 @@ Return t if file exists. */) } else file = Fsubstitute_in_file_name (file); - + /* Avoid weird lossage with null string as arg, since it would try to load a directory as a Lisp file */ @@ -1550,7 +1550,7 @@ read_internal_start (stream, start, end) read_from_string_index_byte = string_char_to_byte (stream, startval); read_from_string_limit = endval; } - + retval = read0 (stream); if (EQ (Vread_with_symbol_positions, Qt) || EQ (Vread_with_symbol_positions, stream)) @@ -1751,7 +1751,7 @@ read_escape (readcharfun, stringp, byterep) break; } } - + *byterep = 1; return i; } @@ -1825,11 +1825,11 @@ read_integer (readcharfun, radix) } else if (c == '+') c = READCHAR; - + while (c >= 0) { int digit; - + if (c >= '0' && c <= '9') digit = c - '0'; else if (c >= 'a' && c <= 'z') @@ -1894,7 +1894,7 @@ to_multibyte (p, end, nchars) if (nbytes != *nchars) nbytes = str_as_multibyte (read_buffer, read_buffer_size, *p - read_buffer, nchars); - + *p = read_buffer + nbytes; } @@ -1992,7 +1992,7 @@ read1 (readcharfun, pch, first_in_list) == (SCHARS (tmp) - 1) * BITS_PER_CHAR)) Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5), Qnil)); - + val = Fmake_bool_vector (length, Qnil); bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data, size_in_chars); @@ -2047,7 +2047,7 @@ read1 (readcharfun, pch, first_in_list) UNGCPRO; return tmp; } - + /* #@NUMBER is used to skip NUMBER following characters. That's used in .elc files to skip over doc strings and function definitions. */ @@ -2064,7 +2064,7 @@ read1 (readcharfun, pch, first_in_list) } if (c >= 0) UNREAD (c); - + if (load_force_doc_strings && EQ (readcharfun, Qget_file_char)) { /* If we are supposed to force doc strings into core right now, @@ -2170,7 +2170,7 @@ read1 (readcharfun, pch, first_in_list) /* ...and #n# will use the real value from now on. */ Fsetcdr (cell, tem); - + return tem; } /* #n# returns a previously read object. */ @@ -2183,7 +2183,7 @@ read1 (readcharfun, pch, first_in_list) } else if (c == 'r' || c == 'R') return read_integer (readcharfun, n); - + /* Fall through to error message. */ } else if (c == 'x' || c == 'X') @@ -2442,7 +2442,7 @@ read1 (readcharfun, pch, first_in_list) p = read_buffer + offset; end = read_buffer + read_buffer_size; } - + if (c == '\\') { c = READCHAR; @@ -2536,7 +2536,7 @@ read1 (readcharfun, pch, first_in_list) : intern (read_buffer); if (EQ (Vread_with_symbol_positions, Qt) || EQ (Vread_with_symbol_positions, readcharfun)) - Vread_symbol_positions_list = + Vread_symbol_positions_list = /* Kind of a hack; this will probably fail if characters in the symbol name were escaped. Not really a big deal, though. */ @@ -2567,7 +2567,7 @@ substitute_object_in_subtree (object, placeholder) /* Make all the substitutions. */ check_object = substitute_object_recurse (object, placeholder, object); - + /* Clear seen_list because we're done with it. */ seen_list = Qnil; @@ -2611,7 +2611,7 @@ substitute_object_recurse (object, placeholder, subtree) read_objects. */ if (!EQ (Qnil, Frassq (subtree, read_objects))) seen_list = Fcons (subtree, seen_list); - + /* Recurse according to subtree's type. Every branch must return a Lisp_Object. */ switch (XTYPE (subtree)) @@ -2624,7 +2624,7 @@ substitute_object_recurse (object, placeholder, subtree) { Lisp_Object idx = make_number (i); SUBSTITUTE (Faref (subtree, idx), - Faset (subtree, idx, true_value)); + Faset (subtree, idx, true_value)); } return subtree; } @@ -2645,7 +2645,7 @@ substitute_object_recurse (object, placeholder, subtree) INTERVAL root_interval = STRING_INTERVALS (subtree); Lisp_Object arg = Fcons (object, placeholder); - + traverse_intervals_noorder (root_interval, &substitute_in_interval, arg); @@ -2682,7 +2682,7 @@ isfloat_string (cp) register char *cp; { register int state; - + char *start = cp; state = 0; @@ -2813,7 +2813,7 @@ read_vector (readcharfun, bytecodeflag) } return vector; } - + /* FLAG = 1 means check for ] to terminate rather than ) and . FLAG = -1 means check for starting with defun and make structure pure. */ @@ -2832,7 +2832,7 @@ read_list (flag, readcharfun) struct gcpro gcpro1, gcpro2; /* 0 is the normal case. 1 means this list is a doc reference; replace it with the number 0. - 2 means this list is a doc reference; replace it with the doc string. */ + 2 means this list is a doc reference; replace it with the doc string. */ int doc_reference = 0; /* Initialize this to 1 if we are reading a list. */ @@ -3321,7 +3321,7 @@ init_obarray () /* Intern nil in the obarray */ XSYMBOL (Qnil)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY; XSYMBOL (Qnil)->constant = 1; - + /* These locals are to kludge around a pyramid compiler bug. */ hash = hash_string ("nil", 3); /* Separate statement here to avoid VAXC bug. */ @@ -3454,7 +3454,7 @@ defvar_per_buffer (namestring, address, type, doc) SET_SYMBOL_VALUE (sym, val); PER_BUFFER_SYMBOL (offset) = sym; PER_BUFFER_TYPE (offset) = type; - + if (PER_BUFFER_IDX (offset) == 0) /* Did a DEFVAR_PER_BUFFER without initializing the corresponding slot of buffer_local_flags */ @@ -3626,8 +3626,8 @@ init_lread () #endif #ifndef WINDOWSNT - /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is - almost never correct, thereby causing a warning to be printed out that + /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is + almost never correct, thereby causing a warning to be printed out that confuses users. Since PATH_LOADSEARCH is always overridden by the EMACSLOADPATH environment variable below, disable the warning on NT. */ @@ -3750,7 +3750,7 @@ symbol from the position where `read' or `read-from-string' started. Note that a symbol will appear multiple times in this list, if it was read multiple times. The list is in the same order as the symbols were read in. */); - Vread_symbol_positions_list = Qnil; + Vread_symbol_positions_list = Qnil; DEFVAR_LISP ("load-path", &Vload_path, doc: /* *List of directories to search for files to load. @@ -3914,7 +3914,7 @@ to load. See also `load-dangerous-libraries'. */); staticpro (&read_objects); read_objects = Qnil; staticpro (&seen_list); - + Vloads_in_progress = Qnil; staticpro (&Vloads_in_progress); } diff --git a/src/m/7300.h b/src/m/7300.h index 8f4f70efe69..3db16e67fb6 100644 --- a/src/m/7300.h +++ b/src/m/7300.h @@ -20,7 +20,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2-2" */ @@ -59,7 +59,7 @@ Boston, MA 02111-1307, USA. */ /* Data type of load average, as read out of kmem. */ /* These are commented out since it is not supported by this machine. */ - + /* #define LOAD_AVE_TYPE long */ /* Convert that into an integer that is 100 for a load average of 1.0 */ diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h index 243b786e714..dabad592c39 100644 --- a/src/m/alliant-2800.h +++ b/src/m/alliant-2800.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ diff --git a/src/m/alliant.h b/src/m/alliant.h index 86f104ceedd..3b79a3c1709 100644 --- a/src/m/alliant.h +++ b/src/m/alliant.h @@ -21,7 +21,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/alliant1.h b/src/m/alliant1.h index 95f56cf1804..2e061227b47 100644 --- a/src/m/alliant1.h +++ b/src/m/alliant1.h @@ -1,7 +1,7 @@ /* config.h should include this file for version 1 of Alliant's operating system. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/alliant4.h b/src/m/alliant4.h index ade3dbbaae5..7e24c53eb89 100644 --- a/src/m/alliant4.h +++ b/src/m/alliant4.h @@ -1,7 +1,7 @@ /* machine description file for Alliant Concentrix 4.0 or later. Use alliant.h for versions 2 and 3. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/alpha.h b/src/m/alpha.h index 5ce528622cc..b37116b0d48 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/altos.h b/src/m/altos.h index a20f89ac903..654acc1d5c1 100644 --- a/src/m/altos.h +++ b/src/m/altos.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ diff --git a/src/m/amdahl.h b/src/m/amdahl.h index b6a3871a221..4e64d0dca85 100644 --- a/src/m/amdahl.h +++ b/src/m/amdahl.h @@ -1,4 +1,4 @@ -/* amdahl machine description file +/* amdahl machine description file Copyright (C) 1987, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -123,7 +123,7 @@ extern int sign_extend_temp; /* Put text and data on non-segment boundary; makes image smaller */ -#define LD_SWITCH_MACHINE -N +#define LD_SWITCH_MACHINE -N /* When writing the 'xemacs' file, make text segment ro */ #define EXEC_MAGIC 0410 diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index eb603eeb469..c7cfbf8b847 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="linux" */ diff --git a/src/m/apollo.h b/src/m/apollo.h index 2808e580368..83af7496e01 100644 --- a/src/m/apollo.h +++ b/src/m/apollo.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ diff --git a/src/m/att3b.h b/src/m/att3b.h index ed5f3c53dc9..46b101dfa4c 100644 --- a/src/m/att3b.h +++ b/src/m/att3b.h @@ -21,7 +21,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2-2" */ diff --git a/src/m/celerity.h b/src/m/celerity.h index 3ec5e99c1ec..c38d144d9b4 100644 --- a/src/m/celerity.h +++ b/src/m/celerity.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/convex.h b/src/m/convex.h index 44a86bf5d84..29797fc1314 100644 --- a/src/m/convex.h +++ b/src/m/convex.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ @@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA. */ * to be corrected before they can be used as byte counts. */ /* #define WORD_MACHINE */ - + /* Now define a symbol for the cpu type, if your compiler does not define it automatically. */ #ifndef convex /* The compiler doesn't always do this. */ @@ -54,7 +54,7 @@ Boston, MA 02111-1307, USA. */ and Ralph Sobek <Ralph.Sobek@cerfacs.fr> agree must ignore one arg when compiled with convex compiler. */ #define CRT0_DUMMIES ignore, -#else +#else #define CRT0_DUMMIES #endif @@ -86,9 +86,9 @@ Boston, MA 02111-1307, USA. */ /*#define VIRT_ADDR_VARIES*/ /* Must use the system's termcap. It does special things. */ - + #define LIBS_TERMCAP -ltermcap - + /* Define NO_REMAP if memory segmentation makes it not work well to change the boundary between the text section and data section when Emacs is dumped. If you define this, the preloaded Lisp diff --git a/src/m/cydra5.h b/src/m/cydra5.h index 344e6139301..7f227e36df9 100644 --- a/src/m/cydra5.h +++ b/src/m/cydra5.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-3" */ diff --git a/src/m/delta88k.h b/src/m/delta88k.h index 08eb98e1eaa..0b574ef0ca4 100644 --- a/src/m/delta88k.h +++ b/src/m/delta88k.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-3" */ @@ -54,7 +54,7 @@ Boston, MA 02111-1307, USA. */ /* Use type int rather than a union, to represent Lisp_Object */ /* This is desirable for most machines. */ -#define NO_UNION_TYPE +#define NO_UNION_TYPE /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend the 24-bit bit field into an int. In other words, if bit fields @@ -84,7 +84,7 @@ Boston, MA 02111-1307, USA. */ Otherwise Emacs assumes that text space precedes data space, numerically. */ -/* #define VIRT_ADDR_VARIES */ +/* #define VIRT_ADDR_VARIES */ /* Define NO_REMAP if memory segmentation makes it not work well to change the boundary between the text section and data section @@ -96,13 +96,13 @@ Boston, MA 02111-1307, USA. */ /* Motorola SysV has PTYs. Not all usg3-5 systems do, so this is defined here. */ -#define HAVE_PTYS +#define HAVE_PTYS #define SYSV_PTYS /* Ditto for IPC. */ -/* +/* * we now have job control in R32V1 */ #undef NOMULTIPLEJOBS @@ -134,7 +134,7 @@ Boston, MA 02111-1307, USA. */ /* previously defined in usg5-4, if we choose to use that. */ #ifndef LIBS_SYSTEM #ifdef USG5_4 -#define LIBS_SYSTEM -lsocket -lnsl +#define LIBS_SYSTEM -lsocket -lnsl #else #define LIBS_SYSTEM -lbsd -lg #endif /* USG5_4 */ diff --git a/src/m/dpx2.h b/src/m/dpx2.h index eee18512e6d..282c4bd877e 100644 --- a/src/m/dpx2.h +++ b/src/m/dpx2.h @@ -1,4 +1,4 @@ -/* machine description for Bull DPX/2 range +/* machine description for Bull DPX/2 range Copyright (C) 1985, 1986, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -18,12 +18,12 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-3" */ /* - * You need to either un-comment one of these lines, or copy one + * You need to either un-comment one of these lines, or copy one * of them to config.h before you include this file. * Note that some simply define a constant and others set a value. */ diff --git a/src/m/dual.h b/src/m/dual.h index a2c022f08ed..d00a30d9345 100644 --- a/src/m/dual.h +++ b/src/m/dual.h @@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" @@ -57,7 +57,7 @@ NOTE-END */ /* Data type of load average, as read out of kmem. */ /* These are commented out since it does not really work in uniplus */ - + /* #define LOAD_AVE_TYPE long */ /* Convert that into an integer that is 100 for a load average of 1.0 */ diff --git a/src/m/elxsi.h b/src/m/elxsi.h index b3003000dc5..b392e07c5f0 100644 --- a/src/m/elxsi.h +++ b/src/m/elxsi.h @@ -19,7 +19,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h index 00ae9604d59..fcbeac3b6ca 100644 --- a/src/m/gould-np1.h +++ b/src/m/gould-np1.h @@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ diff --git a/src/m/gould.h b/src/m/gould.h index c2e469db38e..af77843a9f2 100644 --- a/src/m/gould.h +++ b/src/m/gould.h @@ -25,7 +25,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" @@ -37,11 +37,11 @@ Gould Power Node (-machine=gould -opsystem=bsd4-2 or bsd4-3) On UTX/32 2.0, use -opsystem=bsd4-3 - On UTX/32 1.2 and UTX/32S 1.0, use -opsystem=bsd4-2 and note that compiling - lib-src/sorted-doc tickles a compiler bug: remove the -g flag to cc in the + On UTX/32 1.2 and UTX/32S 1.0, use -opsystem=bsd4-2 and note that compiling + lib-src/sorted-doc tickles a compiler bug: remove the -g flag to cc in the makefile. - UTX/32 1.3 has a bug in the bcopy library routine. Fix it by + UTX/32 1.3 has a bug in the bcopy library routine. Fix it by #undef BSTRING in gould.h. Version 19 incorporates support for releases 2.1 and later of UTX/32. @@ -70,7 +70,7 @@ NOTE-END */ #define GOULD #endif -/* sel is an old preprocessor name on gould machines +/* sel is an old preprocessor name on gould machines - it is no longer needed and interferes with a variable in xmenu.c */ #undef sel diff --git a/src/m/hp800.h b/src/m/hp800.h index 72c3a1ca4ea..5e4e0fd0ec6 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="hpux" */ @@ -61,7 +61,7 @@ Boston, MA 02111-1307, USA. */ /* The standard definitions of these macros would work ok, but these are faster because the constants are short. */ - + #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h index 725aa0d9eec..ad4ca111664 100644 --- a/src/m/hp9000s300.h +++ b/src/m/hp9000s300.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/i860.h b/src/m/i860.h index b65b6fdd27d..48222538380 100644 --- a/src/m/i860.h +++ b/src/m/i860.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h index cae7f24db36..32dc30089a5 100644 --- a/src/m/ibm370aix.h +++ b/src/m/ibm370aix.h @@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA. */ #define LOAD_AVE_TYPE double #undef LIBS_MACHINE -#define LIBS_MACHINE +#define LIBS_MACHINE #undef LD_SWITCH_MACHINE #define LD_SWITCH_MACHINE -xa diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h index 36dc0e7cbdc..a29d916451d 100644 --- a/src/m/ibmps2-aix.h +++ b/src/m/ibmps2-aix.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" @@ -190,7 +190,7 @@ so disable it for them. */ #ifdef __GNUC__ #define alloca(n) __builtin_alloca(n) #if __GNUC__ < 2 -#define LIB_STANDARD /usr/local/lib/gcc-gnulib -lbsd -lrts -lc +#define LIB_STANDARD /usr/local/lib/gcc-gnulib -lbsd -lrts -lc #endif /* -g fails to work, so it is omitted. */ /* tranle says that -fstrength-reduce does not help. */ diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 51f809c45ff..650530bf4c0 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="aix3-1" */ diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h index 0ae8941007f..26803238953 100644 --- a/src/m/ibmrt-aix.h +++ b/src/m/ibmrt-aix.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2-2" */ diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h index e6dfa17117d..587729e1418 100644 --- a/src/m/ibmrt.h +++ b/src/m/ibmrt.h @@ -1,4 +1,4 @@ -/* RTPC machine dependent defines +/* RTPC machine dependent defines Copyright (C) 1986, 2002 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/ibms390.h b/src/m/ibms390.h index 019db37bd80..711681267a4 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ diff --git a/src/m/intel386.h b/src/m/intel386.h index 318a5e1c7dc..7f9f616d25a 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" @@ -185,7 +185,7 @@ NOTE-END */ #endif /* not USG5_4 */ #endif /* LIB_STANDARD */ -#define NO_REMAP +#define NO_REMAP #define TEXT_START 0 #endif /* USG */ #endif /* not XENIX */ diff --git a/src/m/irist.h b/src/m/irist.h index 78111b6a3e1..b365371324f 100644 --- a/src/m/irist.h +++ b/src/m/irist.h @@ -20,7 +20,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" NOTE-START diff --git a/src/m/is386.h b/src/m/is386.h index 45f9273e910..0c89fdf91c6 100644 --- a/src/m/is386.h +++ b/src/m/is386.h @@ -2,7 +2,7 @@ #include "intel386.h" -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h index 768b40051f6..a1ab808923a 100644 --- a/src/m/isi-ov.h +++ b/src/m/isi-ov.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/masscomp.h b/src/m/masscomp.h index 540fa3e0a8e..0b045794e42 100644 --- a/src/m/masscomp.h +++ b/src/m/masscomp.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="rtu" */ diff --git a/src/m/mega68.h b/src/m/mega68.h index b67e3573293..fccd495e0d8 100644 --- a/src/m/mega68.h +++ b/src/m/mega68.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/mg1.h b/src/m/mg1.h index 7d37959e441..bf6e708bd7e 100644 --- a/src/m/mg1.h +++ b/src/m/mg1.h @@ -20,7 +20,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h index 832487795d5..d0935ce6160 100644 --- a/src/m/mips-siemens.h +++ b/src/m/mips-siemens.h @@ -24,7 +24,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" @@ -140,10 +140,10 @@ NOTE-END */ #ifdef __GNUC__ #define C_DEBUG_SWITCH -#define LD_SWITCH_MACHINE +#define LD_SWITCH_MACHINE #else #define C_DEBUG_SWITCH -DSYSV -#define C_OPTIMIZE_SWITCH -DSYSV +#define C_OPTIMIZE_SWITCH -DSYSV #define LD_SWITCH_MACHINE #endif diff --git a/src/m/mips.h b/src/m/mips.h index d4143a4d51f..3948cb6855c 100644 --- a/src/m/mips.h +++ b/src/m/mips.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/mips4.h b/src/m/mips4.h index 33905072ac0..5371fc03200 100644 --- a/src/m/mips4.h +++ b/src/m/mips4.h @@ -2,7 +2,7 @@ #include "mips.h" -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/news-risc.h b/src/m/news-risc.h index 7066395e360..cba5bbc5689 100644 --- a/src/m/news-risc.h +++ b/src/m/news-risc.h @@ -18,7 +18,7 @@ #else /* not NEWSOS5 */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ diff --git a/src/m/news.h b/src/m/news.h index 0fdeed10f4e..812432d8f38 100644 --- a/src/m/news.h +++ b/src/m/news.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/nh3000.h b/src/m/nh3000.h index eafb560e471..4df55957d90 100644 --- a/src/m/nh3000.h +++ b/src/m/nh3000.h @@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA. */ * series Motorola 88100 and 88110 based machines. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ diff --git a/src/m/nh4000.h b/src/m/nh4000.h index b5db2802cfa..d002405fe13 100644 --- a/src/m/nh4000.h +++ b/src/m/nh4000.h @@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA. */ * series Motorola 88100 and 88110 based machines. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ diff --git a/src/m/ns16000.h b/src/m/ns16000.h index e6cbe6cee6f..f684c3dcc6d 100644 --- a/src/m/ns16000.h +++ b/src/m/ns16000.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/ns32000.h b/src/m/ns32000.h index 2bacb5702d3..c3183862355 100644 --- a/src/m/ns32000.h +++ b/src/m/ns32000.h @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ diff --git a/src/m/nu.h b/src/m/nu.h index ec9ad5f2976..8eb9374e6da 100644 --- a/src/m/nu.h +++ b/src/m/nu.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ @@ -50,7 +50,7 @@ Boston, MA 02111-1307, USA. */ /* Data type of load average, as read out of kmem. */ /* These are commented out since it does not really work in uniplus */ - + /* #define LOAD_AVE_TYPE long */ /* Convert that into an integer that is 100 for a load average of 1.0 */ diff --git a/src/m/orion.h b/src/m/orion.h index c2b83bc1903..2a89251e23c 100644 --- a/src/m/orion.h +++ b/src/m/orion.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/orion105.h b/src/m/orion105.h index 2f622107ff4..7e5fb34b319 100644 --- a/src/m/orion105.h +++ b/src/m/orion105.h @@ -20,7 +20,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/plexus.h b/src/m/plexus.h index 9f8690127ec..22dbffa16f9 100644 --- a/src/m/plexus.h +++ b/src/m/plexus.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ @@ -88,7 +88,7 @@ Boston, MA 02111-1307, USA. */ #undef NO_REMAP -/* Use the following on ld so we can use the gnu crt0 +/* Use the following on ld so we can use the gnu crt0 The plexus ld looks for start */ #define LD_SWITCH_MACHINE -e __start diff --git a/src/m/pmax.h b/src/m/pmax.h index 7cf01f79c41..54f246fed65 100644 --- a/src/m/pmax.h +++ b/src/m/pmax.h @@ -2,9 +2,9 @@ #include "mips.h" -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. - USUAL-OPSYS="note" + USUAL-OPSYS="note" NOTE-START The operating system would be either osf1, ultrix, or NetBSD. diff --git a/src/m/powermac.h b/src/m/powermac.h index f60e51963b0..0ab535dfd23 100644 --- a/src/m/powermac.h +++ b/src/m/powermac.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="darwin" */ diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h index e1409200dbc..2c01acb843d 100644 --- a/src/m/powerpcle.h +++ b/src/m/powerpcle.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="Solaris2.5.1 Windows/NT AIX 4.1.2" */ diff --git a/src/m/pyramid.h b/src/m/pyramid.h index ace92e51ba3..7abd4f88b3f 100644 --- a/src/m/pyramid.h +++ b/src/m/pyramid.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-2" */ diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h index fdf977075c7..2c815ff97bb 100644 --- a/src/m/sequent-ptx.h +++ b/src/m/sequent-ptx.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="ptx" */ @@ -95,7 +95,7 @@ Boston, MA 02111-1307, USA. */ #endif /* #undef NO_REMAP */ -/* If a valid PTX executable could be dumped without NO_REMAP defined, +/* If a valid PTX executable could be dumped without NO_REMAP defined, here's a guess at some defines to make it work. */ #ifndef NO_REMAP diff --git a/src/m/sequent.h b/src/m/sequent.h index 2cd06b490d8..404bbf54668 100644 --- a/src/m/sequent.h +++ b/src/m/sequent.h @@ -19,15 +19,15 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. - USUAL-OPSYS="note" + USUAL-OPSYS="note" NOTE-START Use -opsystem=bsd4-2, or -opsystem=bsd4-3 on newer systems. NOTE-END */ -/* NOTE: this file works for DYNIX release 2.0 +/* NOTE: this file works for DYNIX release 2.0 (not tested on 1.3) on NS32000's */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word diff --git a/src/m/sparc.h b/src/m/sparc.h index 28ac8421694..8e22ccb2b21 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/sps7.h b/src/m/sps7.h index f1e83e24deb..1589f2cbfb2 100644 --- a/src/m/sps7.h +++ b/src/m/sps7.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ @@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */ #define m68000 #endif -#define sps7 +#define sps7 /* Use type int rather than a union, to represent Lisp_Object */ @@ -99,7 +99,7 @@ Boston, MA 02111-1307, USA. */ /* Use -T32 for 68020, -T16 otherwise */ #define C_SWITCH_MACHINE -T32 - + #define BROKEN_SIGIO /* Other than 68020 use ld16, as32, or undefine (defaults ld and as). */ diff --git a/src/m/sr2k.h b/src/m/sr2k.h index 5013d1249fc..4adf0f700fc 100644 --- a/src/m/sr2k.h +++ b/src/m/sr2k.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="hpux" */ @@ -61,7 +61,7 @@ Boston, MA 02111-1307, USA. */ /* The standard definitions of these macros would work ok, but these are faster because the constants are short. */ - + #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) diff --git a/src/m/stride.h b/src/m/stride.h index 17bc577dd69..4e1fd18dc91 100644 --- a/src/m/stride.h +++ b/src/m/stride.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ diff --git a/src/m/sun1.h b/src/m/sun1.h index 68a113747e8..6bff1d21677 100644 --- a/src/m/sun1.h +++ b/src/m/sun1.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/sun2.h b/src/m/sun2.h index e9267df0967..5107f3c47d2 100644 --- a/src/m/sun2.h +++ b/src/m/sun2.h @@ -21,7 +21,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/sun3-68881.h b/src/m/sun3-68881.h index b74758fa4fc..1210bef6300 100644 --- a/src/m/sun3-68881.h +++ b/src/m/sun3-68881.h @@ -2,7 +2,7 @@ #include "sun3.h" -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/sun3-fpa.h b/src/m/sun3-fpa.h index da959cac361..1b2c084e010 100644 --- a/src/m/sun3-fpa.h +++ b/src/m/sun3-fpa.h @@ -2,7 +2,7 @@ #include "sun3.h" -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/sun3-soft.h b/src/m/sun3-soft.h index 05a1e9e7f49..0913e875d8a 100644 --- a/src/m/sun3-soft.h +++ b/src/m/sun3-soft.h @@ -2,7 +2,7 @@ #include "sun3.h" -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/sun3.h b/src/m/sun3.h index b20889c25b8..24f84d8e2da 100644 --- a/src/m/sun3.h +++ b/src/m/sun3.h @@ -7,7 +7,7 @@ #define sun3 #endif -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/sun386.h b/src/m/sun386.h index cf9537ea100..61468f99879 100644 --- a/src/m/sun386.h +++ b/src/m/sun386.h @@ -21,7 +21,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" @@ -47,7 +47,7 @@ NOTE-END */ #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) -/* Underscores are not prepended to C symbols on this machine. */ +/* Underscores are not prepended to C symbols on this machine. */ #undef LDAV_SYMBOL #define LDAV_SYMBOL "avenrun" diff --git a/src/m/symmetry.h b/src/m/symmetry.h index 74ca6c09c26..a3e89c58490 100644 --- a/src/m/symmetry.h +++ b/src/m/symmetry.h @@ -18,18 +18,18 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988] - * Modified the sequent.h file for the Sequent Symmetry machine. - * Biggest change was to align the sections in the a.out to 4K +/* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988] + * Modified the sequent.h file for the Sequent Symmetry machine. + * Biggest change was to align the sections in the a.out to 4K * boundaries (this is the page size). */ /* NOTICE: this file works for DYNIX release 3.0.12 on Sequent Symmetry * (Intel 80386) machines. Hasn't been tested on anything else. - */ + */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ diff --git a/src/m/tad68k.h b/src/m/tad68k.h index 78b961d2c77..4aa142fbd91 100644 --- a/src/m/tad68k.h +++ b/src/m/tad68k.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-3" */ diff --git a/src/m/tahoe.h b/src/m/tahoe.h index 5bef9a1a375..343247d0529 100644 --- a/src/m/tahoe.h +++ b/src/m/tahoe.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/tandem-s2.h b/src/m/tandem-s2.h index 405af5c844a..92e9ebfbb35 100644 --- a/src/m/tandem-s2.h +++ b/src/m/tandem-s2.h @@ -2,7 +2,7 @@ #include "mips.h" -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-3" */ diff --git a/src/m/targon31.h b/src/m/targon31.h index 86211a6e5a4..7c44f12e177 100644 --- a/src/m/targon31.h +++ b/src/m/targon31.h @@ -1,4 +1,4 @@ -/* targon31 machine description file +/* targon31 machine description file Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2-2" */ diff --git a/src/m/tek4300.h b/src/m/tek4300.h index 5c88f6ef9bd..d402022a034 100644 --- a/src/m/tek4300.h +++ b/src/m/tek4300.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h index cc2439d0a92..2e1fa20d371 100644 --- a/src/m/tekxd88.h +++ b/src/m/tekxd88.h @@ -48,7 +48,7 @@ Boston, MA 02111-1307, USA. */ /* Use type int rather than a union, to represent Lisp_Object */ /* This is desirable for most machines. */ -#define NO_UNION_TYPE +#define NO_UNION_TYPE /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend the 24-bit bit field into an int. In other words, if bit fields @@ -73,7 +73,7 @@ Boston, MA 02111-1307, USA. */ Otherwise Emacs assumes that text space precedes data space, numerically. */ -/* #define VIRT_ADDR_VARIES */ +/* #define VIRT_ADDR_VARIES */ /* Define NO_REMAP if memory segmentation makes it not work well to change the boundary between the text section and data section @@ -100,7 +100,7 @@ Boston, MA 02111-1307, USA. */ #define HAVE_PTYS /* XD88 SysV has PTYs. */ #define SYSV_PTYS /* Requires <termios.h> */ -#ifdef ghs /* Stands for "Green Hills Software", defined only in /bin/cc */ +#ifdef ghs /* Stands for "Green Hills Software", defined only in /bin/cc */ /* -X18 means do not allocate programmer-defined local variables to a register unless they are declared register. (Copied from perl-4.036 Green Hills C hints file. Might be needed for setjmp, I don't know.) */ diff --git a/src/m/template.h b/src/m/template.h index 7683cbfba6e..6def690cd98 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ diff --git a/src/m/tower32.h b/src/m/tower32.h index 9dbb0dc6b6e..307d2b93e33 100644 --- a/src/m/tower32.h +++ b/src/m/tower32.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2-2" */ diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h index dbbafcd19cd..3d54366aa94 100644 --- a/src/m/tower32v3.h +++ b/src/m/tower32v3.h @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-3" */ diff --git a/src/m/ustation.h b/src/m/ustation.h index 9e8c26a17da..17d59df0d02 100644 --- a/src/m/ustation.h +++ b/src/m/ustation.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-3" */ diff --git a/src/m/vax.h b/src/m/vax.h index 86ca420f2e4..eace9f7e144 100644 --- a/src/m/vax.h +++ b/src/m/vax.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="note" diff --git a/src/m/wicat.h b/src/m/wicat.h index e361d09164d..0a9596cd15c 100644 --- a/src/m/wicat.h +++ b/src/m/wicat.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h index 5a3e16ddad1..4188a7032ec 100644 --- a/src/m/windowsnt.h +++ b/src/m/windowsnt.h @@ -19,7 +19,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ diff --git a/src/m/xps100.h b/src/m/xps100.h index 499182d5509..26cec523741 100644 --- a/src/m/xps100.h +++ b/src/m/xps100.h @@ -21,7 +21,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="usg5-2" */ diff --git a/src/mac.c b/src/mac.c index bc2d342b197..a6b92db4680 100644 --- a/src/mac.c +++ b/src/mac.c @@ -2770,7 +2770,7 @@ sys_select (n, rfds, wfds, efds, timeout) if (!inhibit_window_system && rfds && FD_ISSET (0, rfds)) return 1; else if (inhibit_window_system || noninteractive || - (timeout && (EMACS_SECS(*timeout)==0) && + (timeout && (EMACS_SECS(*timeout)==0) && (EMACS_USECS(*timeout)==0))) return select(n, rfds, wfds, efds, timeout); else @@ -2780,22 +2780,22 @@ sys_select (n, rfds, wfds, efds, timeout) EMACS_GET_TIME (end_time); if (timeout) EMACS_ADD_TIME (end_time, end_time, *timeout); - + do { int r; EMACS_TIME one_second; SELECT_TYPE orfds; - + FD_ZERO (&orfds); if (rfds) { orfds = *rfds; } - + EMACS_SET_SECS (one_second, 1); EMACS_SET_USECS (one_second, 0); - + if (timeout && EMACS_TIME_LT(*timeout, one_second)) one_second = *timeout; @@ -2806,12 +2806,12 @@ sys_select (n, rfds, wfds, efds, timeout) } mac_check_for_quit_char(); - + EMACS_GET_TIME (now); EMACS_SUB_TIME (now, end_time, now); } while (!timeout || !EMACS_TIME_NEG_P (now)); - + return 0; } } @@ -2835,7 +2835,7 @@ int sys_read (fds, buf, nbyte) if (sys_select (fds+1, &rfds, 0, 0, NULL) < 0) return -1; } - + return read (fds, buf, nbyte); } diff --git a/src/macmenu.c b/src/macmenu.c index d52fff8bd5e..3958be9668d 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -120,7 +120,7 @@ typedef struct _widget_value char* name; /* value (meaning depend on widget type) */ char* value; - /* keyboard equivalent. no implications for XtTranslations */ + /* keyboard equivalent. no implications for XtTranslations */ char* key; /* Help string or nil if none. GC finds this string through the frame's menu_bar_vector @@ -174,7 +174,7 @@ typedef struct _widget_value #define TRUE 1 #define FALSE 0 #endif /* no TRUE */ - + Lisp_Object Vmenu_updating_frame; Lisp_Object Qdebug_on_next_call; @@ -507,7 +507,7 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth) /* This is a subroutine of single_keymap_panes that handles one keymap entry. - KEY is a key in a keymap and ITEM is its binding. + KEY is a key in a keymap and ITEM is its binding. PENDING_MAPS_PTR points to a list of keymaps waiting to be made into separate panes. If NOTREAL is nonzero, only check for equivalent key bindings, don't @@ -523,7 +523,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth) Lisp_Object map, item_string, enabled; struct gcpro gcpro1, gcpro2; int res; - + /* Parse the menu item and leave the result in item_properties. */ GCPRO2 (key, item); res = parse_menu_item (item, notreal, 0); @@ -532,7 +532,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth) return; /* Not a menu item. */ map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP]; - + if (notreal) { /* We don't want to make a menu, just traverse the keymaps to @@ -543,7 +543,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth) } enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE]; - item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; + item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; if (!NILP (map) && SREF (item_string, 0) == '@') { @@ -818,7 +818,7 @@ cached information about equivalent key sequences. */) keymaps = 0; } - + if (NILP (position)) { discard_menu_items (); @@ -971,7 +971,7 @@ on the left of the dialog box and all following items on the right. But first we recompute the menu bar contents (the whole tree). This way we can safely execute Lisp code. */ - + void x_activate_menubar (f) FRAME_PTR f; @@ -1182,7 +1182,7 @@ single_submenu (item_key, item_name, maps) first_wv = wv; save_wv = 0; prev_wv = 0; - + /* Loop over all panes and items made during this call and construct a tree of widget_value objects. Ignore the panes and items made by previous calls to @@ -1286,7 +1286,7 @@ single_submenu (item_key, item_name, maps) #endif /* not HAVE_MULTILINGUAL_MENU */ wv = xmalloc_widget_value (); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else save_wv->contents = wv; @@ -1432,7 +1432,7 @@ set_frame_menubar (f, first_time, deep_p) break; wv = single_submenu (key, string, maps); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else first_wv->contents = wv; @@ -1508,7 +1508,7 @@ set_frame_menubar (f, first_time, deep_p) This value just has to be different from small integers. */ wv->call_data = (void *) (EMACS_INT) (-1); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else first_wv->contents = wv; @@ -1537,7 +1537,7 @@ set_frame_menubar (f, first_time, deep_p) DisposeMenu (menu); menu = GetMenuHandle (++i); } - + i = MIN_SUBMENU_ID; menu = GetMenuHandle (i); while (menu != NULL) @@ -1549,9 +1549,9 @@ set_frame_menubar (f, first_time, deep_p) } fill_menubar (first_wv->contents); - + DrawMenuBar (); - + free_menubar_widget_value_tree (first_wv); UNBLOCK_INPUT; @@ -1640,7 +1640,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error) wv->help = Qnil; first_wv = wv; first_pane = 1; - + /* Loop over all panes and items, filling in the tree. */ i = 0; while (i < menu_items_used) @@ -1743,9 +1743,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error) #endif /* not HAVE_MULTILINGUAL_MENU */ wv = xmalloc_widget_value (); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; - else + else save_wv->contents = wv; wv->name = (char *) SDATA (item_name); if (!NILP (descrip)) @@ -1830,14 +1830,14 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error) menu_item_selection = LoWord (menu_item_choice); /* Get the refcon to find the correct item*/ - if (menu_item_selection) + if (menu_item_selection) { menu = GetMenuHandle (HiWord (menu_item_choice)); if (menu) { GetMenuItemRefCon (menu, menu_item_selection, &refcon); } } - + #if 0 /* Clean up extraneous mouse events which might have been generated during the call. */ @@ -1944,13 +1944,13 @@ mac_dialog (widget_value *wv) SInt16 part_code; int control_part_code; Point mouse; - + dialog_name = wv->name; nb_buttons = dialog_name[1] - '0'; left_count = nb_buttons - (dialog_name[4] - '0'); button_labels = (char **) alloca (sizeof (char *) * nb_buttons); ref_cons = (UInt32 *) alloca (sizeof (UInt32) * nb_buttons); - + wv = wv->contents; prompt = (char *) alloca (strlen (wv->value) + 1); strcpy (prompt, wv->value); @@ -1974,7 +1974,7 @@ mac_dialog (widget_value *wv) #else SetPort (window_ptr); #endif - + TextFont (0); /* Left and right margins in the dialog are 13 pixels each.*/ dialog_width = 14; @@ -1996,7 +1996,7 @@ mac_dialog (widget_value *wv) #else SetPort (window_ptr); #endif - + TextFont (0); MoveTo (13, 29); @@ -2034,7 +2034,7 @@ mac_dialog (widget_value *wv) } DisposeWindow (window_ptr); - + return i; } @@ -2076,7 +2076,7 @@ mac_dialog_show (f, keymaps, title, error) pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME]; prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX]; pane_string = (NILP (pane_name) - ? "" : (char *) SDATA (pane_name)); + ? "" : (char *) SDATA (pane_name)); prev_wv = xmalloc_widget_value (); prev_wv->value = pane_string; if (keymaps && !NILP (prefix)) @@ -2085,12 +2085,12 @@ mac_dialog_show (f, keymaps, title, error) prev_wv->name = "message"; prev_wv->help = Qnil; first_wv = prev_wv; - + /* Loop over all panes and items, filling in the tree. */ i = MENU_ITEMS_PANE_LENGTH; while (i < menu_items_used) { - + /* Create a new item within current pane. */ Lisp_Object item_name, enable, descrip, help; @@ -2099,7 +2099,7 @@ mac_dialog_show (f, keymaps, title, error) descrip = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP]; - + if (NILP (item_name)) { free_menubar_widget_value_tree (first_wv); @@ -2240,10 +2240,10 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu, if (name_is_separator (wv->name)) AppendMenu (menu, "\p-"); - else + else { AppendMenu (menu, "\pX"); - + #if TARGET_API_MAC_CARBON pos = CountMenuItems (menu); #else @@ -2340,7 +2340,7 @@ fill_menubar (widget_value *wv) { MenuHandle menu; Str255 title; - + strncpy (title, wv->name, 255); title[255] = 0; c2pstr (title); @@ -2348,7 +2348,7 @@ fill_menubar (widget_value *wv) if (wv->contents) fill_menu (menu, wv->contents); - + InsertMenu (menu, 0); } } diff --git a/src/macros.c b/src/macros.c index 99383f758f3..44d44d2c9c1 100644 --- a/src/macros.c +++ b/src/macros.c @@ -62,7 +62,7 @@ Use \\[end-kbd-macro] to finish recording and make the macro available. Use \\[name-last-kbd-macro] to give it a permanent name. Non-nil arg (prefix arg) means append to last macro defined; this begins by re-executing that macro as if you typed it again. -If optional second arg, NO-EXEC, is non-nil, do not re-execute last +If optional second arg, NO-EXEC, is non-nil, do not re-execute last macro before appending to it. */) (append, no_exec) Lisp_Object append, no_exec; @@ -127,7 +127,7 @@ macro before appending to it. */) message ("Appending to kbd macro..."); } current_kboard->defining_kbd_macro = Qt; - + return Qnil; } @@ -155,7 +155,7 @@ With numeric arg, repeat macro now that many times, counting the definition just completed as the first repetition. An argument of zero means repeat until error. -In Lisp, optional second arg LOOPFUNC may be a function that is called prior to +In Lisp, optional second arg LOOPFUNC may be a function that is called prior to each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) (repeat, loopfunc) Lisp_Object repeat, loopfunc; @@ -198,7 +198,7 @@ store_kbd_macro_char (c) if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize) { int ptr_offset, end_offset, nbytes; - + ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer; end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer; kb->kbd_macro_bufsize *= 2; @@ -208,7 +208,7 @@ store_kbd_macro_char (c) kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset; kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset; } - + *kb->kbd_macro_ptr++ = c; } } @@ -248,9 +248,9 @@ DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, Scall_last_kbd_macro, A prefix argument serves as a repeat count. Zero means repeat until error. To make a macro permanent so you can call it even after -defining others, use \\[name-last-kbd-macro]. +defining others, use \\[name-last-kbd-macro]. -In Lisp, optional second arg LOOPFUNC may be a function that is called prior to +In Lisp, optional second arg LOOPFUNC may be a function that is called prior to each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) (prefix, loopfunc) Lisp_Object prefix, loopfunc; @@ -295,9 +295,9 @@ pop_kbd_macro (info) DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0, doc: /* Execute MACRO as string of editor command characters. If MACRO is a symbol, its function definition is used. -COUNT is a repeat count, or nil for once, or 0 for infinite loop. +COUNT is a repeat count, or nil for once, or 0 for infinite loop. -Optional third arg LOOPFUNC may be a function that is called prior to +Optional third arg LOOPFUNC may be a function that is called prior to each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) (macro, count, loopfunc) Lisp_Object macro, count, loopfunc; diff --git a/src/macterm.c b/src/macterm.c index f31ae2d44d4..e9f613918fd 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -202,7 +202,7 @@ Lisp_Object Vx_toolkit_scroll_bars; /* If a string, XTread_socket generates an event to display that string. (The display is done in read_char.) */ - + static Lisp_Object help_echo; static Lisp_Object help_echo_window; static Lisp_Object help_echo_object; @@ -259,7 +259,7 @@ extern int waiting_for_input; struct frame *pending_autoraise_frame; -/* Nominal cursor position -- where to draw output. +/* Nominal cursor position -- where to draw output. HPOS and VPOS are window relative glyph matrix coordinates. X and Y are window relative pixel coordinates. */ @@ -456,7 +456,7 @@ static void x_update_cursor_in_window_tree P_ ((struct window *, int)); static void x_update_window_cursor P_ ((struct window *, int)); static void x_erase_phys_cursor P_ ((struct window *)); void x_display_and_set_cursor P_ ((struct window *, int, int, int, int, int)); -static void x_draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, +static void x_draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, enum fringe_bitmap_type, int left_p)); static void x_clip_to_row P_ ((struct window *, struct glyph_row *, GC, int)); @@ -505,7 +505,7 @@ XFreePixmap (display, pixmap) Pixmap pixmap; { PixMap *p = (PixMap *) pixmap; - + xfree (p->baseAddr); xfree (p); } @@ -518,12 +518,12 @@ static void mac_set_forecolor (unsigned long color) { RGBColor fg_color; - + fg_color.red = RED_FROM_ULONG (color) * 256; fg_color.green = GREEN_FROM_ULONG (color) * 256; fg_color.blue = BLUE_FROM_ULONG (color) * 256; - - RGBForeColor (&fg_color); + + RGBForeColor (&fg_color); } @@ -534,12 +534,12 @@ static void mac_set_backcolor (unsigned long color) { RGBColor bg_color; - + bg_color.red = RED_FROM_ULONG (color) * 256; bg_color.green = GREEN_FROM_ULONG (color) * 256; bg_color.blue = BLUE_FROM_ULONG (color) * 256; - - RGBBackColor (&bg_color); + + RGBBackColor (&bg_color); } /* Set foreground and background color for subsequent QuickDraw @@ -626,7 +626,7 @@ XClearWindow (display, w) #if TARGET_API_MAC_CARBON { Rect r; - + GetWindowPortBounds (w, &r); EraseRect (&r); } @@ -667,7 +667,7 @@ mac_draw_bitmap (display, w, gc, x, y, bitmap) UnlockPortBits (GetWindowPort (w)); } #else /* not TARGET_API_MAC_CARBON */ - CopyBits (bitmap, &(w->portBits), &(bitmap->bounds), &r, srcCopy, 0); + CopyBits (bitmap, &(w->portBits), &(bitmap->bounds), &r, srcCopy, 0); #endif /* not TARGET_API_MAC_CARBON */ } @@ -698,7 +698,7 @@ mac_reset_clipping (display, w) WindowPtr w; { Rect r; - + #if TARGET_API_MAC_CARBON SetPort (GetWindowPort (w)); #else @@ -957,12 +957,12 @@ static void local_to_global_coord (short *h, short *v) { Point p; - + p.h = *h; p.v = *v; - + LocalToGlobal (&p); - + *h = p.h; *v = p.v; } @@ -1023,7 +1023,7 @@ mac_scroll_area (display, w, gc, src_x, src_y, width, height, dest_x, dest_y) ForeColor (blackColor); BackColor (whiteColor); CopyBits (&(w->portBits), &(w->portBits), &src_r, &dest_r, srcCopy, 0); - + mac_set_colors (gc); #endif #endif /* not TARGET_API_MAC_CARBON */ @@ -1033,7 +1033,7 @@ mac_scroll_area (display, w, gc, src_x, src_y, width, height, dest_x, dest_y) /* Mac replacement for XCopyArea: dest must be Pixmap. */ static void -mac_copy_area_to_pixmap (display, src, dest, gc, src_x, src_y, width, height, +mac_copy_area_to_pixmap (display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y) Display *display; Pixmap src; @@ -1050,7 +1050,7 @@ mac_copy_area_to_pixmap (display, src, dest, gc, src_x, src_y, width, height, int h = src_bottom - src_y; mac_set_colors (gc); - + SetRect (&src_r, src_x, src_y, src_right, src_bottom); SetRect (&dest_r, dest_x, dest_y, dest_x + w, dest_y + h); @@ -1160,7 +1160,7 @@ x_sync (f) #if TARGET_API_MAC_CARBON #define XFlush(DISPLAY) QDFlushPortBuffer (GetQDGlobalsThePort (), NULL) #else -#define XFlush(DISPLAY) (void) 0 +#define XFlush(DISPLAY) (void) 0 #endif /* Flush display of frame F, or of all frames if F is null. */ @@ -1200,7 +1200,7 @@ mac_display_info_for_display (dpy) /*********************************************************************** Starting and ending an update ***********************************************************************/ - + /* Start an update of frame F. This function is installed as a hook for update_begin, i.e. it is called when update_begin is called. This function is called prior to calls to x_update_window_begin for @@ -1224,7 +1224,7 @@ x_update_window_begin (w) { struct frame *f = XFRAME (WINDOW_FRAME (w)); struct mac_display_info *display_info = FRAME_MAC_DISPLAY_INFO (f); - + updated_window = w; set_output_cursor (&w->cursor); @@ -1246,7 +1246,7 @@ x_update_window_begin (w) flag set. So, rows containing mouse-face glyphs are never scrolled, and we don't have to switch the mouse highlight off here to prevent it from being scrolled. */ - + /* Can we tell that this update does not affect the window where the mouse highlight is? If so, no need to turn off. Likewise, don't do anything if the frame is garbaged; @@ -1279,7 +1279,7 @@ x_draw_vertical_border (w) struct window *w; { struct frame *f = XFRAME (WINDOW_FRAME (w)); - + /* Redraw borders between horizontally adjacent windows. Don't do it for frames with vertical scroll bars because either the right scroll bar of a window, or the left scroll bar of its @@ -1292,13 +1292,13 @@ x_draw_vertical_border (w) window_box_edges (w, -1, &x0, &y0, &x1, &y1); x1 += FRAME_X_RIGHT_FRINGE_WIDTH (f); y1 -= 1; - - XDrawLine (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), + + XDrawLine (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), f->output_data.mac->normal_gc, x1, y0, x1, y1); } } - + /* End update of window W (which is equal to updated_window). Draw vertical borders between horizontally adjacent windows, and @@ -1328,7 +1328,7 @@ x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p) x_display_and_set_cursor (w, 1, output_cursor.hpos, output_cursor.vpos, output_cursor.x, output_cursor.y); - + x_draw_vertical_border (w); UNBLOCK_INPUT; } @@ -1371,7 +1371,7 @@ x_update_end (f) #endif mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f)); - + /* Mouse highlight may be displayed again. */ FRAME_MAC_DISPLAY_INFO (f)->mouse_face_defer = 0; @@ -1424,7 +1424,7 @@ x_after_update_window_line (desired_row) int width, height; xassert (w); - + if (!desired_row->mode_line_p && !w->pseudo_window_p) { BLOCK_INPUT; @@ -1459,7 +1459,7 @@ x_after_update_window_line (desired_row) XClearArea (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), f->output_data.mac->pixel_width - width, y, width, height, 0); - + UNBLOCK_INPUT; } } @@ -1506,13 +1506,13 @@ x_draw_fringe_bitmap (w, row, which, left_p) h = left_height; bits = left_bits; break; - + case OVERLAY_ARROW_BITMAP: wd = ov_width; h = ov_height; bits = ov_bits; break; - + case RIGHT_TRUNCATION_BITMAP: wd = right_width; h = right_height; @@ -1524,7 +1524,7 @@ x_draw_fringe_bitmap (w, row, which, left_p) h = continued_height; bits = continued_bits; break; - + case CONTINUATION_LINE_BITMAP: wd = continuation_width; h = continuation_height; @@ -1731,7 +1731,7 @@ set_output_cursor (cursor) HPOS and VPOS are column/row positions in a window glyph matrix. X and Y are window text area relative pixel positions. - + If this is done during an update, updated_window will contain the window that is being updated and the position is the future output cursor position for that window. If updated_window is null, use @@ -1905,9 +1905,9 @@ x_encode_char (c, char2b, font_info) ccl->reg[1] = char2b->byte1; ccl->reg[2] = char2b->byte2; } - + ccl_driver (ccl, NULL, NULL, 0, 0, NULL); - + /* We assume that MSBs are appropriately set/reset by CCL program. */ if (font->max_byte1 == 0) /* 1-byte font */ @@ -1920,11 +1920,11 @@ x_encode_char (c, char2b, font_info) /* Fixed encoding scheme. See fontset.h for the meaning of the encoding numbers. */ int enc = font_info->encoding[charset]; - + if ((enc == 1 || enc == 2) && CHARSET_DIMENSION (charset) == 2) char2b->byte1 |= 0x80; - + if (enc == 1 || enc == 3) char2b->byte2 |= 0x80; @@ -1972,7 +1972,7 @@ x_get_char_face_and_encoding (f, c, face_id, char2b, multibyte_p) else { int c1, c2, charset; - + /* Split characters into bytes. If c2 is -1 afterwards, C is really a one-byte character so that byte1 is zero. */ SPLIT_CHAR (c, charset, c1, c2); @@ -1994,7 +1994,7 @@ x_get_char_face_and_encoding (f, c, face_id, char2b, multibyte_p) /* Make sure X resources of the face are allocated. */ xassert (face != NULL); PREPARE_FACE_FOR_DISPLAY (f, face); - + return face; } @@ -2035,7 +2035,7 @@ x_get_glyph_face_and_encoding (f, glyph, char2b, two_byte_p) else { int c1, c2, charset; - + /* Split characters into bytes. If c2 is -1 afterwards, C is really a one-byte character so that byte1 is zero. */ SPLIT_CHAR (glyph->u.ch, charset, c1, c2); @@ -2066,7 +2066,7 @@ x_get_glyph_face_and_encoding (f, glyph, char2b, two_byte_p) } -/* Store one glyph for IT->char_to_display in IT->glyph_row. +/* Store one glyph for IT->char_to_display in IT->glyph_row. Called from x_produce_glyphs when IT->glyph_row is non-null. */ static INLINE void @@ -2075,10 +2075,10 @@ x_append_glyph (it) { struct glyph *glyph; enum glyph_row_area area = it->area; - + xassert (it->glyph_row); xassert (it->char_to_display != '\n' && it->char_to_display != '\t'); - + glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; if (glyph < it->glyph_row->glyphs[area + 1]) { @@ -2100,7 +2100,7 @@ x_append_glyph (it) } } -/* Store one glyph for the composition IT->cmp_id in IT->glyph_row. +/* Store one glyph for the composition IT->cmp_id in IT->glyph_row. Called from x_produce_glyphs when IT->glyph_row is non-null. */ static INLINE void @@ -2109,9 +2109,9 @@ x_append_composite_glyph (it) { struct glyph *glyph; enum glyph_row_area area = it->area; - + xassert (it->glyph_row); - + glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; if (glyph < it->glyph_row->glyphs[area + 1]) { @@ -2181,7 +2181,7 @@ x_produce_image_glyph (it) it->pixel_width = img->width + 2 * img->hmargin; it->nglyphs = 1; - + if (face->box != FACE_NO_BOX) { if (face->box_line_width > 0) @@ -2189,7 +2189,7 @@ x_produce_image_glyph (it) it->ascent += face->box_line_width; it->descent += face->box_line_width; } - + if (it->start_of_box_run_p) it->pixel_width += abs (face->box_line_width); if (it->end_of_box_run_p) @@ -2197,12 +2197,12 @@ x_produce_image_glyph (it) } take_vertical_position_into_account (it); - + if (it->glyph_row) { struct glyph *glyph; enum glyph_row_area area = it->area; - + glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; if (glyph < it->glyph_row->glyphs[area + 1]) { @@ -2226,10 +2226,10 @@ x_produce_image_glyph (it) /* Append a stretch glyph to IT->glyph_row. OBJECT is the source - of the glyph, WIDTH and HEIGHT are the width and height of the - stretch. ASCENT is the percentage/100 of HEIGHT to use for the + of the glyph, WIDTH and HEIGHT are the width and height of the + stretch. ASCENT is the percentage/100 of HEIGHT to use for the ascent of the glyph (0 <= ASCENT <= 1). */ - + static void x_append_stretch_glyph (it, object, width, height, ascent) struct it *it; @@ -2241,7 +2241,7 @@ x_append_stretch_glyph (it, object, width, height, ascent) enum glyph_row_area area = it->area; xassert (ascent >= 0 && ascent <= 1); - + glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; if (glyph < it->glyph_row->glyphs[area + 1]) { @@ -2270,7 +2270,7 @@ x_append_stretch_glyph (it, object, width, height, ascent) being recognized: 1. `:width WIDTH' specifies that the space should be WIDTH * - canonical char width wide. WIDTH may be an integer or floating + canonical char width wide. WIDTH may be an integer or floating point number. 2. `:relative-width FACTOR' specifies that the width of the stretch @@ -2280,7 +2280,7 @@ x_append_stretch_glyph (it, object, width, height, ascent) 3. `:align-to HPOS' specifies that the space should be wide enough to reach HPOS, a value in canonical character units. - Exactly one of the above pairs must be present. + Exactly one of the above pairs must be present. 4. `:height HEIGHT' specifies that the height of the stretch produced should be HEIGHT, measured in canonical character units. @@ -2318,7 +2318,7 @@ x_produce_stretch_glyph (it) XFontStruct *font = face->font ? face->font : FRAME_FONT (it->f); PREPARE_FACE_FOR_DISPLAY (it->f, face); - + /* List should start with `space'. */ xassert (CONSP (it->object) && EQ (XCAR (it->object), Qspace)); plist = XCDR (it->object); @@ -2336,7 +2336,7 @@ x_produce_stretch_glyph (it) property. */ struct it it2; unsigned char *p = BYTE_POS_ADDR (IT_BYTEPOS (*it)); - + it2 = *it; if (it->multibyte_p) { @@ -2358,7 +2358,7 @@ x_produce_stretch_glyph (it) else /* Nothing specified -> width defaults to canonical char width. */ width = CANON_X_UNIT (it->f); - + /* Compute height. */ if (prop = Fplist_get (plist, QCheight), NUMVAL (prop) > 0) @@ -2369,7 +2369,7 @@ x_produce_stretch_glyph (it) else height = FONT_HEIGHT (font); - /* Compute percentage of height used for ascent. If + /* Compute percentage of height used for ascent. If `:ascent ASCENT' is present and valid, use that. Otherwise, derive the ascent from the font in use. */ if (prop = Fplist_get (plist, QCascent), @@ -2403,13 +2403,13 @@ x_produce_stretch_glyph (it) it->ascent += face->box_line_width; it->descent += face->box_line_width; } - + if (it->start_of_box_run_p) it->pixel_width += abs (face->box_line_width); if (it->end_of_box_run_p) it->pixel_width += abs (face->box_line_width); } - + take_vertical_position_into_account (it); } @@ -2501,7 +2501,7 @@ x_produce_glyphs (it) face = FACE_FROM_ID (it->f, it->face_id); } } - + /* Get font to use. Encode IT->char_to_display. */ x_get_char_face_and_encoding (it->f, it->char_to_display, it->face_id, &char2b, @@ -2549,7 +2549,7 @@ x_produce_glyphs (it) it->phys_descent = FONT_DESCENT (font) - boff; it->pixel_width = FONT_WIDTH (font); } - + /* If this is a space inside a region of text with `space-width' property, change its width. */ stretched_p = it->char_to_display == ' ' && !NILP (it->space_width); @@ -2562,7 +2562,7 @@ x_produce_glyphs (it) if (face->box != FACE_NO_BOX) { int thick = face->box_line_width; - + if (thick > 0) { it->ascent += thick; @@ -2570,7 +2570,7 @@ x_produce_glyphs (it) } else thick = -thick; - + if (it->start_of_box_run_p) it->pixel_width += thick; if (it->end_of_box_run_p) @@ -2583,7 +2583,7 @@ x_produce_glyphs (it) it->ascent += 2; take_vertical_position_into_account (it); - + /* If we have to actually produce glyphs, do it. */ if (it->glyph_row) { @@ -2593,7 +2593,7 @@ x_produce_glyphs (it) into a stretch glyph. */ double ascent = (double) FONT_BASE (font) / FONT_HEIGHT (font); - x_append_stretch_glyph (it, it->object, it->pixel_width, + x_append_stretch_glyph (it, it->object, it->pixel_width, it->ascent + it->descent, ascent); } else @@ -2613,7 +2613,7 @@ x_produce_glyphs (it) it->nglyphs = 0; it->ascent = it->phys_ascent = FONT_BASE (font) + boff; it->descent = it->phys_descent = FONT_DESCENT (font) - boff; - + if (face->box != FACE_NO_BOX && face->box_line_width > 0) { @@ -2626,7 +2626,7 @@ x_produce_glyphs (it) int tab_width = it->tab_width * CANON_X_UNIT (it->f); int x = it->current_x + it->continuation_lines_width; int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width; - + /* If the distance from the current position to the next tab stop is less than a canonical character width, use the tab stop after that. */ @@ -2637,15 +2637,15 @@ x_produce_glyphs (it) it->nglyphs = 1; it->ascent = it->phys_ascent = FONT_BASE (font) + boff; it->descent = it->phys_descent = FONT_DESCENT (font) - boff; - + if (it->glyph_row) { double ascent = (double) it->ascent / (it->ascent + it->descent); - x_append_stretch_glyph (it, it->object, it->pixel_width, + x_append_stretch_glyph (it, it->object, it->pixel_width, it->ascent + it->descent, ascent); } } - else + else { /* A multi-byte character. Assume that the display width of the character is the width of the character multiplied by the @@ -2691,20 +2691,20 @@ x_produce_glyphs (it) } else thick = - thick; - + if (it->start_of_box_run_p) it->pixel_width += thick; if (it->end_of_box_run_p) it->pixel_width += thick; } - + /* If face has an overline, add the height of the overline (1 pixel) and a 1 pixel margin to the character height. */ if (face->overline_p) it->ascent += 2; take_vertical_position_into_account (it); - + if (it->glyph_row) x_append_glyph (it); } @@ -2798,12 +2798,12 @@ x_produce_glyphs (it) ascent = FONT_BASE (font); descent = FONT_DESCENT (font); } - + rightmost = width; lowest = - descent + boff; highest = ascent + boff; leftmost = 0; - + if (font_info && font_info->default_ascent && CHAR_TABLE_P (Vuse_default_ascent) @@ -2964,20 +2964,20 @@ x_produce_glyphs (it) } else thick = - thick; - + if (it->start_of_box_run_p) it->pixel_width += thick; if (it->end_of_box_run_p) it->pixel_width += thick; } - + /* If face has an overline, add the height of the overline (1 pixel) and a 1 pixel margin to the character height. */ if (face->overline_p) it->ascent += 2; take_vertical_position_into_account (it); - + if (it->glyph_row) x_append_composite_glyph (it); } @@ -3024,7 +3024,7 @@ x_estimate_mode_line_height (f, face_id) height += 2 * face->box_line_width; } } - + return height; } @@ -3194,7 +3194,7 @@ static int x_fill_glyph_string P_ ((struct glyph_string *, int, int, int, static void x_init_glyph_string P_ ((struct glyph_string *, XChar2b *, struct window *, struct glyph_row *, - enum glyph_row_area, int, + enum glyph_row_area, int, enum draw_glyphs_face)); static int x_draw_glyphs P_ ((struct window *, int , struct glyph_row *, enum glyph_row_area, int, int, @@ -3240,7 +3240,7 @@ static int x_fill_stretch_glyph_string P_ ((struct glyph_string *, static void x_check_font P_ ((struct frame *, XFontStruct *)); #endif - + /* Append the list of glyph strings with head H and tail T to the list with head *HEAD and tail *TAIL. Set *HEAD and *TAIL to the result. */ @@ -3349,11 +3349,11 @@ x_set_cursor_gc (s) /* Set up S->gc of glyph string S for drawing text in mouse face. */ - + static void x_set_mouse_face_gc (s) struct glyph_string *s; -{ +{ int face_id; struct face *face; @@ -3362,7 +3362,7 @@ x_set_mouse_face_gc (s) face = FACE_FROM_ID (s->f, face_id); if (face == NULL) face = FACE_FROM_ID (s->f, MOUSE_FACE_ID); - + if (s->first_glyph->type == CHAR_GLYPH) face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch); else @@ -3379,20 +3379,20 @@ x_set_mouse_face_gc (s) but font FONT. */ XGCValues xgcv; unsigned long mask; - + xgcv.background = s->face->background; xgcv.foreground = s->face->foreground; IF_DEBUG (x_check_font (s->f, s->font)); xgcv.font = s->font; mask = GCForeground | GCBackground | GCFont; - + if (FRAME_MAC_DISPLAY_INFO (s->f)->scratch_cursor_gc) XChangeGC (s->display, FRAME_MAC_DISPLAY_INFO (s->f)->scratch_cursor_gc, mask, &xgcv); else FRAME_MAC_DISPLAY_INFO (s->f)->scratch_cursor_gc = XCreateGC (s->display, s->window, mask, &xgcv); - + s->gc = FRAME_MAC_DISPLAY_INFO (s->f)->scratch_cursor_gc; } @@ -3407,7 +3407,7 @@ x_set_mouse_face_gc (s) static INLINE void x_set_mode_line_face_gc (s) struct glyph_string *s; -{ +{ s->gc = s->face->gc; } @@ -3421,7 +3421,7 @@ x_set_glyph_string_gc (s) struct glyph_string *s; { PREPARE_FACE_FOR_DISPLAY (s->f, s->face); - + if (s->hl == DRAW_NORMAL_TEXT) { s->gc = s->face->gc; @@ -3472,7 +3472,7 @@ x_get_glyph_string_clip_rect (s, r) { /* Draw full-width. X coordinates are relative to S->w->left. */ int canon_x = CANON_X_UNIT (s->f); - + r->left = WINDOW_LEFT_MARGIN (s->w) * canon_x; r_width = XFASTINT (s->w->width) * canon_x; @@ -3482,7 +3482,7 @@ x_get_glyph_string_clip_rect (s, r) if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (s->f)) r->left -= width; } - + r->left += FRAME_INTERNAL_BORDER_WIDTH (s->f); /* Unless displaying a mode or menu bar line, which are always @@ -3568,7 +3568,7 @@ x_compute_glyph_string_overhangs (s) /* Compute overhangs and x-positions for glyph string S and its predecessors, or successors. X is the starting x-position for S. BACKWARD_P non-zero means process predecessors. */ - + static void x_compute_overhangs_and_x (s, x, backward_p) struct glyph_string *s; @@ -3609,7 +3609,7 @@ x_get_glyph_overhangs (glyph, f, left, right) int *left, *right; { *left = *right = 0; - + if (glyph->type == CHAR_GLYPH) { XFontStruct *font; @@ -3642,7 +3642,7 @@ x_left_overwritten (s) struct glyph_string *s; { int k; - + if (s->left_overhang) { int x = 0, i; @@ -3704,7 +3704,7 @@ x_right_overwritten (s) struct glyph *glyphs = s->row->glyphs[s->area]; int first = (s->first_glyph - glyphs) + (s->cmp ? 1 : s->nchars); int end = s->row->used[s->area]; - + for (i = first; i < end && s->right_overhang > x; ++i) x += glyphs[i].pixel_width; @@ -3927,9 +3927,9 @@ x_frame_of_widget (widget) struct x_display_info *dpyinfo; Lisp_Object tail; struct frame *f; - + dpyinfo = x_display_info_for_display (XtDisplay (widget)); - + /* Find the top-level shell of the widget. Note that this function can be called when the widget is not yet realized, so XtWindow (widget) == 0. That's the reason we can't simply use @@ -4016,7 +4016,7 @@ x_alloc_nearest_color (f, cmap, color) nearest_delta = delta; } } - + color->red = cells[nearest].red; color->green = cells[nearest].green; color->blue = cells[nearest].blue; @@ -4027,7 +4027,7 @@ x_alloc_nearest_color (f, cmap, color) if (rc) register_color (color->pixel); #endif /* DEBUG_X_COLORS */ - + return rc; } @@ -4124,7 +4124,7 @@ mac_alloc_lighter_color (f, color, factor, delta) DELTA lighter or darker than the relief's background which is found in S->f->output_data.x->relief_background. If such a color cannot be allocated, use DEFAULT_PIXEL, instead. */ - + static void x_setup_relief_color (f, relief, factor, delta, default_pixel) struct frame *f; @@ -4150,7 +4150,7 @@ x_setup_relief_color (f, relief, factor, delta, default_pixel) relief->allocated_p = 1; xgcv.foreground = relief->pixel = pixel; } - + if (relief->gc == 0) { #if 0 /* MAC_TODO: stipple */ @@ -4178,7 +4178,7 @@ x_setup_relief_colors (s) else { XGCValues xgcv; - + /* Get the background color of the face. */ XGetGCValues (s->display, s->gc, GCBackground, &xgcv); color = xgcv.background; @@ -4213,7 +4213,7 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width, { int i; GC gc; - + if (raised_p) gc = f->output_data.mac->white_relief.gc; else @@ -4239,13 +4239,13 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width, gc = f->output_data.mac->white_relief.gc; mac_set_clip_rectangle (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), clip_rect); - + /* Bottom. */ for (i = 0; i < width; ++i) XDrawLine (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), gc, left_x + i * left_p, bottom_y - i, right_x + 1 - i * right_p, bottom_y - i); - + /* Right. */ if (right_p) for (i = 0; i < width; ++i) @@ -4271,10 +4271,10 @@ x_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, Rect *clip_rect; { XGCValues xgcv; - + xgcv.foreground = s->face->box_color; mac_set_clip_rectangle (s->display, s->window, clip_rect); - + /* Top. */ XFillRectangle (s->display, s->window, &xgcv, left_x, top_y, right_x - left_x, width); @@ -4287,7 +4287,7 @@ x_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, /* Bottom. */ XFillRectangle (s->display, s->window, &xgcv, left_x, bottom_y - width, right_x - left_x, width); - + /* Right. */ if (right_p) XFillRectangle (s->display, s->window, &xgcv, @@ -4316,7 +4316,7 @@ x_draw_glyph_string_box (s) if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (s->f)) last_x += FRAME_SCROLL_BAR_WIDTH (s->f) * CANON_X_UNIT (s->f); } - + /* The glyph that may have a right box line. */ last_glyph = (s->cmp || s->img ? s->first_glyph @@ -4339,7 +4339,7 @@ x_draw_glyph_string_box (s) || (s->hl == DRAW_MOUSE_FACE && (s->next == NULL || s->next->hl != s->hl))); - + x_get_glyph_string_clip_rect (s, &clip_rect); if (s->face->box == FACE_SIMPLE_BOX) @@ -4396,7 +4396,7 @@ x_draw_image_foreground (s) xgcv.clip_y_origin = y; xgcv.function = GXcopy; XChangeGC (s->display, s->gc, mask, &xgcv); - + x_get_glyph_string_clip_rect (s, &clip_rect); image_rect.x = x; image_rect.y = y; @@ -4411,7 +4411,7 @@ x_draw_image_foreground (s) { mac_copy_area (s->display, s->img->pixmap, s->window, s->gc, 0, 0, s->img->width, s->img->height, x, y); - + /* When the image has a mask, we can expect that at least part of a mouse highlight or a block cursor will be visible. If the image doesn't have a mask, make @@ -4445,7 +4445,7 @@ x_draw_image_relief (s) Rect r; int x; int y = s->ybase - image_ascent (s->img, s->face); - + /* If first glyph of S has a left box line, start drawing it to the right of that line. */ if (s->face->box != FACE_NO_BOX @@ -4453,12 +4453,12 @@ x_draw_image_relief (s) x = s->x + abs (s->face->box_line_width); else x = s->x; - + /* If there is a margin around the image, adjust x- and y-position by that margin. */ x += s->img->hmargin; y += s->img->vmargin; - + if (s->hl == DRAW_IMAGE_SUNKEN || s->hl == DRAW_IMAGE_RAISED) { @@ -4470,12 +4470,12 @@ x_draw_image_relief (s) thick = abs (s->img->relief); raised_p = s->img->relief > 0; } - + x0 = x - thick; y0 = y - thick; x1 = x + s->img->width + thick - 1; y1 = y + s->img->height + thick - 1; - + x_setup_relief_colors (s); x_get_glyph_string_clip_rect (s, &r); x_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p, 1, 1, &r); @@ -4534,7 +4534,7 @@ x_draw_image_foreground_1 (s, pixmap) { mac_copy_area_to_pixmap (s->display, s->img->pixmap, pixmap, s->gc, 0, 0, s->img->width, s->img->height, x, y); - + /* When the image has a mask, we can expect that at least part of a mouse highlight or a block cursor will be visible. If the image doesn't have a mask, make @@ -4579,7 +4579,7 @@ x_draw_glyph_string_bg_rect (s, x, y, w, h) } -/* Draw image glyph string S. +/* Draw image glyph string S. s->y s->x +------------------------- @@ -4622,7 +4622,7 @@ x_draw_image_glyph_string (s) x = s->x + box_line_hwidth; else x = s->x; - + y = s->y + box_line_vwidth; #if 0 /* TODO: image mask */ if (s->img->mask) @@ -4637,7 +4637,7 @@ x_draw_image_glyph_string (s) pixmap = XCreatePixmap (s->display, s->window, s->background_width, s->height, depth); - + /* Don't clip in the following because we're working on the pixmap. */ XSetClipMask (s->display, s->gc, None); @@ -4665,7 +4665,7 @@ x_draw_image_glyph_string (s) else #endif x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height); - + s->background_filled_p = 1; } @@ -4725,7 +4725,7 @@ x_draw_stretch_glyph_string (s) } else gc = s->face->gc; - + x_get_glyph_string_clip_rect (s, &r); mac_set_clip_rectangle (s->display, s->window, &r); @@ -4753,7 +4753,7 @@ x_draw_stretch_glyph_string (s) else if (!s->background_filled_p) x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width, s->height); - + s->background_filled_p = 1; } @@ -4835,7 +4835,7 @@ x_draw_glyph_string (s) { unsigned long h = 1; unsigned long dy = s->height - h; - + if (s->face->underline_defaulted_p) XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy, s->width, h); @@ -4868,7 +4868,7 @@ x_draw_glyph_string (s) XSetForeground (s->display, s->gc, xgcv.foreground); } } - + /* Draw strike-through. */ if (s->face->strike_through_p) { @@ -4888,7 +4888,7 @@ x_draw_glyph_string (s) XSetForeground (s->display, s->gc, xgcv.foreground); } } - + /* Draw relief. */ if (!relief_drawn_p && s->face->box != FACE_NO_BOX) x_draw_glyph_string_box (s); @@ -4904,7 +4904,7 @@ static int x_fill_composite_glyph_string P_ ((struct glyph_string *, /* Fill glyph string S with composition components specified by S->cmp. - + FACES is an array of faces for all components of this composition. S->gidx is the index of the first component for S. OVERLAPS_P non-zero means S should draw the foreground only, and @@ -4952,7 +4952,7 @@ x_fill_composite_glyph_string (s, faces, overlaps_p) /* Adjust base line for subscript/superscript text. */ s->ybase += s->first_glyph->voffset; - + xassert (s->face && s->face->gc); /* This glyph string must always be drawn with 16-bit functions. */ @@ -4963,7 +4963,7 @@ x_fill_composite_glyph_string (s, faces, overlaps_p) /* Fill glyph string S from a sequence of character glyphs. - + FACE_ID is the face id of the string. START is the index of the first glyph to consider, END is the index of the last + 1. OVERLAPS_P non-zero means S should draw the foreground only, and @@ -5013,7 +5013,7 @@ x_fill_glyph_string (s, face_id, start, end, overlaps_p) s->font = s->face->font; s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id); - + /* If the specified font could not be loaded, use the frame's font, but record the fact that we couldn't load it in S->font_not_found_p so that we can draw rectangles for the @@ -5026,7 +5026,7 @@ x_fill_glyph_string (s, face_id, start, end, overlaps_p) /* Adjust base line for subscript/superscript text. */ s->ybase += voffset; - + xassert (s->face && s->face->gc); return glyph - s->row->glyphs[s->area]; } @@ -5044,7 +5044,7 @@ x_fill_image_glyph_string (s) s->face = FACE_FROM_ID (s->f, s->first_glyph->face_id); s->font = s->face->font; s->width = s->first_glyph->pixel_width; - + /* Adjust base line for subscript/superscript text. */ s->ybase += s->first_glyph->voffset; } @@ -5067,9 +5067,9 @@ x_fill_stretch_glyph_string (s, row, area, start, end) { struct glyph *glyph, *last; int voffset, face_id; - + xassert (s->first_glyph->type == STRETCH_GLYPH); - + glyph = s->row->glyphs[s->area] + start; last = s->row->glyphs[s->area] + end; face_id = glyph->face_id; @@ -5086,7 +5086,7 @@ x_fill_stretch_glyph_string (s, row, area, start, end) && glyph->face_id == face_id); ++glyph) s->width += glyph->pixel_width; - + /* Adjust base line for subscript/superscript text. */ s->ybase += voffset; @@ -5102,7 +5102,7 @@ x_fill_stretch_glyph_string (s, row, area, start, end) and area within the row from which S is constructed. START is the index of the first glyph structure covered by S. HL is a face-override for drawing S. */ - + static void x_init_glyph_string (s, char2b, w, row, area, start, hl) struct glyph_string *s; @@ -5129,7 +5129,7 @@ x_init_glyph_string (s, char2b, w, row, area, start, hl) /* Display the internal border below the tool-bar window. */ if (s->w == XWINDOW (s->f->tool_bar_window)) s->y -= s->f->output_data.mac->internal_border_width; - + s->ybase = s->y + row->ascent; } @@ -5147,7 +5147,7 @@ x_set_glyph_string_background_width (s, start, last_x) /* If the face of this glyph string has to be drawn to the end of the drawing area, set S->extends_to_end_of_line_p. */ struct face *default_face = FACE_FROM_ID (s->f, DEFAULT_FACE_ID); - + if (start == s->row->used[s->area] && s->area == TEXT_AREA && ((s->hl == DRAW_NORMAL_TEXT @@ -5159,7 +5159,7 @@ x_set_glyph_string_background_width (s, start, last_x) || ((s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN) && s->row->fill_line_p))) s->extends_to_end_of_line_p = 1; - + /* If S extends its face to the end of the line, set its background_width to the distance to the right edge of the drawing area. */ @@ -5240,7 +5240,7 @@ x_set_glyph_string_background_width (s, start, last_x) OVERLAPS_P); \ } \ while (0) - + /* Add a glyph string for a composite sequence to the list of strings between HEAD and TAIL. START is the index of the first glyph in @@ -5296,7 +5296,7 @@ x_set_glyph_string_background_width (s, start, last_x) ++START; \ s = first_s; \ } while (0) - + /* Build a list of glyph strings between HEAD and TAIL for the glyphs of AREA of glyph row ROW on window W between indices START and END. @@ -5365,7 +5365,7 @@ x_set_glyph_string_background_width (s, start, last_x) and clip to the physical height of ROW. Value is the x-position reached, relative to AREA of W. */ - + static int x_draw_glyphs (w, x, row, area, start, end, hl, overlaps_p) struct window *w; @@ -5446,7 +5446,7 @@ x_draw_glyphs (w, x, row, area, start, end, hl, overlaps_p) /* Prepend glyph strings for glyphs in front of the first glyph string that are overwritten because of the first glyph string's left overhang. The background of all strings - prepended must be drawn because the first glyph string + prepended must be drawn because the first glyph string draws over it. */ i = x_left_overwritten (head); if (i >= 0) @@ -5524,10 +5524,10 @@ x_draw_glyphs (w, x, row, area, start, end, hl, overlaps_p) { int x0 = head ? head->x : x; int x1 = tail ? tail->x + tail->background_width : x; - + x0 = FRAME_TO_WINDOW_PIXEL_X (w, x0); x1 = FRAME_TO_WINDOW_PIXEL_X (w, x1); - + if (!row->full_width_p && XFASTINT (w->left_margin_width) != 0) { int left_area_width = window_box_width (w, LEFT_MARGIN_AREA); @@ -5563,9 +5563,9 @@ x_fix_overlapping_area (w, row, area) enum glyph_row_area area; { int i, x; - + BLOCK_INPUT; - + if (area == LEFT_MARGIN_AREA) x = 0; else if (area == TEXT_AREA) @@ -5597,7 +5597,7 @@ x_fix_overlapping_area (w, row, area) ++i; } } - + UNBLOCK_INPUT; } @@ -5617,7 +5617,7 @@ x_write_glyphs (start, len) xassert (updated_window && updated_row); BLOCK_INPUT; - + /* Write glyphs. */ hpos = start - updated_row->glyphs[updated_area]; @@ -5627,7 +5627,7 @@ x_write_glyphs (start, len) DRAW_NORMAL_TEXT, 0); UNBLOCK_INPUT; - + /* Advance the output cursor. */ output_cursor.hpos += len; output_cursor.x = x; @@ -5715,10 +5715,10 @@ x_clear_end_of_line (to_x) struct window *w = updated_window; int max_x, min_y, max_y; int from_x, from_y, to_y; - + xassert (updated_window && updated_row); f = XFRAME (w->frame); - + if (updated_row->full_width_p) { max_x = XFASTINT (w->width) * CANON_X_UNIT (f); @@ -5740,7 +5740,7 @@ x_clear_end_of_line (to_x) to_x = min (to_x, max_x); to_y = min (max_y, output_cursor.y + updated_row->height); - + /* Notice if the cursor will be cleared by this operation. */ if (!updated_row->full_width_p) notice_overwritten_cursor (w, updated_area, @@ -5761,11 +5761,11 @@ x_clear_end_of_line (to_x) from_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, from_x); to_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, to_x); } - + min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); from_y = WINDOW_TO_FRAME_PIXEL_Y (w, max (min_y, output_cursor.y)); to_y = WINDOW_TO_FRAME_PIXEL_Y (w, to_y); - + /* Prevent inadvertently clearing to end of the X window. */ if (to_x > from_x && to_y > from_y) { @@ -5836,7 +5836,7 @@ timeval_subtract (result, x, y) y.tv_usec -= 1000000 * nsec; y.tv_sec += nsec; } - + if (x.tv_usec - y.tv_usec > 1000000) { int nsec = (y.tv_usec - x.tv_usec) / 1000000; @@ -5888,7 +5888,7 @@ XTflash (f) select (0, NULL, NULL, NULL, &timeout); } } - + FlashMenuBar (0); UNBLOCK_INPUT; @@ -5903,7 +5903,7 @@ void XTring_bell () { struct frame *f = SELECTED_FRAME (); - + #if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT) if (visible_bell) XTflash (f); @@ -5989,7 +5989,7 @@ x_scroll_run (w, run) } BLOCK_INPUT; - + /* Cursor off. Will be switched on again in x_update_window_end. */ updated_window = w; x_clear_cursor (w); @@ -5999,7 +5999,7 @@ x_scroll_run (w, run) x, from_y, width, height, x, to_y); - + UNBLOCK_INPUT; } @@ -6008,7 +6008,7 @@ x_scroll_run (w, run) /*********************************************************************** Exposure Events ***********************************************************************/ - + /* Redisplay an exposed area of frame F. X and Y are the upper-left corner of the exposed rectangle. W and H are width and height of the exposed area. All are pixel values. W or H zero means redraw @@ -6167,7 +6167,7 @@ expose_area (w, row, r, area) x += first->pixel_width; ++first; } - + /* Find the last one. */ last = first; first_x = x; @@ -6199,7 +6199,7 @@ expose_line (w, row, r) Rect *r; { xassert (row->enabled_p); - + if (row->mode_line_p || w->pseudo_window_p) x_draw_glyphs (w, 0, row, TEXT_AREA, 0, row->used[TEXT_AREA], DRAW_NORMAL_TEXT, 0); @@ -6257,18 +6257,18 @@ expose_overlaps (w, first_overlapping_row, last_overlapping_row) struct glyph_row *last_overlapping_row; { struct glyph_row *row; - + for (row = first_overlapping_row; row <= last_overlapping_row; ++row) if (row->overlapping_p) { xassert (row->enabled_p && !row->mode_line_p); - + if (row->used[LEFT_MARGIN_AREA]) x_fix_overlapping_area (w, row, LEFT_MARGIN_AREA); - + if (row->used[TEXT_AREA]) x_fix_overlapping_area (w, row, TEXT_AREA); - + if (row->used[RIGHT_MARGIN_AREA]) x_fix_overlapping_area (w, row, RIGHT_MARGIN_AREA); } @@ -6317,7 +6317,7 @@ expose_window (w, fr) struct glyph_row *row; int cursor_cleared_p; struct glyph_row *first_overlapping_row, *last_overlapping_row; - + TRACE ((stderr, "expose_window (%d, %d, %d, %d)\n", r.left, r.top, r.right, r.bottom)); @@ -6357,11 +6357,11 @@ expose_window (w, fr) first_overlapping_row = row; last_overlapping_row = row; } - + if (expose_line (w, row, &r)) mouse_face_overwritten_p = 1; } - + if (y1 >= yb) break; } @@ -6381,10 +6381,10 @@ expose_window (w, fr) /* Fix the display of overlapping rows. */ if (first_overlapping_row) expose_overlaps (w, first_overlapping_row, last_overlapping_row); - + /* Draw border between windows. */ x_draw_vertical_border (w); - + /* Turn the cursor on again. */ if (cursor_cleared_p) x_update_window_cursor (w, 1); @@ -6410,7 +6410,7 @@ x_intersect_rectangles (r1, r2, result) Rect *left, *right; Rect *upper, *lower; int intersection_p = 0; - + /* Rerrange so that R1 is the left-most rectangle. */ if (r1->left < r2->left) left = r1, right = r2; @@ -6422,7 +6422,7 @@ x_intersect_rectangles (r1, r2, result) if (right->left <= left->right) { result->left = right->left; - + /* The right end of the intersection is the minimum of the the right ends of left and right. */ result->right = min (left->right, right->right); @@ -6438,7 +6438,7 @@ x_intersect_rectangles (r1, r2, result) if (lower->top <= upper->bottom) { result->top = lower->top; - + /* The lower end of the intersection is the minimum of the lower ends of upper and lower. */ result->bottom = min (lower->bottom, upper->bottom); @@ -6989,7 +6989,7 @@ x_y_to_hpos_vpos (w, x, y, hpos, vpos, area, buffer_only_p) else if (!buffer_only_p || BUFFERP (glyph->object)) break; } - + x0 += glyph->pixel_width; ++glyph; } @@ -7052,13 +7052,13 @@ note_mode_line_highlight (w, x, mode_line_p) struct glyph *glyph, *end; Lisp_Object help, map; int x0; - + /* Find the glyph under X. */ glyph = row->glyphs[TEXT_AREA]; end = glyph + row->used[TEXT_AREA]; x0 = - (FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f) + FRAME_X_LEFT_FRINGE_WIDTH (f)); - + while (glyph < end && x >= x0 + glyph->pixel_width) { @@ -7418,7 +7418,7 @@ note_mouse_highlight (f, x, y) the text ``under'' it might have. */ struct glyph_row *r = MATRIX_ROW (w->current_matrix, vpos); int start = MATRIX_ROW_START_CHARPOS (r); - + pos = string_buffer_position (w, object, start); if (pos > 0) mouse_face = get_char_property_and_overlay (make_number (pos), @@ -7442,7 +7442,7 @@ note_mouse_highlight (f, x, y) &dpyinfo->mouse_face_beg_x, &dpyinfo->mouse_face_beg_y, object); - + dpyinfo->mouse_face_past_end = !fast_find_position (w, XFASTINT (after), &dpyinfo->mouse_face_end_col, @@ -7474,7 +7474,7 @@ note_mouse_highlight (f, x, y) for (i = noverlays - 1; i >= 0 && NILP (help); --i) { overlay = overlay_vec[i]; - help = Foverlay_get (overlay, Qhelp_echo); + help = Foverlay_get (overlay, Qhelp_echo); } if (!NILP (help)) @@ -7521,7 +7521,7 @@ note_mouse_highlight (f, x, y) && charpos < ZV) help = Fget_text_property (make_number (charpos), Qhelp_echo, object); - + if (!NILP (help)) { help_echo = help; @@ -7608,7 +7608,7 @@ x_tool_bar_item (f, x, y, glyph, hpos, vpos, prop_idx) || *hpos < dpyinfo->mouse_face_end_col || dpyinfo->mouse_face_past_end)) return 0; - + return 1; } @@ -7629,7 +7629,7 @@ x_handle_tool_bar_click (f, button_event) Lisp_Object enabled_p; int x = button_event->where.h; int y = button_event->where.v; - + /* If not on the highlighted tool-bar item, return. */ frame_to_window_pixel_xy (w, &x, &y); if (x_tool_bar_item (f, x, y, &glyph, &hpos, &vpos, &prop_idx) != 0) @@ -7639,7 +7639,7 @@ x_handle_tool_bar_click (f, button_event) enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P); if (NILP (enabled_p)) return; - + if (button_event->what == mouseDown) { /* Show item in pressed state. */ @@ -7716,7 +7716,7 @@ note_tool_bar_highlight (f, x, y) goto set_help_echo; clear_mouse_face (dpyinfo); - + /* Mouse is down, but on different tool-bar item? */ mouse_down_p = (dpyinfo->grabbed && f == last_mouse_frame @@ -7727,7 +7727,7 @@ note_tool_bar_highlight (f, x, y) dpyinfo->mouse_face_image_state = DRAW_NORMAL_TEXT; draw = mouse_down_p ? DRAW_IMAGE_SUNKEN : DRAW_IMAGE_RAISED; - + /* If tool-bar item is not enabled, don't highlight it. */ enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P); if (!NILP (enabled_p)) @@ -7737,28 +7737,28 @@ note_tool_bar_highlight (f, x, y) row = MATRIX_ROW (w->current_matrix, vpos); for (i = x = 0; i < hpos; ++i) x += row->glyphs[TEXT_AREA][i].pixel_width; - + /* Record this as the current active region. */ dpyinfo->mouse_face_beg_col = hpos; dpyinfo->mouse_face_beg_row = vpos; dpyinfo->mouse_face_beg_x = x; dpyinfo->mouse_face_beg_y = row->y; dpyinfo->mouse_face_past_end = 0; - + dpyinfo->mouse_face_end_col = hpos + 1; dpyinfo->mouse_face_end_row = vpos; dpyinfo->mouse_face_end_x = x + glyph->pixel_width; dpyinfo->mouse_face_end_y = row->y; dpyinfo->mouse_face_window = window; dpyinfo->mouse_face_face_id = TOOL_BAR_FACE_ID; - + /* Display it as active. */ show_mouse_face (dpyinfo, draw); dpyinfo->mouse_face_image_state = draw; } - + set_help_echo: - + /* Set help_echo to a help string.to display for this tool-bar item. XTread_socket does the rest. */ help_echo_object = help_echo_window = Qnil; @@ -7780,7 +7780,7 @@ note_tool_bar_highlight (f, x, y) #if 0 /* This is a version of fast_find_position that's more correct in the presence of hscrolling, for example. I didn't install it right away because the problem fixed is minor, it failed - in 20.x as well, and I think it's too risky to install + in 20.x as well, and I think it's too risky to install so near the release of 21.1. 2001-09-25 gerd. */ static int @@ -7813,10 +7813,10 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop) *x = row->x; *y = row->y; *vpos = MATRIX_ROW_VPOS (row, w->current_matrix); - + glyph = row->glyphs[TEXT_AREA]; end = glyph + row->used[TEXT_AREA]; - + /* Skip over glyphs not having an object at the start of the row. These are special glyphs like truncation marks on terminal frames. */ @@ -8018,7 +8018,7 @@ fast_find_string_pos (w, pos, object, hpos, vpos, x, y, right_p) *x += best_glyph->pixel_width; ++*hpos; } - + *y = best_row->y; *vpos = best_row - w->current_matrix->rows; } @@ -8037,7 +8037,7 @@ show_mouse_face (dpyinfo, draw) { struct window *w = XWINDOW (dpyinfo->mouse_face_window); struct frame *f = XFRAME (WINDOW_FRAME (w)); - + if (/* If window is in the process of being destroyed, don't bother to do anything. */ w->current_matrix != NULL @@ -8052,7 +8052,7 @@ show_mouse_face (dpyinfo, draw) first = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_beg_row); last = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_end_row); - + for (row = first; row <= last && row->enabled_p; ++row) { int start_hpos, end_hpos, start_x; @@ -8076,7 +8076,7 @@ show_mouse_face (dpyinfo, draw) if (end_hpos > start_hpos) { - x_draw_glyphs (w, start_x, row, TEXT_AREA, + x_draw_glyphs (w, start_x, row, TEXT_AREA, start_hpos, end_hpos, draw, 0); row->mouse_face_p @@ -8307,7 +8307,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time) Lisp_Object frame, tail; if (is_emacs_window(wp)) - f = ((mac_output *) GetWRefCon (wp))->mFP; + f = ((mac_output *) GetWRefCon (wp))->mFP; BLOCK_INPUT; @@ -8339,7 +8339,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time) XSETINT (*y, mouse_pos.v); *time = last_mouse_movement_time; } - + UNBLOCK_INPUT; } @@ -8347,7 +8347,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time) /************************************************************************ Scroll bars, general ************************************************************************/ - + /* Create a scroll bar and return the scroll bar vector for it. W is the Emacs window on which to create the scroll bar. TOP, LEFT, WIDTH and HEIGHT are the pixel coordinates and dimensions of the @@ -8370,7 +8370,7 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height) r.top = disp_top; r.right = left + width; r.bottom = disp_top + disp_height; - + #ifdef TARGET_API_MAC_CARBON ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", 1, 0, 0, 0, kControlScrollBarProc, 0L); @@ -8403,7 +8403,7 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height) /* Draw BAR's handle in the proper position. - + If the handle is already drawn from START to END, don't bother redrawing it, unless REBUILD is non-zero; in that case, always redraw it. (REBUILD is handy for drawing the handle after expose @@ -8442,7 +8442,7 @@ x_scroll_bar_set_handle (bar, start, end, rebuild) else if (start > top_range) start = top_range; end = start + length; - + if (end < start) end = start; else if (end > top_range && ! dragging) @@ -8536,10 +8536,10 @@ XTset_vertical_scroll_bar (w, portion, whole, position) /* Compute the left edge of the scroll bar. */ if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) - sb_left = left + width - sb_width - (width - sb_width) / 2; + sb_left = left + width - sb_width - (width - sb_width) / 2; else sb_left = left + (width - sb_width) / 2; - + /* Adjustments according to Inside Macintosh to make it look nice */ disp_top = top; disp_height = height; @@ -8553,10 +8553,10 @@ XTset_vertical_scroll_bar (w, portion, whole, position) disp_top++; disp_height--; } - + if (sb_left + sb_width == PIXEL_WIDTH (f)) sb_left++; - + /* Does the scroll bar exist yet? */ if (NILP (w->vertical_scroll_bar)) { @@ -8572,7 +8572,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position) { /* It may just need to be moved and resized. */ ControlHandle ch; - + bar = XSCROLL_BAR (w->vertical_scroll_bar); ch = SCROLL_BAR_CONTROL_HANDLE (bar); @@ -8605,7 +8605,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position) SizeControl (ch, sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, disp_height); ShowControl (ch); - + /* Remember new settings. */ XSETINT (bar->left, sb_left); XSETINT (bar->top, top); @@ -8749,7 +8749,7 @@ activate_scroll_bars (frame) { Lisp_Object bar; ControlHandle ch; - + bar = FRAME_SCROLL_BARS (frame); while (! NILP (bar)) { @@ -8773,7 +8773,7 @@ deactivate_scroll_bars (frame) { Lisp_Object bar; ControlHandle ch; - + bar = FRAME_SCROLL_BARS (frame); while (! NILP (bar)) { @@ -8782,7 +8782,7 @@ deactivate_scroll_bars (frame) DeactivateControl (ch); #else SetControlMaximum (ch, XINT (-1)); -#endif +#endif bar = XSCROLL_BAR (bar)->next; } } @@ -8808,7 +8808,7 @@ x_scroll_bar_handle_click (bar, part_code, er, bufp) bufp->arg = Qnil; bar->dragging = Qnil; - + switch (part_code) { case kControlUpButtonPart: @@ -9034,7 +9034,7 @@ x_draw_hollow_cursor (w, row) if (cursor_glyph->type == STRETCH_GLYPH && !x_stretch_cursor_p) wd = min (CANON_X_UNIT (f), wd); - + /* The foreground of cursor_gc is typically the same as the normal background color, which can cause the cursor box to be invisible. */ xgcv.foreground = f->output_data.mac->cursor_pixel; @@ -9078,7 +9078,7 @@ x_draw_bar_cursor (w, row, width) XGCValues xgcv; Display *dpy; Window window; - + cursor_glyph = get_phys_cursor_glyph (w); if (cursor_glyph == NULL) return; @@ -9089,7 +9089,7 @@ x_draw_bar_cursor (w, row, width) dpy = FRAME_MAC_DISPLAY (f); window = FRAME_MAC_WINDOW (f); gc = FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc; - + if (gc) XChangeGC (dpy, gc, mask, &xgcv); else @@ -9183,7 +9183,7 @@ x_erase_phys_cursor (w) screen. */ if (w->phys_cursor_type == NO_CURSOR) goto mark_cursor_off; - + /* VPOS >= active_glyphs->nrows means that window has been resized. Don't bother to erase the cursor. */ if (vpos >= active_glyphs->nrows) @@ -9194,13 +9194,13 @@ x_erase_phys_cursor (w) cursor_row = MATRIX_ROW (active_glyphs, vpos); if (!cursor_row->enabled_p) goto mark_cursor_off; - + /* If row is completely invisible, don't attempt to delete a cursor which isn't there. This may happen if cursor is at top of window, and we switch to a buffer with a header line in that window. */ if (cursor_row->visible_height <= 0) goto mark_cursor_off; - + /* This can happen when the new row is shorter than the old one. In this case, either x_draw_glyphs or clear_end_of_line should have cleared the cursor. Note that we wouldn't be @@ -9208,7 +9208,7 @@ x_erase_phys_cursor (w) cursor glyph at hand. */ if (w->phys_cursor.hpos >= cursor_row->used[TEXT_AREA]) goto mark_cursor_off; - + /* If the cursor is in the mouse face area, redisplay that when we clear the cursor. */ if (! NILP (dpyinfo->mouse_face_window) @@ -9236,7 +9236,7 @@ x_erase_phys_cursor (w) goto mark_cursor_off; x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x), - + XClearArea (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), x, WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, @@ -9245,7 +9245,7 @@ x_erase_phys_cursor (w) cursor_row->visible_height, 0); } - + /* Erase the cursor by redrawing the character underneath it. */ if (mouse_face_here_p) hl = DRAW_MOUSE_FACE; @@ -9268,7 +9268,7 @@ cursor_in_mouse_face_p (w) struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (XFRAME (w->frame)); int in_mouse_face = 0; - + if (WINDOWP (dpyinfo->mouse_face_window) && XWINDOW (dpyinfo->mouse_face_window) == w) { @@ -9323,8 +9323,8 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y) current_glyphs = w->current_matrix; glyph_row = MATRIX_ROW (current_glyphs, vpos); glyph = glyph_row->glyphs[TEXT_AREA] + hpos; - - /* If cursor row is not enabled, we don't really know where to + + /* If cursor row is not enabled, we don't really know where to display the cursor. */ if (!glyph_row->enabled_p) { @@ -9356,7 +9356,7 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y) { w->phys_cursor_ascent = glyph_row->ascent; w->phys_cursor_height = glyph_row->height; - + /* Set phys_cursor_.* before x_draw_.* is called because some of them may need the information. */ w->phys_cursor.x = x; @@ -9760,7 +9760,7 @@ x_calc_absolute_position (f) #if TARGET_API_MAC_CARBON { Rect r; - + GetWindowPortBounds (FRAME_MAC_WINDOW (f), &r); SetPt(&pt, r.left, r.top); } @@ -9841,9 +9841,9 @@ x_set_window_size (f, change_gravity, cols, rows) int cols, rows; { int pixelwidth, pixelheight; - + BLOCK_INPUT; - + check_frame_size (f, &rows, &cols); f->output_data.mac->vertical_scroll_bar_extra = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f) @@ -9864,7 +9864,7 @@ x_set_window_size (f, change_gravity, cols, rows) but the window manager will get around to dealing with the size change request eventually, and we'll hear how it went when the ConfigureNotify event gets here. - + We could just not bother storing any of this information here, and let the ConfigureNotify event set everything up, but that might be kind of confusing to the Lisp code, since size changes @@ -9889,7 +9889,7 @@ x_set_window_size (f, change_gravity, cols, rows) mark_window_cursors_off (XWINDOW (f->root_window)); /* Clear out any recollection of where the mouse highlighting was, - since it might be in a place that's outside the new frame size. + since it might be in a place that's outside the new frame size. Actually checking whether it is outside is a pain in the neck, so don't try--just let the highlighting be done afresh with new size. */ cancel_mouse_face (f); @@ -10018,7 +10018,7 @@ x_make_frame_visible (f) f->output_data.mac->top_pos, 0); f->output_data.mac->asked_for_visible = 1; - + ShowWindow (FRAME_MAC_WINDOW (f)); } @@ -10082,11 +10082,11 @@ x_make_frame_invisible (f) /* Don't keep the highlight on an invisible frame. */ if (FRAME_MAC_DISPLAY_INFO (f)->x_highlight_frame == f) FRAME_MAC_DISPLAY_INFO (f)->x_highlight_frame = 0; - + BLOCK_INPUT; - + HideWindow (FRAME_MAC_WINDOW (f)); - + /* We can't distinguish this from iconification just by the event that we get from the server. So we can't win using the usual strategy of letting @@ -10096,7 +10096,7 @@ x_make_frame_invisible (f) FRAME_ICONIFIED_P (f) = 0; f->async_visible = 0; f->async_iconified = 0; - + UNBLOCK_INPUT; } @@ -10119,7 +10119,7 @@ x_iconify_frame (f) BLOCK_INPUT; CollapseWindow (FRAME_MAC_WINDOW (f), true); - + UNBLOCK_INPUT; } @@ -10380,7 +10380,7 @@ x_wm_set_icon_pixmap (f, pixmap_id) } #else /* not USE_X_TOOLKIT */ - + f->output_data.x->wm_hints.flags |= IconPixmapHint; XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); @@ -10450,7 +10450,7 @@ wildstrieq (char *s1, char *s2) } /* Assume parameter 1 is fully qualified, no wildcards. */ -static int +static int mac_font_pattern_match (fontname, pattern) char * fontname; char * pattern; @@ -10487,7 +10487,7 @@ mac_font_pattern_match (fontname, pattern) /* Two font specs are considered to match if their foundry, family, weight, slant, and charset match. */ -static int +static int mac_font_match (char *mf, char *xf) { char m_foundry[50], m_family[50], m_weight[20], m_slant[2], m_charset[20]; @@ -10543,7 +10543,7 @@ mac_to_x_fontname (char *name, int size, Style style, short scriptcode) break; case smKorean: strcpy(cs, "ksc5601.1989-0"); - break; + break; default: strcpy(cs, "mac-roman"); break; @@ -10553,14 +10553,14 @@ mac_to_x_fontname (char *name, int size, Style style, short scriptcode) sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-75-75-m-%d-%s", foundry, family, style & bold ? "bold" : "medium", style & italic ? 'i' : 'r', size, size * 10, size * 10, cs); - + result = (char *) xmalloc (strlen (xf) + 1); strcpy (result, xf); for (p = result; *p; p++) *p = tolower(*p); return result; } - + /* Convert an X font spec to the corresponding mac font name, which can then be passed to GetFNum after conversion to a Pascal string. @@ -10622,7 +10622,7 @@ init_font_name_table () { #if TARGET_API_MAC_CARBON SInt32 sv; - + if (Gestalt (gestaltSystemVersion, &sv) == noErr && sv >= 0x1000) { FMFontFamilyIterator ffi; @@ -10648,17 +10648,17 @@ init_font_name_table () FMFontStyle style; FMFontSize size; SInt16 sc; - + if (FMGetFontFamilyName (ff, name) != noErr) break; p2cstr (name); - + sc = FontToScript (ff); - + /* Point the instance iterator at the current font family. */ if (FMResetFontFamilyInstanceIterator(ff, &ffii) != noErr) break; - + while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size) == noErr) if (size == 0) @@ -10683,7 +10683,7 @@ init_font_name_table () -smJapanese)); } } - + /* Dispose of the iterators. */ FMDisposeFontFamilyIterator (&ffi); FMDisposeFontFamilyInstanceIterator (&ffii); @@ -10701,7 +10701,7 @@ init_font_name_table () Str32 name; struct FontAssoc *fat; struct AsscEntry *assc_entry; - + GetPort (&port); /* save the current font number used */ #if TARGET_API_MAC_CARBON old_fontnum = GetPortTextFont (port); @@ -10714,19 +10714,19 @@ init_font_name_table () font_handle = GetIndResource ('FOND', i); if (!font_handle) continue; - + GetResInfo (font_handle, &id, &type, name); GetFNum (name, &fontnum); p2cstr (name); if (fontnum == 0) continue; - + TextFont (fontnum); scriptcode = FontToScript (fontnum); do { HLock (font_handle); - + if (GetResourceSizeOnDisk (font_handle) >= sizeof (struct FamRec)) { @@ -10736,7 +10736,7 @@ init_font_name_table () = (struct AsscEntry *) (*font_handle + sizeof (struct FamRec) + sizeof (struct FontAssoc)); - + for (j = 0; j <= fat->numAssoc; j++, assc_entry++) { if (font_name_table_size == 0) @@ -10770,7 +10770,7 @@ init_font_name_table () } } } - + HUnlock (font_handle); font_handle_2 = GetNextFOND (font_handle); ReleaseResource (font_handle); @@ -10778,7 +10778,7 @@ init_font_name_table () } while (ResError () == noErr && font_handle); } - + TextFont (old_fontnum); #if TARGET_API_MAC_CARBON } @@ -10836,7 +10836,7 @@ x_list_fonts (struct frame *f, break; } } - + /* MAC_TODO: add code for matching outline fonts here */ UNGCPRO; @@ -10848,7 +10848,7 @@ x_list_fonts (struct frame *f, XCDR (dpyinfo->name_list_element))); } label_cached: - + return newlist; } @@ -10869,7 +10869,7 @@ x_check_font (f, font) xassert (font != NULL); for (i = 0; i < dpyinfo->n_fonts; i++) - if (dpyinfo->font_table[i].name + if (dpyinfo->font_table[i].name && font == dpyinfo->font_table[i].font) break; @@ -10913,20 +10913,20 @@ x_compute_min_glyph_bounds (f) MacFontStruct *font; int old_width = dpyinfo->smallest_char_width; int old_height = dpyinfo->smallest_font_height; - + dpyinfo->smallest_font_height = 100000; dpyinfo->smallest_char_width = 100000; - + for (i = 0; i < dpyinfo->n_fonts; ++i) if (dpyinfo->font_table[i].name) { struct font_info *fontp = dpyinfo->font_table + i; int w, h; - + font = (MacFontStruct *) fontp->font; xassert (font != (MacFontStruct *) ~0); x_font_min_bounds (font, &w, &h); - + dpyinfo->smallest_font_height = min (dpyinfo->smallest_font_height, h); dpyinfo->smallest_char_width = min (dpyinfo->smallest_char_width, w); } @@ -10951,7 +10951,7 @@ is_fully_specified_xlfd (char *p) if (*p != '-') return 0; - + for (i = 0; i < 13; i++) { q = strchr (p + 1, '-'); @@ -10964,7 +10964,7 @@ is_fully_specified_xlfd (char *p) if (strchr (p + 1, '-') != NULL) return 0; - + if (*(p + 1) == '*' && *(p + 2) == '\0') return 0; @@ -11006,7 +11006,7 @@ XLoadQueryFont (Display *dpy, char *fontname) if (i >= font_name_count) return NULL; - + name = font_name_table[i]; } @@ -11037,9 +11037,9 @@ XLoadQueryFont (Display *dpy, char *fontname) GetFNum (mfontname, &fontnum); if (fontnum == 0) return NULL; - + font = (MacFontStruct *) xmalloc (sizeof (struct MacFontStruct)); - + font->fontname = (char *) xmalloc (strlen (name) + 1); bcopy (name, font->fontname, strlen (name) + 1); @@ -11055,13 +11055,13 @@ XLoadQueryFont (Display *dpy, char *fontname) { char cs[32]; - if (sscanf (name, + if (sscanf (name, "-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", cs) == 1 - && 0 == strcmp (cs, "jisx0201.1976-0")) + && 0 == strcmp (cs, "jisx0201.1976-0")) font->mac_scriptcode = smRoman; } - + is_two_byte_font = font->mac_scriptcode == smJapanese || font->mac_scriptcode == smTradChinese || font->mac_scriptcode == smSimpChinese || @@ -11070,7 +11070,7 @@ XLoadQueryFont (Display *dpy, char *fontname) TextFont (fontnum); TextSize (size); TextFace (fontface); - + GetFontInfo (&the_fontinfo); font->ascent = the_fontinfo.ascent; @@ -11083,7 +11083,7 @@ XLoadQueryFont (Display *dpy, char *fontname) font->max_byte1 = 0; font->min_char_or_byte2 = 0x20; font->max_char_or_byte2 = 0xff; - + if (is_two_byte_font) { /* Use the width of an "ideographic space" of that font because @@ -11125,7 +11125,7 @@ XLoadQueryFont (Display *dpy, char *fontname) xmalloc (sizeof (XCharStruct) * (0xff - 0x20 + 1)); { int c; - + for (c = 0x20; c <= 0xff; c++) { font->per_char[c - 0x20] = font->max_bounds; @@ -11133,11 +11133,11 @@ XLoadQueryFont (Display *dpy, char *fontname) } } } - + TextFont (old_fontnum); /* restore previous font number, size and face */ TextSize (old_fontsize); TextFace (old_fontface); - + return font; } @@ -11531,7 +11531,7 @@ static pascal OSErr do_ae_quit_application (AppleEvent *, AppleEvent *, long); /* Drag and Drop */ static OSErr init_mac_drag_n_drop (); -static pascal OSErr mac_do_receive_drag (WindowPtr, void*, DragReference); +static pascal OSErr mac_do_receive_drag (WindowPtr, void*, DragReference); #if USE_CARBON_EVENTS /* Preliminary Support for the OSX Services Menu */ @@ -11546,7 +11546,7 @@ extern void check_alarm (); extern void initialize_applescript(); extern void terminate_applescript(); -static unsigned int +static unsigned int #if USE_CARBON_EVENTS mac_to_emacs_modifiers (UInt32 mods) #else @@ -11568,8 +11568,8 @@ mac_to_emacs_modifiers (EventModifiers mods) #if USE_CARBON_EVENTS /* Obtains the event modifiers from the event ref and then calls mac_to_emacs_modifiers. */ -static int -mac_event_to_emacs_modifiers (EventRef eventRef) +static int +mac_event_to_emacs_modifiers (EventRef eventRef) { UInt32 mods = 0; GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, NULL, @@ -11580,20 +11580,20 @@ mac_event_to_emacs_modifiers (EventRef eventRef) /* Given an event ref, return the code to use for the mouse button code in the emacs input_event. */ static int -mac_get_mouse_btn (EventRef ref) +mac_get_mouse_btn (EventRef ref) { EventMouseButton result = kEventMouseButtonPrimary; GetEventParameter (ref, kEventParamMouseButton, typeMouseButton, NULL, sizeof (EventMouseButton), NULL, &result); - switch (result) + switch (result) { case kEventMouseButtonPrimary: return 0; case kEventMouseButtonSecondary: - return NILP (Vmac_wheel_button_is_mouse_2) ? 1 : 2; + return NILP (Vmac_wheel_button_is_mouse_2) ? 1 : 2; case kEventMouseButtonTertiary: case 4: /* 4 is the number for the mouse wheel button */ - return NILP (Vmac_wheel_button_is_mouse_2) ? 2 : 1; + return NILP (Vmac_wheel_button_is_mouse_2) ? 2 : 1; default: return 0; } @@ -11605,24 +11605,24 @@ mac_get_mouse_btn (EventRef ref) checks to see if it is a mouse up or down carbon event that has not been converted, and if so, converts it by hand (to be picked up in the XTread_socket loop). */ -static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec) +static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec) { Boolean result = ConvertEventRefToEventRecord (eventRef, eventRec); /* Do special case for mouse wheel button. */ - if (!result && GetEventClass (eventRef) == kEventClassMouse) - { + if (!result && GetEventClass (eventRef) == kEventClassMouse) + { UInt32 kind = GetEventKind (eventRef); - if (kind == kEventMouseDown && !(eventRec->what == mouseDown)) + if (kind == kEventMouseDown && !(eventRec->what == mouseDown)) { eventRec->what = mouseDown; result=1; } - if (kind == kEventMouseUp && !(eventRec->what == mouseUp)) + if (kind == kEventMouseUp && !(eventRec->what == mouseUp)) { eventRec->what = mouseUp; result=1; } - if (result) + if (result) { /* Need where and when. */ UInt32 mods; @@ -11636,7 +11636,7 @@ static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec) typeUInt32, NULL, sizeof (UInt32), NULL, &mods); eventRec->modifiers = mods; - + eventRec->when = EventTimeToTicks (GetEventTime (eventRef)); } } @@ -11650,7 +11650,7 @@ do_get_menus (void) { Handle menubar_handle; MenuHandle menu_handle; - + menubar_handle = GetNewMBar (128); if(menubar_handle == NULL) abort (); @@ -11678,7 +11678,7 @@ do_init_managers (void) InitDialogs (NULL); #endif /* !TARGET_API_MAC_CARBON */ InitCursor (); - + #if !TARGET_API_MAC_CARBON /* set up some extra stack space for use by emacs */ SetApplLimit ((Ptr) ((long) GetApplLimit () - EXTRA_STACK_ALLOC)); @@ -11694,7 +11694,7 @@ static void do_check_ram_size (void) { SInt32 physical_ram_size, logical_ram_size; - + if (Gestalt (gestaltPhysicalRAMSize, &physical_ram_size) != noErr || Gestalt (gestaltLogicalRAMSize, &logical_ram_size) != noErr || physical_ram_size > 256 * 1024 * 1024 @@ -11718,7 +11718,7 @@ do_window_update (WindowPtr win) f->async_visible = 1; f->async_iconified = 0; SET_FRAME_GARBAGED (f); - + /* An update event is equivalent to MapNotify on X, so report visibility changes properly. */ if (! NILP(Vframe_list) && ! NILP (XCDR (Vframe_list))) @@ -11767,7 +11767,7 @@ do_window_activate (WindowPtr win) { mwp = (mac_output *) GetWRefCon (win); f = mwp->mFP; - + if (f) { x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), f); @@ -11786,7 +11786,7 @@ do_window_deactivate (WindowPtr win) { mwp = (mac_output *) GetWRefCon (win); f = mwp->mFP; - + if (f == FRAME_MAC_DISPLAY_INFO (f)->x_focus_frame) { x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), 0); @@ -11850,10 +11850,10 @@ do_mouse_moved (Point mouse_pos) WindowPtr wp = FrontWindow (); struct frame *f; - if (is_emacs_window (wp)) + if (is_emacs_window (wp)) { - f = ((mac_output *) GetWRefCon (wp))->mFP; - + f = ((mac_output *) GetWRefCon (wp))->mFP; + #if TARGET_API_MAC_CARBON SetPort (GetWindowPort (wp)); #else @@ -11861,7 +11861,7 @@ do_mouse_moved (Point mouse_pos) #endif GlobalToLocal (&mouse_pos); - + note_mouse_movement (f, &mouse_pos); } } @@ -11878,7 +11878,7 @@ do_os_event (EventRecord *erp) else do_app_suspend (); break; - + case mouseMovedMessage: do_mouse_moved (erp->where); break; @@ -11913,7 +11913,7 @@ do_apple_menu (SInt16 menu_item) #if !TARGET_API_MAC_CARBON Str255 item_name; SInt16 da_driver_refnum; - + if (menu_item == I_ABOUT) NoteAlert (ABOUT_ALERT_ID, NULL); else @@ -11928,13 +11928,13 @@ void do_menu_choice (SInt32 menu_choice) { SInt16 menu_id, menu_item; - + menu_id = HiWord (menu_choice); menu_item = LoWord (menu_choice); - + if (menu_id == 0) return; - + switch (menu_id) { case M_APPLE: @@ -11944,18 +11944,18 @@ do_menu_choice (SInt32 menu_choice) default: { WindowPtr wp = FrontWindow (); - struct frame *f = ((mac_output *) GetWRefCon (wp))->mFP; + struct frame *f = ((mac_output *) GetWRefCon (wp))->mFP; MenuHandle menu = GetMenuHandle (menu_id); if (menu) { UInt32 refcon; - + GetMenuItemRefCon (menu, menu_item, &refcon); menubar_selection_callback (f, refcon); } } } - + HiliteMenu (0); } @@ -11971,17 +11971,17 @@ do_grow_window (WindowPtr w, EventRecord *e) int rows, columns; mac_output *mwp = (mac_output *) GetWRefCon (w); struct frame *f = mwp->mFP; - + SetRect(&limit_rect, MIN_DOC_SIZE, MIN_DOC_SIZE, MAX_DOC_SIZE, MAX_DOC_SIZE); - + grow_size = GrowWindow (w, e->where, &limit_rect); - + /* see if it really changed size */ if (grow_size != 0) { rows = PIXEL_TO_CHAR_HEIGHT (f, HiWord (grow_size)); columns = PIXEL_TO_CHAR_WIDTH (f, LoWord (grow_size)); - + x_set_window_size (f, 0, columns, rows); } } @@ -12001,7 +12001,7 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out) int w_title_height, columns, rows, width, height, dummy, x, y; mac_output *mwp = (mac_output *) GetWRefCon (w); struct frame *f = mwp->mFP; - + GetPort (&save_port); #if TARGET_API_MAC_CARBON @@ -12015,7 +12015,7 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out) { Rect r; BitMap bm; - + GetWindowPortBounds (w, &r); EraseRect (&r); @@ -12030,7 +12030,7 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out) zoom_rect = bm.bounds; zoom_rect.top += w_title_height; InsetRect (&zoom_rect, 8, 4); /* not too tight */ - + zoom_rect.right = zoom_rect.left + CHAR_TO_PIXEL_WIDTH (f, DEFAULT_NUM_COLS); @@ -12052,7 +12052,7 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out) zoom_rect = qd.screenBits.bounds; zoom_rect.top += w_title_height; InsetRect (&zoom_rect, 8, 4); /* not too tight */ - + zoom_rect.right = zoom_rect.left + CHAR_TO_PIXEL_WIDTH (f, DEFAULT_NUM_COLS); @@ -12098,7 +12098,7 @@ init_required_apple_events () if (!(result & (1 << gestaltAppleEventsPresent))) abort (); - + #if TARGET_API_MAC_CARBON err = AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, NewAEEventHandlerUPP @@ -12175,10 +12175,10 @@ OSStatus mac_handle_service_event (EventHandlerCallRef callRef, EventRef event, void *data) { - OSStatus err = noErr; + OSStatus err = noErr; switch (GetEventKind (event)) { - case kEventServiceGetTypes: + case kEventServiceGetTypes: { CFMutableArrayRef copyTypes, pasteTypes; CFStringRef type; @@ -12214,14 +12214,14 @@ mac_handle_service_event (EventHandlerCallRef callRef, { GetEventParameter (event, kEventParamScrapRef, typeScrapRef, NULL, sizeof (ScrapRef), NULL, &specificScrap); - + err = GetScrapFlavorData (currentScrap, kScrapFlavorTypeText, &byteCount, buffer); if (err == noErr) PutScrapFlavor (specificScrap, kScrapFlavorTypeText, kScrapFlavorMaskNone, byteCount, buffer); xfree (buffer); - } + } } err = noErr; } @@ -12237,7 +12237,7 @@ mac_handle_service_event (EventHandlerCallRef callRef, if (err == noErr) { void * buffer = xmalloc(byteCount); if (buffer != NULL ) { - err = GetScrapFlavorData(specificScrap, kScrapFlavorTypeText, + err = GetScrapFlavorData(specificScrap, kScrapFlavorTypeText, &byteCount, buffer); if (err == noErr) { // Actually place in the buffer @@ -12249,7 +12249,7 @@ mac_handle_service_event (EventHandlerCallRef callRef, xfree(buffer); } */ - } + } } return err; } @@ -12271,7 +12271,7 @@ path_from_vol_dir_name (char *, int, short, long, char *); /* Called when we receive an AppleEvent with an ID of "kAEOpenDocuments". This routine gets the direct parameter, extracts the FSSpecs in it, and puts their names on a list. */ -static pascal OSErr +static pascal OSErr do_ae_open_documents(AppleEvent *message, AppleEvent *reply, long refcon) { OSErr err, err2; @@ -12287,7 +12287,7 @@ do_ae_open_documents(AppleEvent *message, AppleEvent *reply, long refcon) /* Check to see that we got all of the required parameters from the event descriptor. For an 'odoc' event this should just be the file list. */ - err = AEGetAttributePtr(message, keyMissedKeywordAttr, typeWildCard, + err = AEGetAttributePtr(message, keyMissedKeywordAttr, typeWildCard, &actual_type, (Ptr) &keyword, sizeof (keyword), &actual_size); /* No error means that we found some unused parameters. @@ -12309,7 +12309,7 @@ do_ae_open_documents(AppleEvent *message, AppleEvent *reply, long refcon) if (err == noErr) { int i; - + /* AE file list is one based so just use that for indexing here. */ for (i = 1; (err == noErr) && (i <= num_files_to_open); i++) { @@ -12366,7 +12366,7 @@ mac_do_receive_drag (WindowPtr window, void *handlerRefCon, drag_and_drop_file_list = Qnil; GetDragMouse (theDrag, &mouse, 0L); CountDragItems (theDrag, &items); - for (index = 1; index <= items; index++) + for (index = 1; index <= items; index++) { /* Only handle file references. */ GetDragItemReferenceNumber (theDrag, index, &theItem); @@ -12398,7 +12398,7 @@ mac_do_receive_drag (WindowPtr window, void *handlerRefCon, } /* If there are items in the list, construct an event and post it to the queue like an interrupt using kbd_buffer_store_event. */ - if (!NILP (drag_and_drop_file_list)) + if (!NILP (drag_and_drop_file_list)) { struct input_event event; Lisp_Object frame; @@ -12479,7 +12479,7 @@ profiler_exit_proc () #if !TARGET_API_MAC_CARBON #undef main -int +int main (void) { #if __profile__ /* is the profiler on? */ @@ -12494,9 +12494,9 @@ main (void) #endif do_init_managers (); - + do_get_menus (); - + do_check_ram_size (); init_emacs_passwd_dir (); @@ -12506,7 +12506,7 @@ main (void) initialize_applescript (); init_required_apple_events (); - + { char **argv; int argc = 0; @@ -12544,7 +12544,7 @@ static unsigned char keycode_to_xkeysym_table[] = { /*0x38*/ 0, 0, 0, 0, /*0x3C*/ 0, 0, 0, 0, - /*0x40*/ 0, 0xae /*kp-.*/, 0, 0xaa /*kp-**/, + /*0x40*/ 0, 0xae /*kp-.*/, 0, 0xaa /*kp-**/, /*0x44*/ 0, 0xab /*kp-+*/, 0, 0x7f /*kp-clear*/, /*0x48*/ 0, 0, 0, 0xaf /*kp-/*/, /*0x4C*/ 0x8d /*kp-enter*/, 0, 0xad /*kp--*/, 0, @@ -12555,8 +12555,8 @@ static unsigned char keycode_to_xkeysym_table[] = { /*0x5C*/ 0xb9 /*kp-9*/, 0, 0, 0, /*0x60*/ 0xc2 /*f5*/, 0xc3 /*f6*/, 0xc4 /*f7*/, 0xc0 /*f3*/, - /*0x64*/ 0xc5 /*f8*/, 0xc6 /*f9*/, 0, 0xc8 /*f11*/, - /*0x68*/ 0, 0xca /*f13*/, 0, 0xcb /*f14*/, + /*0x64*/ 0xc5 /*f8*/, 0xc6 /*f9*/, 0, 0xc8 /*f11*/, + /*0x68*/ 0, 0xca /*f13*/, 0, 0xcb /*f14*/, /*0x6C*/ 0, 0xc7 /*f10*/, 0, 0xc9 /*f12*/, /*0x70*/ 0, 0xcc /*f15*/, 0x9e /*insert (or 0x6a==help)*/, 0x95 /*home*/, @@ -12577,7 +12577,7 @@ keycode_to_xkeysym (int keyCode, int *xKeySym) int XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) { - int count = 0; + int count = 0; #if USE_CARBON_EVENTS OSStatus rneResult; EventRef eventRef; @@ -12629,7 +12629,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) event_mask -= highLevelEventMask; #if USE_CARBON_EVENTS - rneResult = ReceiveNextEvent (0, NULL, + rneResult = ReceiveNextEvent (0, NULL, expected ? TicksToEventTime (app_sleep_time) : 0, @@ -12637,11 +12637,11 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) if (!rneResult) { /* Handle new events */ - if (!mac_convert_event_ref (eventRef, &er)) - switch (GetEventClass (eventRef)) + if (!mac_convert_event_ref (eventRef, &er)) + switch (GetEventClass (eventRef)) { case kEventClassMouse: - if (GetEventKind (eventRef) == kEventMouseWheelMoved) + if (GetEventKind (eventRef) == kEventMouseWheelMoved) { SInt32 delta; Point point; @@ -12671,7 +12671,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) bufp->timestamp = EventTimeToTicks (GetEventTime (eventRef))*(1000/60); count++; } - else + else SendEventToEventTarget (eventRef, GetEventDispatcherTarget ()); break; @@ -12707,7 +12707,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) { struct mac_output *mwp = (mac_output *) GetWRefCon (window_ptr); Point mouse_loc = er.where; - + /* Convert to local coordinates of new window. */ #if TARGET_API_MAC_CARBON SetPort (GetWindowPort (window_ptr)); @@ -12716,7 +12716,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) #endif GlobalToLocal (&mouse_loc); - + #if USE_CARBON_EVENTS bufp->code = mac_get_mouse_btn (eventRef); #else @@ -12736,7 +12736,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) XSETINT (bufp->x, tracked_scroll_bar->left + 2); XSETINT (bufp->y, mouse_loc.v - 24); - tracked_scroll_bar->dragging = Qnil; + tracked_scroll_bar->dragging = Qnil; mouse_tracking_in_progress = mouse_tracking_none; tracked_scroll_bar = NULL; count++; @@ -12744,7 +12744,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) } part_code = FindWindow (er.where, &window_ptr); - + switch (part_code) { case inMenuBar: @@ -12768,7 +12768,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) struct mac_output *mwp = (mac_output *) GetWRefCon (window_ptr); Point mouse_loc = er.where; - + /* convert to local coordinates of new window */ #if TARGET_API_MAC_CARBON SetPort (GetWindowPort (window_ptr)); @@ -12782,11 +12782,11 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) &control_part_code); #else control_part_code = FindControl (mouse_loc, window_ptr, &ch); -#endif +#endif #if USE_CARBON_EVENTS bufp->code = mac_get_mouse_btn (eventRef); -#else +#else bufp->code = 0; /* only one mouse button */ #endif XSETINT (bufp->x, mouse_loc.h); @@ -12794,7 +12794,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) bufp->timestamp = er.when * (1000 / 60); /* ticks to milliseconds */ -#if TARGET_API_MAC_CARBON +#if TARGET_API_MAC_CARBON if (ch != 0) #else if (control_part_code != 0) @@ -12827,7 +12827,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) else mouse_tracking_in_progress = mouse_tracking_none; } - + #if USE_CARBON_EVENTS bufp->modifiers = mac_event_to_emacs_modifiers (eventRef); #else @@ -12843,7 +12843,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) bufp->modifiers |= up_modifier; break; } - + count++; } break; @@ -12852,7 +12852,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) #if TARGET_API_MAC_CARBON { BitMap bm; - + GetQDGlobalsScreenBits (&bm); DragWindow (window_ptr, er.where, &bm.bounds); } @@ -12875,7 +12875,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) case inGrow: do_grow_window(window_ptr, &er); break; - + /* window zoom handling added --ben */ case inZoomIn: case inZoomOut: @@ -12888,22 +12888,22 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) } } break; - + case updateEvt: case osEvt: case activateEvt: #if USE_CARBON_EVENTS if (eventNotHandledErr == SendEventToEventTarget (eventRef, GetEventDispatcherTarget ())) -#endif +#endif do_events (&er); break; - + case keyDown: case autoKey: { int keycode = (er.message & keyCodeMask) >> 8; int xkeysym; - + #if USE_CARBON_EVENTS /* When using Carbon Events, we need to pass raw keyboard events to the TSM ourselves. If TSM handles it, it will pass back @@ -12921,31 +12921,31 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) break; } #endif - + if (!IsValidWindowPtr (FrontNonFloatingWindow ())) { SysBeep (1); UNBLOCK_INPUT; return 0; } - + ObscureCursor (); - + if (keycode_to_xkeysym (keycode, &xkeysym)) { bufp->code = 0xff00 | xkeysym; bufp->kind = NON_ASCII_KEYSTROKE_EVENT; - } + } else { - if (er.modifiers & (controlKey | - (NILP (Vmac_command_key_is_meta) ? optionKey + if (er.modifiers & (controlKey | + (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey))) { /* This code comes from Keyboard Resource, Appendix C of IM - Text. This is necessary since shift is ignored in KCHR table translation when option or - command is pressed. It also does not translate + command is pressed. It also does not translate correctly control-shift chars like C-% so mask off shift here also */ int new_modifiers = er.modifiers & 0xe600; @@ -12961,7 +12961,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) bufp->kind = ASCII_KEYSTROKE_EVENT; } } - + /* If variable mac-convert-keyboard-input-to-latin-1 is non-nil, convert non-ASCII characters typed at the Mac keyboard (presumed to be in the Mac Roman encoding) to iso-latin-1 @@ -12974,7 +12974,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) static TECObjectRef converter = NULL; OSStatus the_err = noErr; OSStatus convert_status = noErr; - + if (converter == NULL) { the_err = TECCreateConverter (&converter, @@ -12994,14 +12994,14 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) mac_keyboard_text_encoding); current_mac_keyboard_text_encoding = mac_keyboard_text_encoding; - } - + } + if (the_err == noErr) { unsigned char ch = bufp->code; ByteCount actual_input_length, actual_output_length; unsigned char outch; - + convert_status = TECConvertText (converter, &ch, 1, &actual_input_length, &outch, 1, @@ -13012,19 +13012,19 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) bufp->code = outch; } } - + #if USE_CARBON_EVENTS bufp->modifiers = mac_event_to_emacs_modifiers (eventRef); #else bufp->modifiers = mac_to_emacs_modifiers (er.modifiers); #endif - + { mac_output *mwp = (mac_output *) GetWRefCon (FrontNonFloatingWindow ()); XSETFRAME (bufp->frame_or_window, mwp->mFP); } - + bufp->timestamp = er.when * (1000 / 60); /* ticks to milliseconds */ count++; @@ -13034,7 +13034,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) drag_and_drop_file_list = Qnil; AEProcessAppleEvent(&er); - + /* Build a DRAG_N_DROP_EVENT type event as is done in constuct_drag_n_drop in w32term.c. */ if (!NILP (drag_and_drop_file_list)) @@ -13044,7 +13044,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) Lisp_Object frame; wp = FrontNonFloatingWindow (); - + if (!wp) { struct frame *f = XFRAME (XCAR (Vframe_list)); @@ -13053,7 +13053,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) } if (wp && is_emacs_window(wp)) - f = ((mac_output *) GetWRefCon (wp))->mFP; + f = ((mac_output *) GetWRefCon (wp))->mFP; bufp->kind = DRAG_N_DROP_EVENT; bufp->code = 0; @@ -13079,14 +13079,14 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) #if TARGET_API_MAC_CARBON { Rect r; - + GetWindowPortBounds (wp, &r); InvalWindowRect (wp, &r); } #else /* not TARGET_API_MAC_CARBON */ InvalRect (&(wp->portRect)); #endif /* not TARGET_API_MAC_CARBON */ - + count++; } default: @@ -13112,7 +13112,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) { static Point old_mouse_pos = { -1, -1 }; - + if (app_is_suspended) { old_mouse_pos.h = -1; @@ -13124,7 +13124,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) WindowPtr wp; struct frame *f; Lisp_Object bar; - struct scroll_bar *sb; + struct scroll_bar *sb; wp = FrontWindow (); if (is_emacs_window (wp)) @@ -13149,15 +13149,15 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) TickCount() * (1000 / 60)); else note_mouse_movement (f, &mouse_pos); - - old_mouse_pos = mouse_pos; + + old_mouse_pos = mouse_pos; } } } } - + UNBLOCK_INPUT; - + return count; } @@ -13206,7 +13206,7 @@ NewMacWindow (FRAME_PTR fp) else if (!(mwp->mWP = GetNewCWindow (WINDOW_RESOURCE, NULL, (WindowPtr) -1))) abort (); - + SetWRefCon (mwp->mWP, (long) mwp); /* so that update events can find this mac_output struct */ mwp->mFP = fp; /* point back to emacs frame */ @@ -13218,10 +13218,10 @@ NewMacWindow (FRAME_PTR fp) #endif mwp->fontset = -1; - + SizeWindow (mwp->mWP, mwp->pixel_width, mwp->pixel_height, false); ShowWindow (mwp->mWP); - + } @@ -13232,7 +13232,7 @@ make_mac_frame (struct frame *f) FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right; FRAME_DESIRED_CURSOR (f) = FILLED_BOX_CURSOR; - + NewMacWindow(f); f->output_data.mac->cursor_pixel = 0; @@ -13247,14 +13247,14 @@ make_mac_frame (struct frame *f) f->output_data.mac->top_pos = 4; f->output_data.mac->border_width = 0; f->output_data.mac->explicit_parent = 0; - + f->output_data.mac->internal_border_width = 0; f->output_method = output_mac; f->auto_raise = 1; f->auto_lower = 1; - + f->new_width = 0; f->new_height = 0; } @@ -13273,7 +13273,7 @@ make_mac_terminal_frame (struct frame *f) f->output_data.mac->fontset = -1; f->output_data.mac->scroll_bar_foreground_pixel = -1; f->output_data.mac->scroll_bar_background_pixel = -1; - + XSETFRAME (FRAME_KBOARD (f)->Vdefault_minibuffer_frame, f); f->width = 96; @@ -13282,7 +13282,7 @@ make_mac_terminal_frame (struct frame *f) make_mac_frame (f); x_make_gc (f); - + /* Need to be initialized for unshow_buffer in window.c. */ selected_window = f->selected_window; @@ -13384,7 +13384,7 @@ mac_initialize_display_info () x_display_name_list = Fcons (Fcons (build_string ("Mac"), Qnil), x_display_name_list); dpyinfo->name_list_element = XCAR (x_display_name_list); - + #if 0 dpyinfo->mac_id_name = (char *) xmalloc (SCHARS (Vinvocation_name) @@ -13478,7 +13478,7 @@ MakeMeTheFrontProcess () { ProcessSerialNumber psn; OSErr err; - + err = GetCurrentProcess (&psn); if (err == noErr) (void) SetFrontProcess (&psn); @@ -13512,7 +13512,7 @@ init_quit_char_handler () mac_quit_char_keycode = 5; /* Look at <architecture/adb_kb_map.h> for details */ /* http://gemma.apple.com/techpubs/mac/Toolbox/Toolbox-40.html#MARKER-9-184*/ - + mac_determine_quit_char_modifiers(); } @@ -13526,11 +13526,11 @@ quit_char_comp (EventRef inEvent, void *inCompData) { UInt32 keyCode; UInt32 keyModifiers; - GetEventParameter(inEvent, kEventParamKeyCode, + GetEventParameter(inEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode); if (keyCode != mac_quit_char_keycode) return false; - GetEventParameter(inEvent, kEventParamKeyModifiers, + GetEventParameter(inEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &keyModifiers); if (keyModifiers != mac_quit_char_modifiers) return false; @@ -13552,7 +13552,7 @@ mac_check_for_quit_char() /* Fill the queue with events */ ReceiveNextEvent (0, NULL, kEventDurationNoWait, false, &event); event = FindSpecificEventInQueue (GetMainEventQueue(), quit_char_comp, NULL); - if (event) + if (event) { struct input_event e; struct mac_output *mwp = (mac_output*) GetWRefCon (FrontNonFloatingWindow ()); @@ -13629,7 +13629,7 @@ mac_initialize () x_noop_count = 0; last_tool_bar_item = -1; any_help_event_p = 0; - + /* Try to use interrupt input; if we can't, then start polling. */ Fset_input_mode (Qt, Qnil, Qt, Qnil); @@ -13649,7 +13649,7 @@ mac_initialize () start_atimer (ATIMER_CONTINUOUS, interval, x_process_timeouts, 0); } #endif - + #if USE_TOOLKIT_SCROLL_BARS xaw3d_arrow_scroll = False; xaw3d_pick_top = True; @@ -13751,7 +13751,7 @@ to 4.1, set this to nil. */); staticpro (&last_mouse_motion_frame); last_mouse_motion_frame = Qnil; - + DEFVAR_LISP ("mac-command-key-is-meta", &Vmac_command_key_is_meta, doc: /* Non-nil means that the command key is used as the Emacs meta key. Otherwise the option key is used. */); diff --git a/src/macterm.h b/src/macterm.h index c5d3e174120..615666e0483 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -45,7 +45,7 @@ Boston, MA 02111-1307, USA. */ /* Structure recording bitmaps and reference count. If REFCOUNT is 0 then this record is free to be reused. */ -struct mac_bitmap_record +struct mac_bitmap_record { char *bitmap_data; int refcount; @@ -321,7 +321,7 @@ struct mac_output { /* Foreground color for scroll bars. A value of -1 means use the default (black for non-toolkit scroll bars). */ unsigned long scroll_bar_foreground_pixel; - + /* Background color for scroll bars. A value of -1 means use the default (background color of the frame for non-toolkit scroll bars). */ @@ -337,7 +337,7 @@ struct mac_output { /* Window whose cursor is hourglass_cursor. This window is temporarily mapped to display a hourglass-cursor. */ Window hourglass_window; - + /* Non-zero means hourglass cursor is currently displayed. */ unsigned hourglass_p : 1; @@ -558,7 +558,7 @@ struct scroll_bar { /* Return the length of the rectangle within which the top of the handle must stay. This isn't equivalent to the inside height, - because the scroll bar handle has a minimum height. + because the scroll bar handle has a minimum height. This is the real range of motion for the scroll bar, so when we're scaling buffer positions to scroll bar positions, we use this, not @@ -626,7 +626,7 @@ struct scroll_bar { + (f)->output_data.mac->internal_border_width) -/* Return the row/column (zero-based) of the character cell containing +/* Return the row/column (zero-based) of the character cell containing the pixel on FRAME at ROW/COL. */ #define PIXEL_TO_CHAR_ROW(f, row) \ (((row) - (f)->output_data.mac->internal_border_width) \ diff --git a/src/marker.c b/src/marker.c index c59f9a9ccb0..0c1635fd2cb 100644 --- a/src/marker.c +++ b/src/marker.c @@ -531,14 +531,14 @@ Returns MARKER. */) m->chain = BUF_MARKERS (b); BUF_MARKERS (b) = marker; } - + return marker; } /* This version of Fset_marker won't let the position be outside the visible part. */ -Lisp_Object +Lisp_Object set_marker_restricted (marker, pos, buffer) Lisp_Object marker, pos, buffer; { @@ -607,14 +607,14 @@ set_marker_restricted (marker, pos, buffer) m->chain = BUF_MARKERS (b); BUF_MARKERS (b) = marker; } - + return marker; } /* Set the position of MARKER, specifying both the character position and the corresponding byte position. */ -Lisp_Object +Lisp_Object set_marker_both (marker, buffer, charpos, bytepos) Lisp_Object marker, buffer; int charpos, bytepos; @@ -658,14 +658,14 @@ set_marker_both (marker, buffer, charpos, bytepos) m->chain = BUF_MARKERS (b); BUF_MARKERS (b) = marker; } - + return marker; } /* This version of set_marker_both won't let the position be outside the visible part. */ -Lisp_Object +Lisp_Object set_marker_restricted_both (marker, buffer, charpos, bytepos) Lisp_Object marker, buffer; int charpos, bytepos; @@ -718,7 +718,7 @@ set_marker_restricted_both (marker, buffer, charpos, bytepos) m->chain = BUF_MARKERS (b); BUF_MARKERS (b) = marker; } - + return marker; } diff --git a/src/msdos.c b/src/msdos.c index 6dc235e67ba..6b56cf72deb 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -4929,7 +4929,7 @@ gethostname (p, size) /* When time zones are set from Ms-Dos too many C-libraries are playing tricks with time values. We solve this by defining our own version of `gettimeofday' bypassing GO32. Our version needs to be initialized - once and after each call to `tzset' with TZ changed. That is + once and after each call to `tzset' with TZ changed. That is accomplished by aliasing tzset to init_gettimeofday. */ static struct tm time_rec; @@ -5092,7 +5092,7 @@ sigprocmask (how, new_set, old_set) #else /* not POSIX_SIGNALS */ sigsetmask (x) int x; { return 0; } -sigblock (mask) int mask; { return 0; } +sigblock (mask) int mask; { return 0; } #endif /* not POSIX_SIGNALS */ #endif /* not __DJGPP_MINOR__ < 2 */ diff --git a/src/print.c b/src/print.c index 6c85c24cbe5..151a193076d 100644 --- a/src/print.c +++ b/src/print.c @@ -189,7 +189,7 @@ void print_interval (); and must start with PRINTPREPARE, end with PRINTFINISH, and use PRINTDECLARE to declare common variables. Use PRINTCHAR to output one character, - or call strout to output a block of characters. */ + or call strout to output a block of characters. */ #define PRINTDECLARE \ struct buffer *old = current_buffer; \ @@ -321,7 +321,7 @@ printchar (ch, fun) int len = CHAR_STRING (ch, str); QUIT; - + if (NILP (fun)) { if (print_buffer_pos_byte + len >= print_buffer_size) @@ -340,7 +340,7 @@ printchar (ch, fun) { int multibyte_p = !NILP (current_buffer->enable_multibyte_characters); - + setup_echo_area_for_printing (multibyte_p); insert_char (ch); message_dolog (str, len, 0, multibyte_p); @@ -397,10 +397,10 @@ strout (ptr, size, size_byte, printcharfun, multibyte) int i; int multibyte_p = !NILP (current_buffer->enable_multibyte_characters); - + setup_echo_area_for_printing (multibyte_p); message_dolog (ptr, size_byte, 0, multibyte_p); - + if (size == size_byte) { for (i = 0; i < size; ++i) @@ -415,7 +415,7 @@ strout (ptr, size, size_byte, printcharfun, multibyte) insert_char (ch); } } - + #ifdef MAX_PRINT_CHARS if (max_print) print_chars += size; @@ -653,7 +653,7 @@ to display it temporarily selected. If variable `temp-buffer-show-function' is non-nil, call it at the end to get the buffer displayed instead of just displaying the non-selected -buffer and calling the hook. It gets one argument, the buffer to display. +buffer and calling the hook. It gets one argument, the buffer to display. usage: (with-output-to-temp-buffer BUFFNAME BODY ...) */) (args) @@ -1005,7 +1005,7 @@ print_error_message (data, stream, context, caller) else Fprin1 (obj, stream); } - + UNGCPRO; } @@ -1016,9 +1016,9 @@ print_error_message (data, stream, context, caller) * largest float, printed in the biggest notation. This is undoubtedly * 20d float_output_format, with the negative of the C-constant "HUGE" * from <math.h>. - * + * * On the vax the worst case is -1e38 in 20d format which takes 61 bytes. - * + * * I assume that IEEE-754 format numbers can take 329 bytes for the worst * case of -1e307 in 20d float_output_format. What is one to do (short of * re-writing _doprnt to be more sane)? @@ -1032,7 +1032,7 @@ float_to_string (buf, data) { unsigned char *cp; int width; - + /* Check for plus infinity in a way that won't lose if there is no plus infinity. */ if (data == data / 2 && data > 1.0) @@ -1061,7 +1061,7 @@ float_to_string (buf, data) *buf++ = '-'; break; } - + strcpy (buf, "0.0e+NaN"); return; } @@ -1598,7 +1598,7 @@ print_object (obj, printcharfun, escapeflag) else { PRINTCHAR ('('); - + /* If the first element is a backquote form, print it old-style so it won't be misunderstood. */ if (print_quoted && CONSP (XCAR (obj)) @@ -1670,18 +1670,18 @@ print_object (obj, printcharfun, escapeflag) } } } - + if (i++) PRINTCHAR (' '); - + if (print_length && i > print_length) { strout ("...", 3, 3, printcharfun, 0); goto end_of_list; } - + print_object (XCAR (obj), printcharfun, escapeflag); - + obj = XCDR (obj); if (!(i & 1)) halftail = XCDR (halftail); @@ -1694,7 +1694,7 @@ print_object (obj, printcharfun, escapeflag) strout (" . ", 3, 3, printcharfun, 0); print_object (obj, printcharfun, escapeflag); } - + end_of_list: PRINTCHAR (')'); } diff --git a/src/process.c b/src/process.c index 1998e845421..775415ac1a6 100644 --- a/src/process.c +++ b/src/process.c @@ -101,7 +101,7 @@ Boston, MA 02111-1307, USA. */ #ifdef IRIS #include <sys/sysmacros.h> /* for "minor" */ #endif /* not IRIS */ - + #ifdef HAVE_SYS_WAIT #include <sys/wait.h> #endif @@ -357,7 +357,7 @@ update_status (p) p->raw_status_high = Qnil; } -/* Convert a process status word in Unix format to +/* Convert a process status word in Unix format to the list that we use internally. */ Lisp_Object @@ -406,7 +406,7 @@ decode_status (l, symbol, code, coredump) /* Return a string describing a process status list. */ -Lisp_Object +Lisp_Object status_message (status) Lisp_Object status; { @@ -685,7 +685,7 @@ nil, indicating the current buffer's process. */) { Fkill_process (process, Qnil); /* Do this now, since remove_process will make sigchld_handler do nothing. */ - XPROCESS (process)->status + XPROCESS (process)->status = Fcons (Qsignal, Fcons (make_number (SIGKILL), Qnil)); XSETINT (XPROCESS (process)->tick, ++process_tick); status_notify (); @@ -847,7 +847,7 @@ t means stop accepting output from the process. When a process has a filter, its buffer is not used for output. Instead, each time it does output, the entire string of output is -passed to the filter. +passed to the filter. The filter gets two arguments: the process and the string of output. The string argument is normally a multibyte string, except: @@ -860,7 +860,7 @@ The string argument is normally a multibyte string, except: register Lisp_Object process, filter; { struct Lisp_Process *p; - + CHECK_PROCESS (process); p = XPROCESS (process); @@ -871,7 +871,7 @@ The string argument is normally a multibyte string, except: (setq process (start-process ...)) (debug) (set-process-filter process ...) */ - + if (XINT (p->infd) >= 0) { if (EQ (filter, Qt) && !EQ (p->status, Qlisten)) @@ -886,7 +886,7 @@ The string argument is normally a multibyte string, except: FD_SET (XINT (p->infd), &non_keyboard_wait_mask); } } - + p->filter = filter; if (NETCONN1_P (p)) p->childp = Fplist_put (p->childp, QCfilter, filter); @@ -937,7 +937,7 @@ DEFUN ("set-process-window-size", Fset_process_window_size, CHECK_PROCESS (process); CHECK_NATNUM (height); CHECK_NATNUM (width); - + if (XINT (XPROCESS (process)->infd) < 0 || set_window_size (XINT (XPROCESS (process)->infd), XINT (height), XINT (width)) <= 0) @@ -1033,7 +1033,7 @@ See `make-network-process' for a list of keywords. */) #ifdef DATAGRAM_SOCKETS if (DATAGRAM_CONN_P (process) && (EQ (key, Qt) || EQ (key, QCremote))) - contact = Fplist_put (contact, QCremote, + contact = Fplist_put (contact, QCremote, Fprocess_datagram_address (process)); #endif @@ -1127,7 +1127,7 @@ IP address. Returns nil if format of ADDRESS is invalid. */) args[0] = build_string ("<Family %d>"); args[1] = Fcar (address); return Fformat (2, args); - + } return Qnil; @@ -1232,7 +1232,7 @@ list_processes_1 (query_only) if (CONSP (p->status)) symbol = XCAR (p->status); - + if (EQ (symbol, Qsignal)) { Lisp_Object tem; @@ -1319,7 +1319,7 @@ list_processes_1 (query_only) (STRINGP (host) ? (char *)SDATA (host) : "?")); insert_string (tembuf); } - else + else { tem = p->command; while (1) @@ -1408,7 +1408,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) GCPRO2 (buffer, current_dir); - current_dir + current_dir = expand_and_dir_to_file (Funhandled_file_name_directory (current_dir), Qnil); if (NILP (Ffile_accessible_directory_p (current_dir))) @@ -1512,7 +1512,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) strcat (new_argv, SDATA (tem)); } /* Need to add code here to check for program existence on VMS */ - + #else /* not VMS */ new_argv = (unsigned char **) alloca ((nargs - 1) * sizeof (char *)); @@ -1809,7 +1809,7 @@ create_process (process, new_argv, current_dir) XSETINT (XPROCESS (process)->pid, -1); BLOCK_INPUT; - + { /* child_setup must clobber environ on systems with true vfork. Protect it from permanent change. */ @@ -1874,12 +1874,12 @@ create_process (process, new_argv, current_dir) } #endif #endif -#ifdef TIOCNOTTY +#ifdef TIOCNOTTY /* In 4.3BSD, the TIOCSPGRP bug has been fixed, and now you can do TIOCSPGRP only to the process's controlling tty. */ if (pty_flag) { - /* I wonder: would just ioctl (0, TIOCNOTTY, 0) work here? + /* I wonder: would just ioctl (0, TIOCNOTTY, 0) work here? I can't test it since I don't have 4.3. */ int j = emacs_open ("/dev/tty", O_RDWR, 0); ioctl (j, TIOCNOTTY, 0); @@ -1974,7 +1974,7 @@ create_process (process, new_argv, current_dir) #ifdef WINDOWSNT pid = child_setup (xforkin, xforkout, xforkout, new_argv, 1, current_dir); -#else /* not WINDOWSNT */ +#else /* not WINDOWSNT */ child_setup (xforkin, xforkout, xforkout, new_argv, 1, current_dir); #endif /* not WINDOWSNT */ @@ -2007,11 +2007,11 @@ create_process (process, new_argv, current_dir) { struct atimer *timer; EMACS_TIME offset; - + stop_polling (); EMACS_SET_SECS_USECS (offset, 1, 0); timer = start_atimer (ATIMER_RELATIVE, offset, create_process_1, 0); - + XPROCESS (process)->subtty = Qnil; if (forkin >= 0) emacs_close (forkin); @@ -2019,7 +2019,7 @@ create_process (process, new_argv, current_dir) cancel_atimer (timer); start_polling (); } - + if (forkin != forkout && forkout >= 0) emacs_close (forkout); @@ -2260,7 +2260,7 @@ Returns nil upon error setting address, ADDRESS otherwise. */) static struct socket_options { /* The name of this option. Should be lowercase version of option - name without SO_ prefix. */ + name without SO_ prefix. */ char *name; /* Length of name. */ int nlen; @@ -2406,14 +2406,14 @@ set_socket_options (s, opts, no_error) arg = (char *) SDATA (val); else if (XSYMBOL (val)) arg = (char *) SDATA (SYMBOL_NAME (val)); - else + else error ("Invalid argument to %s option", name); } ret = setsockopt (s, sopt->optlevel, sopt->optnum, arg, strlen (arg)); } -#ifdef SO_LINGER +#ifdef SO_LINGER case SOPT_LINGER: { struct linger linger; @@ -2455,7 +2455,7 @@ set_socket_options (s, opts, no_error) DEFUN ("set-network-process-options", Fset_network_process_options, Sset_network_process_options, - 1, MANY, 0, + 1, MANY, 0, doc: /* Set one or more options for network process PROCESS. Each option is either a string "OPT=VALUE" or a cons (OPT . VALUE). A boolean value is false if it either zero or nil, true otherwise. @@ -2466,9 +2466,9 @@ pages for more information. bindtodevice=NAME -- bind to interface NAME, or remove binding if nil. broadcast=BOOL -- Allow send and receive of datagram broadcasts. dontroute=BOOL -- Only send to directly connected hosts. -keepalive=BOOL -- Send keep-alive messages on network stream. +keepalive=BOOL -- Send keep-alive messages on network stream. linger=BOOL or TIMEOUT -- Send queued messages before closing. -oobinline=BOOL -- Place out-of-band data in receive data stream. +oobinline=BOOL -- Place out-of-band data in receive data stream. priority=INT -- Set protocol defined priority for sent packets. reuseaddr=BOOL -- Allow reusing a recently used address. @@ -2507,8 +2507,8 @@ unwind_request_sigio (dummy) connection has no PID; you cannot signal it. All you can do is stop/continue it and deactivate/close it via delete-process */ -DEFUN ("make-network-process", Fmake_network_process, Smake_network_process, - 0, MANY, 0, +DEFUN ("make-network-process", Fmake_network_process, Smake_network_process, + 0, MANY, 0, doc: /* Create and return a network server or client process. In Emacs, network connections are represented by process objects, so @@ -2599,20 +2599,20 @@ is the server process, CLIENT is the new process for the connection, and MESSAGE is a string. :plist PLIST -- Install PLIST as the new process' initial plist. - + :server BOOL -- if BOOL is non-nil, create a server process for the specified FAMILY, SERVICE, and connection type (stream or datagram). Default is a client process. A server process will listen for and accept connections from clients. When a client connection is accepted, a new network process -is created for the connection with the following parameters: +is created for the connection with the following parameters: - The client's process name is constructed by concatenating the server process' NAME and a client identification string. - If the FILTER argument is non-nil, the client process will not get a separate process buffer; otherwise, the client's process buffer is a newly created buffer named after the server process' BUFFER name or process -NAME concatenated with the client identification string. +NAME concatenated with the client identification string. - The connection type and the process filter and sentinel parameters are inherited from the server process' TYPE, FILTER and SENTINEL. - The client process' contact info is set according to the client's @@ -2732,7 +2732,7 @@ usage: (make-network-process &rest ARGS) */) /* Let's handle TERM before things get complicated ... */ host = Fplist_get (contact, QChost); CHECK_STRING (host); - + service = Fplist_get (contact, QCservice); if (INTEGERP (service)) port = htons ((unsigned short) XINT (service)); @@ -2881,7 +2881,7 @@ usage: (make-network-process &rest ARGS) */) { struct servent *svc_info; CHECK_STRING (service); - svc_info = getservbyname (SDATA (service), + svc_info = getservbyname (SDATA (service), (socktype == SOCK_DGRAM ? "udp" : "tcp")); if (svc_info == 0) error ("Unknown service: %s", SDATA (service)); @@ -2904,7 +2904,7 @@ usage: (make-network-process &rest ARGS) */) QUIT; host_info_ptr = gethostbyname (SDATA (host)); immediate_quit = 0; - + if (host_info_ptr) { bcopy (host_info_ptr->h_addr, (char *) &address_in.sin_addr, @@ -2985,7 +2985,7 @@ usage: (make-network-process &rest ARGS) */) } } #endif - + /* Make us close S if quit. */ record_unwind_protect (close_file_unwind, make_number (s)); @@ -3000,7 +3000,7 @@ usage: (make-network-process &rest ARGS) */) if (setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval)) report_file_error ("Cannot set reuse option on server socket.", Qnil); } - + if (bind (s, lres->ai_addr, lres->ai_addrlen)) report_file_error ("Cannot bind server socket", Qnil); @@ -3035,7 +3035,7 @@ usage: (make-network-process &rest ARGS) */) set. It'd be nice to be able to control the connect timeout - though. Would non-blocking connect calls be portable? + though. Would non-blocking connect calls be portable? This used to be conditioned by HAVE_GETADDRINFO. Why? */ @@ -3111,7 +3111,7 @@ usage: (make-network-process &rest ARGS) */) bcopy (lres->ai_addr, datagram_address[s].sa, lres->ai_addrlen); } #endif - contact = Fplist_put (contact, QCaddress, + contact = Fplist_put (contact, QCaddress, conv_sockaddr_to_lisp (lres->ai_addr, lres->ai_addrlen)); #ifdef HAVE_GETSOCKNAME if (!is_server) @@ -3181,7 +3181,7 @@ usage: (make-network-process &rest ARGS) */) p->childp = contact; p->plist = Fcopy_sequence (Fplist_get (contact, QCplist)); - + p->buffer = buffer; p->sentinel = sentinel; p->filter = filter; @@ -3603,12 +3603,12 @@ server_accept_connection (server, channel) contact = Fplist_put (contact, QChost, host); if (!NILP (service)) contact = Fplist_put (contact, QCservice, service); - contact = Fplist_put (contact, QCremote, + contact = Fplist_put (contact, QCremote, conv_sockaddr_to_lisp (&saddr.sa, len)); #ifdef HAVE_GETSOCKNAME len = sizeof saddr; if (getsockname (s, &saddr.sa, &len) == 0) - contact = Fplist_put (contact, QClocal, + contact = Fplist_put (contact, QClocal, conv_sockaddr_to_lisp (&saddr.sa, len)); #endif @@ -3634,7 +3634,7 @@ server_accept_connection (server, channel) if (s > max_process_desc) max_process_desc = s; - /* Setup coding system for new process based on server process. + /* Setup coding system for new process based on server process. This seems to be the proper thing to do, as the coding system of the new process should reflect the settings at the time the server socket was opened; not the current settings. */ @@ -3668,7 +3668,7 @@ server_accept_connection (server, channel) build_string ("\n"))); if (!NILP (p->sentinel)) - exec_sentinel (proc, + exec_sentinel (proc, concat3 (build_string ("open from "), (STRINGP (host) ? host : build_string ("-")), build_string ("\n"))); @@ -3831,7 +3831,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) { int old_timers_run = timers_run; struct buffer *old_buffer = current_buffer; - + timer_delay = timer_check (1); /* If a timer has run, this might have changed buffers @@ -3840,7 +3840,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) && old_buffer != current_buffer && waiting_for_user_input_p == -1) record_asynch_buffer_change (); - + if (timers_run != old_timers_run && do_display) /* We must retry, since a timer may have requeued itself and that could alter the time_delay. */ @@ -3902,7 +3902,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) Ctemp = connect_wait_mask; EMACS_SET_SECS_USECS (timeout, 0, 0); if ((select (max (max_process_desc, max_keyboard_desc) + 1, - &Atemp, + &Atemp, (num_pending_connects > 0 ? &Ctemp : (SELECT_TYPE *)0), (SELECT_TYPE *)0, &timeout) <= 0)) @@ -3935,7 +3935,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) if (nread == 0) break; - if (0 < nread) + if (0 < nread) total_nread += nread; #ifdef EIO else if (nread == -1 && EIO == errno) @@ -3996,7 +3996,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) if (check_connect) Connecting = connect_wait_mask; nfds = select (max (max_process_desc, max_keyboard_desc) + 1, - &Available, + &Available, (check_connect ? &Connecting : (SELECT_TYPE *)0), (SELECT_TYPE *)0, &timeout); } @@ -4093,7 +4093,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) int old_timers_run = timers_run; struct buffer *old_buffer = current_buffer; int leave = 0; - + if (detect_input_pending_run_timers (do_display)) { swallow_events (do_display); @@ -4110,8 +4110,8 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) if (leave) break; - } - + } + /* If there is unread keyboard input, also return. */ if (XINT (read_kbd) != 0 && requeued_events_pending_p ()) @@ -4258,7 +4258,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) = Fcons (Qexit, Fcons (make_number (256), Qnil)); } } -#ifdef NON_BLOCKING_CONNECT +#ifdef NON_BLOCKING_CONNECT if (check_connect && FD_ISSET (channel, &Connecting)) { struct Lisp_Process *p; @@ -4479,7 +4479,7 @@ read_process_output (proc, channel) outstream = p->filter; if (!NILP (outstream)) { - /* We inhibit quit here instead of just catching it so that + /* We inhibit quit here instead of just catching it so that hitting ^G when a filter happens to be running won't screw it up. */ int count = SPECPDL_INDEX (); @@ -4945,7 +4945,7 @@ send_process (proc, buf, len, object) || errno == EAGAIN #endif ) - /* Buffer is full. Wait, accepting input; + /* Buffer is full. Wait, accepting input; that may allow the program to finish doing output and read more. */ { @@ -4969,7 +4969,7 @@ send_process (proc, buf, len, object) the terminal is set up that way which it is here). The same bytes will be seen again in a later read(2), without the CRs. */ - + if (errno == EAGAIN) { int flags = FWRITE; @@ -4977,7 +4977,7 @@ send_process (proc, buf, len, object) &flags); } #endif /* BROKEN_PTY_READ_AFTER_EAGAIN */ - + /* Running filters might relocate buffers or strings. Arrange to relocate BUF. */ if (BUFFERP (object)) @@ -5026,7 +5026,7 @@ send_process (proc, buf, len, object) XSETINT (XPROCESS (proc)->tick, ++process_tick); deactivate_process (proc); #ifdef VMS - error ("Error writing to process %s; closed it", + error ("Error writing to process %s; closed it", SDATA (XPROCESS (proc)->name)); #else error ("SIGPIPE raised on process %s; closed it", @@ -5109,7 +5109,7 @@ return t unconditionally. */) error ("Process %s is not active", SDATA (p->name)); -#ifdef TIOCGPGRP +#ifdef TIOCGPGRP if (!NILP (p->subtty)) ioctl (XFASTINT (p->subtty), TIOCGPGRP, &gid); else @@ -5258,7 +5258,7 @@ process_send_signal (process, signo, current_group, nomsg) /* The code above always returns from the function. */ #endif /* defined (SIGNALS_VIA_CHARACTERS) */ -#ifdef TIOCGPGRP +#ifdef TIOCGPGRP /* Get the current pgrp using the tty itself, if we have that. Otherwise, use the pty to get the pgrp. On pfa systems, saka@pfu.fujitsu.co.JP writes: @@ -5392,7 +5392,7 @@ See function `interrupt-process' for more details on usage. */) DEFUN ("stop-process", Fstop_process, Sstop_process, 0, 2, 0, doc: /* Stop process PROCESS. May be process or name of one. -See function `interrupt-process' for more details on usage. +See function `interrupt-process' for more details on usage. If PROCESS is a network process, inhibit handling of incoming traffic. */) (process, current_group) Lisp_Object process, current_group; @@ -5401,7 +5401,7 @@ If PROCESS is a network process, inhibit handling of incoming traffic. */) if (PROCESSP (process) && NETCONN_P (process)) { struct Lisp_Process *p; - + p = XPROCESS (process); if (NILP (p->command) && XINT (p->infd) >= 0) @@ -5423,7 +5423,7 @@ If PROCESS is a network process, inhibit handling of incoming traffic. */) DEFUN ("continue-process", Fcontinue_process, Scontinue_process, 0, 2, 0, doc: /* Continue process PROCESS. May be process or name of one. -See function `interrupt-process' for more details on usage. +See function `interrupt-process' for more details on usage. If PROCESS is a network process, resume handling of incoming traffic. */) (process, current_group) Lisp_Object process, current_group; @@ -5484,7 +5484,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name. */) } else process = get_process (process); - + if (NILP (process)) return process; @@ -5708,7 +5708,7 @@ kill_buffer_processes (buffer) /* On receipt of a signal that a child status has changed, loop asking about children with changed statuses until the system says there are no more. - + All we do is change the status; we do not run sentinels or print notifications. That is saved for the next time keyboard input is done, in order to avoid timing errors. @@ -5752,7 +5752,7 @@ sigchld_handler (signo) #define WUNTRACED 0 #endif /* no WUNTRACED */ /* Keep trying to get a status until we get a definitive result. */ - do + do { errno = 0; pid = wait3 (&w, WNOHANG | WUNTRACED, 0); @@ -5803,18 +5803,18 @@ sigchld_handler (signo) break; p = 0; } - + /* Change the status of the process that was found. */ if (p != 0) { union { int i; WAITTYPE wt; } u; int clear_desc_flag = 0; - + XSETINT (p->tick, ++process_tick); u.wt = w; XSETINT (p->raw_status_low, u.i & 0xffff); XSETINT (p->raw_status_high, u.i >> 16); - + /* If process has terminated, stop waiting for its output. */ if ((WIFSIGNALED (w) || WIFEXITED (w)) && XINT (p->infd) >= 0) @@ -6342,7 +6342,7 @@ syms_of_process () staticpro (&QCoptions); QCplist = intern (":plist"); staticpro (&QCplist); - + Qlast_nonmenu_event = intern ("last-nonmenu-event"); staticpro (&Qlast_nonmenu_event); @@ -6472,7 +6472,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) int xerrno; /* Either nil or a cons cell, the car of which is of interest and may be changed outside of this routine. */ - Lisp_Object wait_for_cell; + Lisp_Object wait_for_cell; wait_for_cell = Qnil; diff --git a/src/puresize.h b/src/puresize.h index 891dde40d77..fd5bf1829a9 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -90,7 +90,7 @@ extern char my_edata[]; #else /* not VIRT_ADDRESS_VARIES, not PNTR_COMPARISON_TYPE */ extern char my_edata[]; - + #define PURE_P(obj) \ (XPNTR (obj) < (unsigned int) my_edata) diff --git a/src/ralloc.c b/src/ralloc.c index 9d31320bfcf..f710cfdc2b7 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1,4 +1,4 @@ -/* Block-relocating memory allocator. +/* Block-relocating memory allocator. Copyright (C) 1993, 1995, 2000 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -42,7 +42,7 @@ typedef size_t SIZE; extern void safe_bcopy (); #ifdef DOUG_LEA_MALLOC -#define M_TOP_PAD -2 +#define M_TOP_PAD -2 extern int mallopt (); #else /* not DOUG_LEA_MALLOC */ #ifndef SYSTEM_MALLOC @@ -98,7 +98,7 @@ static POINTER break_value; /* This is the size of a page. We round memory requests to this boundary. */ static int page_size; -/* Whenever we get memory from the system, get this many extra bytes. This +/* Whenever we get memory from the system, get this many extra bytes. This must be a multiple of page_size. */ static int extra_bytes; @@ -141,7 +141,7 @@ extern POINTER (*__morecore) (); We try to make just one heap and make it larger as necessary. But sometimes we can't do that, because we can't get contiguous space to add onto the heap. When that happens, we start a new heap. */ - + typedef struct heap { struct heap *next; @@ -174,7 +174,7 @@ static heap_ptr first_heap, last_heap; /* These structures are allocated in the malloc arena. The linked list is kept in order of increasing '.data' members. The data blocks abut each other; if b->next is non-nil, then - b->data + b->size == b->next->data. + b->data + b->size == b->next->data. An element with variable==NIL denotes a freed block, which has not yet been collected. They may only appear while r_alloc_freeze > 0, and will be @@ -467,8 +467,8 @@ get_bloc (size) /* Calculate new locations of blocs in the list beginning with BLOC, relocating it to start at ADDRESS, in heap HEAP. If enough space is not presently available in our reserve, call obtain for - more space. - + more space. + Store the new location of each bloc in its new_data field. Do not touch the contents of blocs or break_value. */ @@ -481,7 +481,7 @@ relocate_blocs (bloc, heap, address) register bloc_ptr b = bloc; /* No need to ever call this if arena is frozen, bug somewhere! */ - if (r_alloc_freeze_level) + if (r_alloc_freeze_level) abort(); while (b) @@ -506,7 +506,7 @@ relocate_blocs (bloc, heap, address) /* Add up the size of all the following blocs. */ while (tb != NIL_BLOC) { - if (tb->variable) + if (tb->variable) s += tb->size; tb = tb->next; @@ -523,7 +523,7 @@ relocate_blocs (bloc, heap, address) /* Record the new address of this bloc and update where the next bloc can start. */ b->new_data = address; - if (b->variable) + if (b->variable) address = (char *) address + b->size; b = b->next; } @@ -639,7 +639,7 @@ resize_bloc (bloc, size) SIZE old_size; /* No need to ever call this if arena is frozen, bug somewhere! */ - if (r_alloc_freeze_level) + if (r_alloc_freeze_level) abort(); if (bloc == NIL_BLOC || size == bloc->size) @@ -681,8 +681,8 @@ resize_bloc (bloc, size) { b->size = 0; b->data = b->new_data; - } - else + } + else { safe_bcopy (b->data, b->new_data, b->size); *b->variable = b->data = b->new_data; @@ -708,8 +708,8 @@ resize_bloc (bloc, size) { b->size = 0; b->data = b->new_data; - } - else + } + else { safe_bcopy (b->data, b->new_data, b->size); *b->variable = b->data = b->new_data; @@ -738,7 +738,7 @@ free_bloc (bloc) bloc->variable = (POINTER *) NIL; return; } - + resize_bloc (bloc, 0); if (bloc == first_bloc && bloc == last_bloc) @@ -794,7 +794,7 @@ free_bloc (bloc) __morecore hook values - in particular, __default_morecore in the GNU malloc package. */ -POINTER +POINTER r_alloc_sbrk (size) long size; { @@ -850,7 +850,7 @@ r_alloc_sbrk (size) if (first_heap->bloc_start < new_bloc_start) { /* This is no clean solution - no idea how to do it better. */ - if (r_alloc_freeze_level) + if (r_alloc_freeze_level) return NIL; /* There is a bug here: if the above obtain call succeeded, but the @@ -1018,7 +1018,7 @@ r_re_alloc (ptr, size) if (!*ptr) return r_alloc (ptr, size); - if (!size) + if (!size) { r_alloc_free (ptr); return r_alloc (ptr, 0); @@ -1028,12 +1028,12 @@ r_re_alloc (ptr, size) if (bloc == NIL_BLOC) abort (); - if (size < bloc->size) + if (size < bloc->size) { /* Wouldn't it be useful to actually resize the bloc here? */ /* I think so too, but not if it's too expensive... */ - if ((bloc->size - MEM_ROUNDUP (size) >= page_size) - && r_alloc_freeze_level == 0) + if ((bloc->size - MEM_ROUNDUP (size) >= page_size) + && r_alloc_freeze_level == 0) { resize_bloc (bloc, MEM_ROUNDUP (size)); /* Never mind if this fails, just do nothing... */ @@ -1055,7 +1055,7 @@ r_re_alloc (ptr, size) else return NIL; } - else + else { if (! resize_bloc (bloc, MEM_ROUNDUP (size))) return NIL; @@ -1091,22 +1091,22 @@ void r_alloc_thaw () { - if (! r_alloc_initialized) + if (! r_alloc_initialized) r_alloc_init (); if (--r_alloc_freeze_level < 0) abort (); - /* This frees all unused blocs. It is not too inefficient, as the resize - and bcopy is done only once. Afterwards, all unreferenced blocs are + /* This frees all unused blocs. It is not too inefficient, as the resize + and bcopy is done only once. Afterwards, all unreferenced blocs are already shrunk to zero size. */ - if (!r_alloc_freeze_level) + if (!r_alloc_freeze_level) { bloc_ptr *b = &first_bloc; - while (*b) - if (!(*b)->variable) - free_bloc (*b); - else + while (*b) + if (!(*b)->variable) + free_bloc (*b); + else b = &(*b)->next; } } @@ -1238,7 +1238,7 @@ r_alloc_init () if (r_alloc_initialized) return; r_alloc_initialized = 1; - + page_size = PAGE; #ifndef SYSTEM_MALLOC real_morecore = __morecore; @@ -1283,6 +1283,6 @@ r_alloc_init () (char *) first_heap->end - (char *) first_heap->start); virtual_break_value = break_value = first_heap->bloc_start = first_heap->end; #endif - + use_relocatable_buffers = 1; } diff --git a/src/regex.c b/src/regex.c index 148100805eb..5b1b391dab7 100644 --- a/src/regex.c +++ b/src/regex.c @@ -2065,7 +2065,7 @@ re_wctype_to_bit (cc) static void extend_range_table_work_area (work_area) struct range_table_work_area *work_area; -{ +{ work_area->allocated += 16 * sizeof (int); if (work_area->table) work_area->table @@ -2104,7 +2104,7 @@ set_image_of_range_1 (work_area, start, end, translate) `strange' indicates a character that has more than one case-equivalent. */ - + enum case_type {one_case, two_case, strange}; /* Describe the run that is in progress, @@ -2174,7 +2174,7 @@ set_image_of_range_1 (work_area, start, end, translate) } run_type = strange; } - + if (this_type == strange) { /* For a strange character, add each of its equivalents, one @@ -2624,7 +2624,7 @@ regex_compile (pattern, size, syntax, bufp) (simple || !analyse_first (laststart, b, NULL, 0)) ? on_failure_jump : on_failure_jump_loop; assert (skip_one_char (laststart) <= b); - + if (!zero_times_ok && simple) { /* Since simple * loops can be made faster by using on_failure_keep_string_jump, we turn simple P+ @@ -3941,7 +3941,7 @@ analyse_first (p, pend, fastmap, multibyte) case has already been handled, so we only need to look at the fallthrough case. */ continue; - + case succeed_n: /* If N == 0, it should be an on_failure_jump_loop instead. */ DEBUG_STATEMENT (EXTRACT_NUMBER (j, p + 2); assert (j > 0)); @@ -4424,7 +4424,7 @@ skip_one_char (p) { case anychar: break; - + case exactn: p += *p + 1; break; @@ -4441,7 +4441,7 @@ skip_one_char (p) else p += 1 + CHARSET_BITMAP_SIZE (p - 1); break; - + case syntaxspec: case notsyntaxspec: #ifdef emacs @@ -4524,7 +4524,7 @@ mutually_exclusive_p (bufp, p1, p2) return 1; } break; - + case endline: case exactn: { @@ -4634,7 +4634,7 @@ mutually_exclusive_p (bufp, p1, p2) } } break; - + case charset_not: switch (SWITCH_ENUM_CAST (*p1)) { @@ -5318,7 +5318,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) assert (!REG_UNSET (regstart[*p])); /* Strictly speaking, there should be code such as: - + assert (REG_UNSET (regend[*p])); PUSH_FAILURE_REGSTOP ((unsigned int)*p); @@ -5735,7 +5735,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) PREFETCH (); c2 = RE_STRING_CHAR (d, dend - d); s2 = SYNTAX (c2); - + /* Case 2: S2 is not Sword. */ if (s2 != Sword) goto fail; diff --git a/src/region-cache.c b/src/region-cache.c index d7094cda26c..b5b5202653f 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -131,7 +131,7 @@ static void revalidate_region_cache (); struct region_cache * new_region_cache () { - struct region_cache *c + struct region_cache *c = (struct region_cache *) xmalloc (sizeof (struct region_cache)); c->gap_start = 0; @@ -385,7 +385,7 @@ delete_cache_boundaries (c, start, end) c->cache_len -= len; } - + /* Set the value for a region. */ @@ -407,12 +407,12 @@ set_cache_region (c, start, end, value) both the locations of real characters in the buffer. */ if (start == end) return; - + { /* We need to make sure that there are no boundaries in the area between start to end; the whole area will have the same value, so those boundaries will not be necessary. - + Let start_ix be the cache index of the boundary governing the first character of start..end, and let end_ix be the cache index of the earliest boundary after the last character in @@ -456,7 +456,7 @@ set_cache_region (c, start, end, value) start_ix++; } } - + /* This is equivalent to letting end_ix float (like a buffer marker does) with the insertions and deletions we may have done. */ @@ -553,7 +553,7 @@ invalidate_region_cache (buf, c, head, tail) } -/* Clean out any cache entries applying to the modified region, and +/* Clean out any cache entries applying to the modified region, and make the positions of the remaining entries accurate again. After calling this function, the mess described in the comment in @@ -606,7 +606,7 @@ revalidate_region_cache (buf, c) (which will give the modified region the same size in the cache as it has in the buffer), and then invalidate the modified region. */ - if (c->buffer_beg + c->beg_unchanged + if (c->buffer_beg + c->beg_unchanged == c->buffer_end - c->end_unchanged) { /* Move the gap so that all the boundaries in the unchanged head @@ -721,7 +721,7 @@ know_region_cache (buf, c, start, end) /* Interface: using the cache. */ /* Return true if the text immediately after POS in BUF is known, for - the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest + the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest position after POS where the knownness changes. */ int region_cache_forward (buf, c, pos, next) diff --git a/src/region-cache.h b/src/region-cache.h index b4a0b646a34..073d26b6bf3 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -86,7 +86,7 @@ extern void invalidate_region_cache P_ ((struct buffer *BUF, struct region_cache *CACHE, int HEAD, int TAIL)); -/* The scanning functions. +/* The scanning functions. Basically, if you're scanning forward/backward from position POS, and region_cache_forward/backward returns true, you can skip all @@ -96,7 +96,7 @@ extern void invalidate_region_cache P_ ((struct buffer *BUF, might be able to avoid scanning it again. */ /* Return true if the text immediately after POS in BUF is known, for - the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest + the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest position after POS where the knownness changes. */ extern int region_cache_forward P_ ((struct buffer *BUF, struct region_cache *CACHE, diff --git a/src/s/386bsd.h b/src/s/386bsd.h index f9f4a6a5ff2..427dc2003de 100644 --- a/src/s/386bsd.h +++ b/src/s/386bsd.h @@ -6,7 +6,7 @@ #undef LIB_STANDARD #define LIB_STANDARD -lc $(GNULIB_VAR) -/* The following should be set to /netbsd if you are running netbsd > 0.8 +/* The following should be set to /netbsd if you are running netbsd > 0.8 Or just link /netbsd -> /386bsd */ #undef KERNEL_FILE #define KERNEL_FILE "/386bsd" diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h index c365bc7d102..e179684f3b6 100644 --- a/src/s/aix4-1.h +++ b/src/s/aix4-1.h @@ -1,4 +1,4 @@ -#define AIX4_1 +#define AIX4_1 #include "aix4.h" diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h index d0dd9a29485..fc797755c08 100644 --- a/src/s/bsd4-1.h +++ b/src/s/bsd4-1.h @@ -46,7 +46,7 @@ Boston, MA 02111-1307, USA. */ /* First pty name is /dev/ptyp0. */ #define FIRST_PTY_LETTER 'p' - + /* * Define HAVE_PTYS if the system supports pty devices. */ diff --git a/src/s/cygwin.h b/src/s/cygwin.h index fe292305465..d10a7264053 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -103,7 +103,7 @@ Boston, MA 02111-1307, USA. */ /* If the system's imake configuration file defines `NeedWidePrototypes' as `NO', we must define NARROWPROTO manually. Such a define is - generated in the Makefile generated by `xmkmf'. If we don't + generated in the Makefile generated by `xmkmf'. If we don't define NARROWPROTO, we will see the wrong function prototypes for X functions taking float or double parameters. */ diff --git a/src/s/darwin.h b/src/s/darwin.h index 21b11d9554a..e9faa6605ce 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -178,7 +178,7 @@ Boston, MA 02111-1307, USA. */ /* If the system's imake configuration file defines `NeedWidePrototypes' as `NO', we must define NARROWPROTO manually. Such a define is - generated in the Makefile generated by `xmkmf'. If we don't + generated in the Makefile generated by `xmkmf'. If we don't define NARROWPROTO, we will see the wrong function prototypes for X functions taking float or double parameters. */ diff --git a/src/s/freebsd.h b/src/s/freebsd.h index b42930b7aa2..94336835f50 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA. */ /* Get the correct __FreeBSD_version, even if this is before that was defined. */ -#ifndef __FreeBSD_version +#ifndef __FreeBSD_version #ifndef __FreeBSD__ #define __FreeBSD_version 199401 #elif __FreeBSD__ == 1 @@ -144,7 +144,7 @@ Boston, MA 02111-1307, USA. */ #define BSD_SYSTEM 199506 #endif -#if 0 /* Shouldn't be necessary and produces warnings with the +#if 0 /* Shouldn't be necessary and produces warnings with the experimental Autoconf test. */ #define WAITTYPE int /* get this since it won't be included if WAITTYPE is defined */ @@ -167,7 +167,7 @@ Boston, MA 02111-1307, USA. */ /* If the system's imake configuration file defines `NeedWidePrototypes' as `NO', we must define NARROWPROTO manually. Such a define is - generated in the Makefile generated by `xmkmf'. If we don't + generated in the Makefile generated by `xmkmf'. If we don't define NARROWPROTO, we will see the wrong function prototypes for X functions taking float or double parameters. */ diff --git a/src/s/hiuxmpp.h b/src/s/hiuxmpp.h index 2ad57403fb7..5175bd10bfe 100644 --- a/src/s/hiuxmpp.h +++ b/src/s/hiuxmpp.h @@ -14,9 +14,9 @@ #define BSD4_2 /* Define _BSD to tell the include files we're running under - the BSD universe and not the SYSV universe. - Define HITACHI and OSF for Xt's Boolean type as int intead of char. - (But for these defines, /usr/include/X11/Intrinsic.h defines + the BSD universe and not the SYSV universe. + Define HITACHI and OSF for Xt's Boolean type as int intead of char. + (But for these defines, /usr/include/X11/Intrinsic.h defines Boolean as char, but libXt.a on HI-UX/MPP requires it as int.) */ #define C_SWITCH_SYSTEM -D_BSD -DHITACHI -DOSF @@ -34,7 +34,7 @@ /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option says where to find X windows at run time. We convert it to a -rpath option which is what OSF1 uses. */ -#define LD_SWITCH_SYSTEM +#define LD_SWITCH_SYSTEM #undef KERNEL_FILE #define KERNEL_FILE "/mach_kernel" diff --git a/src/s/hiuxwe2.h b/src/s/hiuxwe2.h index 2ad57403fb7..5175bd10bfe 100644 --- a/src/s/hiuxwe2.h +++ b/src/s/hiuxwe2.h @@ -14,9 +14,9 @@ #define BSD4_2 /* Define _BSD to tell the include files we're running under - the BSD universe and not the SYSV universe. - Define HITACHI and OSF for Xt's Boolean type as int intead of char. - (But for these defines, /usr/include/X11/Intrinsic.h defines + the BSD universe and not the SYSV universe. + Define HITACHI and OSF for Xt's Boolean type as int intead of char. + (But for these defines, /usr/include/X11/Intrinsic.h defines Boolean as char, but libXt.a on HI-UX/MPP requires it as int.) */ #define C_SWITCH_SYSTEM -D_BSD -DHITACHI -DOSF @@ -34,7 +34,7 @@ /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option says where to find X windows at run time. We convert it to a -rpath option which is what OSF1 uses. */ -#define LD_SWITCH_SYSTEM +#define LD_SWITCH_SYSTEM #undef KERNEL_FILE #define KERNEL_FILE "/mach_kernel" diff --git a/src/s/hpux8.h b/src/s/hpux8.h index c06675301f0..a151769fcf9 100644 --- a/src/s/hpux8.h +++ b/src/s/hpux8.h @@ -52,7 +52,7 @@ and none have sioctl.h, so might as well define this. */ #define NO_SIOCTL_H -#if 0 /* autoconf should be detecting the presence or absence of +#if 0 /* autoconf should be detecting the presence or absence of random and srandom now. */ /* If you use X11R4 you must define this. If you use X11R5 you must comment this out */ diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h index a83d3fcb417..1bdd479eb9f 100644 --- a/src/s/irix5-0.h +++ b/src/s/irix5-0.h @@ -4,7 +4,7 @@ #undef sigsetmask /* use sys_sigsetmask */ #undef _longjmp /* use system versions, not conservative aliases */ -#undef _setjmp +#undef _setjmp #define SETPGRP_RELEASES_CTTY @@ -73,7 +73,7 @@ char *_getpty(); /* Since we use POSIX constructs in PTY_OPEN, we must force POSIX throughout. */ -#define POSIX_SIGNALS +#define POSIX_SIGNALS /* Info from simon@lia.di.epfl.ch (Simon Leinen) suggests this is needed. */ #define GETPGRP_NO_ARG diff --git a/src/s/irix5-2.h b/src/s/irix5-2.h index 4d7509f8d54..a9056fae8c1 100644 --- a/src/s/irix5-2.h +++ b/src/s/irix5-2.h @@ -1,8 +1,8 @@ #include "irix5-0.h" -/* as of version 5.2, irix no longer uses flock, +/* as of version 5.2, irix no longer uses flock, according to jackr@wpd.sgi.com. */ -#undef MAIL_USE_FLOCK +#undef MAIL_USE_FLOCK /* C-g in select is not handled properly with restartable system calls. So don't use them. */ diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 51f3e9ddb25..6d38d4fa592 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -440,7 +440,7 @@ extern char *get_emacs_configuration_options (void); #include <sys/stat.h> -/* Define for those source files that do not include enough NT +/* Define for those source files that do not include enough NT system files. */ #ifndef NULL #ifdef __cplusplus diff --git a/src/s/netbsd.h b/src/s/netbsd.h index 7ed08ec05e3..b4ac9a55195 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h @@ -112,13 +112,13 @@ ioctl TIOCSCTTY. */ #define DONT_REOPEN_PTY - + /* Tell that garbage collector that setjmp is known to save all registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 - + /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */ #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS diff --git a/src/s/ptx.h b/src/s/ptx.h index 6fff6de543c..ae76c35f3e6 100644 --- a/src/s/ptx.h +++ b/src/s/ptx.h @@ -41,8 +41,8 @@ Boston, MA 02111-1307, USA. */ /* PTX has System V streams. */ #define SYSV_STREAMS - -/* Leave out -lPW since it conflicts with term.o and because we're not sure + +/* Leave out -lPW since it conflicts with term.o and because we're not sure if the alloca found there by autoconf should be trusted on PTX. */ #define LIB_STANDARD -lc @@ -159,7 +159,7 @@ struct timezone } \ strcpy (pty_name, slavename); -/* Define these to prevent the default logic in process.c:allocate_pty +/* Define these to prevent the default logic in process.c:allocate_pty from being used. */ #define PTY_NAME_SPRINTF #define PTY_TTY_NAME_SPRINTF diff --git a/src/s/sco4.h b/src/s/sco4.h index 6015ec66385..67b96eee59a 100644 --- a/src/s/sco4.h +++ b/src/s/sco4.h @@ -86,7 +86,7 @@ Boston, MA 02111-1307, USA. */ #define LIBS_SYSTEM -lsocket -lPW /* SCO has gettimeofday in socket library */ -/* Autoconf should determine this, but for now, +/* Autoconf should determine this, but for now, play safe to avoid error rather than deleting this and risking the wrong result. */ #ifndef HAVE_GETTIMEOFDAY diff --git a/src/s/sco5.h b/src/s/sco5.h index 04bfd7c181e..8b091f63b53 100644 --- a/src/s/sco5.h +++ b/src/s/sco5.h @@ -150,7 +150,7 @@ extern SIGMASKTYPE sigprocmask_set; #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base) #endif -/* Use ELF and get real shared libraries */ +/* Use ELF and get real shared libraries */ #undef COFF #define ELF diff --git a/src/s/template.h b/src/s/template.h index b018afa8ce1..f4d806de146 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -168,7 +168,7 @@ Boston, MA 02111-1307, USA. */ /* If the system's imake configuration file defines `NeedWidePrototypes' as `NO', we must define NARROWPROTO manually. Such a define is - generated in the Makefile generated by `xmkmf'. If we don't + generated in the Makefile generated by `xmkmf'. If we don't define NARROWPROTO, we will see the wrong function prototypes for X functions taking float or double parameters. */ diff --git a/src/s/umax.h b/src/s/umax.h index 25d3d70dbfa..eaa9b6c4bbc 100644 --- a/src/s/umax.h +++ b/src/s/umax.h @@ -147,7 +147,7 @@ Boston, MA 02111-1307, USA. */ #define SEGMENT_MASK (64 * 1024 - 1) -/* crt0.c needs this for compilation because it uses asm. */ +/* crt0.c needs this for compilation because it uses asm. */ #define C_SWITCH_ASM -q nodirect_code diff --git a/src/s/vms.h b/src/s/vms.h index e95212c5624..9f718099eef 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -130,7 +130,7 @@ Boston, MA 02111-1307, USA. */ #define LINK_CRTL_SHARE /* Define this if you want to read the file SYS$SYSTEM:SYSUAF.DAT for user - information. If you do use this, you must either make SYSUAF.DAT world + information. If you do use this, you must either make SYSUAF.DAT world readable or install Emacs with SYSPRV. */ /* #define READ_SYSUAF */ @@ -192,7 +192,7 @@ extern double mth$dmod(double, double); /* If user asks for TERM, check first for EMACS_TERM. */ #define getenv sys_getenv - + /* Standard C abort is less useful than it should be. */ #define abort sys_abort diff --git a/src/scroll.c b/src/scroll.c index e6929113e8a..ccbc85ac8b2 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -232,13 +232,13 @@ calculate_scrolling (frame, matrix, window_size, lines_below, /* Perform insert-lines and delete-lines operations on CURRENT_MATRIX according to the costs in MATRIX, using the general scrolling method that is used if the terminal does not support the setting of - scroll windows (scroll_region_ok == 0). + scroll windows (scroll_region_ok == 0). WINDOW_SIZE is the number of lines being considered for scrolling and UNCHANGED_AT_TOP is the vpos of the first line being considered. These two arguments can specify any contiguous range of lines. */ - + static void do_scrolling (current_matrix, matrix, window_size, unchanged_at_top) struct glyph_matrix *current_matrix; @@ -258,7 +258,7 @@ do_scrolling (current_matrix, matrix, window_size, unchanged_at_top) struct queue *queue_start = (struct queue *) alloca (current_matrix->nrows * sizeof (struct queue)); struct queue *queue = queue_start; - + char *retained_p = (char *) alloca (window_size * sizeof (char)); int *copy_from = (int *) alloca (window_size * sizeof (int)); @@ -283,7 +283,7 @@ do_scrolling (current_matrix, matrix, window_size, unchanged_at_top) while (i > 0 || j > 0) { p = matrix + i * (window_size + 1) + j; - + if (p->insertcost < p->writecost && p->insertcost < p->deletecost) { /* Insert should be done at vpos i-1, plus maybe some before. @@ -365,7 +365,7 @@ do_scrolling (current_matrix, matrix, window_size, unchanged_at_top) } } while (queue > queue_start); - + } for (k = 0; k < window_size; ++k) @@ -377,7 +377,7 @@ do_scrolling (current_matrix, matrix, window_size, unchanged_at_top) /* Some sanity checks if GLYPH_DEBUG != 0. */ CHECK_MATRIX (current_matrix); - + if (terminal_window_p) set_terminal_window (0); } @@ -562,7 +562,7 @@ calculate_direct_scrolling (frame, matrix, window_size, lines_below, To reduce the cumulative effects of rounding error, we vary the position at which the difference is computed. */ cost1 += first_insert_cost[-j] - first_insert_cost[1-j] + - (delta-1) * (next_insert_cost[-j] - next_insert_cost[1-j]); + (delta-1) * (next_insert_cost[-j] - next_insert_cost[1-j]); } else { @@ -570,7 +570,7 @@ calculate_direct_scrolling (frame, matrix, window_size, lines_below, cost += scroll_overhead + first_delete_cost[-delta] + (delta-1) * (next_delete_cost[-delta] + extra_cost); cost1 += first_delete_cost[-i] - first_delete_cost[1-i] + - (delta-1) * ( next_delete_cost[-i] - next_delete_cost[1-i]); + (delta-1) * ( next_delete_cost[-i] - next_delete_cost[1-i]); } if (cost1 < cost) { @@ -641,7 +641,7 @@ calculate_direct_scrolling (frame, matrix, window_size, lines_below, and UNCHANGED_AT_TOP is the vpos of the first line being considered. These two arguments can specify any contiguous range of lines. - + In the direct scrolling method, a new scroll window is selected before each insertion or deletion, so that groups of lines can be scrolled directly to their final vertical positions. This method @@ -701,11 +701,11 @@ do_direct_scrolling (current_matrix, cost_matrix, window_size, without also decrementing i, this corresponds to omitting these lines in the new rows, i.e. rows are deleted. */ i = j = window_size; - + while (i > 0 || j > 0) { p = cost_matrix + i * (window_size + 1) + j; - + if (p->insertcost < p->writecost && p->insertcost < p->deletecost && (write_follows_p || i < j)) @@ -717,7 +717,7 @@ do_direct_scrolling (current_matrix, cost_matrix, window_size, queue->window = i; queue->pos = i - p->insertcount; ++queue; - + i -= p->insertcount; write_follows_p = 0; } @@ -736,7 +736,7 @@ do_direct_scrolling (current_matrix, cost_matrix, window_size, place they belong. */ int n_to_write = p->writecount; write_follows_p = 1; - xassert (n_to_write > 0); + xassert (n_to_write > 0); if (i > j) { @@ -822,7 +822,7 @@ scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, { calculate_direct_scrolling (frame, matrix, window_size, unchanged_at_bottom, - draw_cost, old_draw_cost, + draw_cost, old_draw_cost, old_hash, new_hash, free_at_end); do_direct_scrolling (frame->current_matrix, matrix, window_size, unchanged_at_top); @@ -1054,7 +1054,7 @@ do_line_insertion_deletion_costs (frame, (int *) xmalloc (FRAME_HEIGHT (frame) * sizeof (int)); FRAME_INSERTN_COST (frame) = (int *) xmalloc (FRAME_HEIGHT (frame) * sizeof (int)); - FRAME_DELETE_COST (frame) = + FRAME_DELETE_COST (frame) = (int *) xmalloc (FRAME_HEIGHT (frame) * sizeof (int)); } diff --git a/src/search.c b/src/search.c index cae2783c117..a9544a2db39 100644 --- a/src/search.c +++ b/src/search.c @@ -306,12 +306,12 @@ looking_at_1 (string, posix) } re_match_object = Qnil; - + i = re_match_2 (bufp, (char *) p1, s1, (char *) p2, s2, PT_BYTE - BEGV_BYTE, &search_regs, ZV_BYTE - BEGV_BYTE); immediate_quit = 0; - + if (i == -2) matcher_overflow (); @@ -390,7 +390,7 @@ string_match_1 (regexp, string, start, posix) STRING_MULTIBYTE (string)); immediate_quit = 1; re_match_object = string; - + val = re_search (bufp, (char *) SDATA (string), SBYTES (string), pos_byte, SBYTES (string) - pos_byte, @@ -458,7 +458,7 @@ fast_string_match (regexp, string) 0, STRING_MULTIBYTE (string)); immediate_quit = 1; re_match_object = string; - + val = re_search (bufp, (char *) SDATA (string), SBYTES (string), 0, SBYTES (string), 0); @@ -550,7 +550,7 @@ scan_buffer (target, start, end, count, shortage, allow_quit) int allow_quit; { struct region_cache *newline_cache; - int direction; + int direction; if (count > 0) { @@ -611,7 +611,7 @@ scan_buffer (target, start, end, count, shortage, allow_quit) ceiling_byte = min (tem, ceiling_byte); { - /* The termination address of the dumb loop. */ + /* The termination address of the dumb loop. */ register unsigned char *ceiling_addr = BYTE_POS_ADDR (ceiling_byte) + 1; register unsigned char *cursor @@ -856,7 +856,7 @@ find_before_next_newline (from, to, cnt) if (shortage == 0) pos--; - + return pos; } @@ -1062,7 +1062,7 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n, s2 = 0; } re_match_object = Qnil; - + while (n < 0) { int val; @@ -1528,7 +1528,7 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt, int infinity, limit, stride_for_teases = 0; register int *BM_tab; int *BM_tab_base; - register unsigned char *cursor, *p_limit; + register unsigned char *cursor, *p_limit; register int i, j; unsigned char *pat, *pat_end; int multibyte = ! NILP (current_buffer->enable_multibyte_characters); @@ -1561,14 +1561,14 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt, /* a single test, a test for having gone past the end of the */ /* permissible match region, to test for both possible matches (when */ /* the stride goes past the end immediately) and failure to */ - /* match (where you get nudged past the end one stride at a time). */ + /* match (where you get nudged past the end one stride at a time). */ /* Here we make a "mickey mouse" BM table. The stride of the search */ /* is determined only by the last character of the putative match. */ /* If that character does not match, we will stride the proper */ /* distance to propose a match that superimposes it on the last */ /* instance of a character that matches it (per trt), or misses */ - /* it entirely if there is none. */ + /* it entirely if there is none. */ dirlen = len_byte * direction; infinity = dirlen - (lim_byte + pos_byte + len_byte + len_byte) * direction; @@ -1656,7 +1656,7 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt, BM_tab[j] = dirlen - i; /* A translation table is accompanied by its inverse -- see */ - /* comment following downcase_table for details */ + /* comment following downcase_table for details */ if (this_translated) { int starting_ch = ch; @@ -1844,7 +1844,7 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt, /* This loop can be coded for space rather than */ /* speed because it will usually run only once. */ /* (the reach is at most len + 21, and typically */ - /* does not exceed len) */ + /* does not exceed len) */ while ((limit - pos_byte) * direction >= 0) pos_byte += BM_tab[FETCH_BYTE (pos_byte)]; /* now run the same tests to distinguish going off the */ @@ -1957,7 +1957,7 @@ wordify (string) for (i = 0, i_byte = 0; i < len; ) { int c; - + FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte); if (SYNTAX (c) != Sword) @@ -1992,7 +1992,7 @@ wordify (string) { int c; int i_byte_orig = i_byte; - + FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte); if (SYNTAX (c) == Sword) @@ -2360,7 +2360,7 @@ since only regular expressions have distinguished subexpressions. */) if (c == '\\') { FETCH_STRING_CHAR_ADVANCE (c, newtext, pos, pos_byte); - + if (c == '&') { substart = search_regs.start[sub]; @@ -2593,7 +2593,7 @@ since only regular expressions have distinguished subexpressions. */) /* Now move point "officially" to the start of the inserted replacement. */ move_if_not_intangible (newpoint); - + return Qnil; } @@ -2639,7 +2639,7 @@ Zero means the entire text matched by the whole regexp or whole string. */) Lisp_Object subexp; { return match_limit (subexp, 0); -} +} DEFUN ("match-data", Fmatch_data, Smatch_data, 0, 2, 0, doc: /* Return a list containing all info on what the last search matched. @@ -2687,7 +2687,7 @@ to hold all the values, and if INTEGERS is non-nil, no consing is done. */) last_thing_searched); data[2 * i + 1] = Fmake_marker (); Fset_marker (data[2 * i + 1], - make_number (search_regs.end[i]), + make_number (search_regs.end[i]), last_thing_searched); } else @@ -2740,7 +2740,7 @@ LIST should have been created by calling `match-data' previously. */) if (!CONSP (list) && !NILP (list)) list = wrong_type_argument (Qconsp, list); - /* Unless we find a marker with a buffer in LIST, assume that this + /* Unless we find a marker with a buffer in LIST, assume that this match data came from a string. */ last_thing_searched = Qt; @@ -2809,7 +2809,7 @@ LIST should have been created by calling `match-data' previously. */) list = Fcdr (list); } - return Qnil; + return Qnil; } /* If non-zero the match data have been saved in saved_search_regs @@ -2873,7 +2873,7 @@ DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0, in = SDATA (string); end = in + SBYTES (string); - out = temp; + out = temp; for (; in != end; in++) { @@ -2890,7 +2890,7 @@ DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0, out - temp, STRING_MULTIBYTE (string)); } - + void syms_of_search () { diff --git a/src/sunfns.c b/src/sunfns.c index e4e2e84da45..c1bae41c470 100644 --- a/src/sunfns.c +++ b/src/sunfns.c @@ -158,7 +158,7 @@ Redisplay does not happen if input is available before it starts. */) { struct timeval Timeout; int waitmask = 1; - + CHECK_NUMBER (n); Timeout.tv_sec = XINT(n) / 1000; Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000; @@ -178,7 +178,7 @@ Redisplay does not happen if input is available before it starts. */) /* * Sun sleep-for (allows a shorter interval than the regular sleep-for) */ -DEFUN ("sleep-for-millisecs", +DEFUN ("sleep-for-millisecs", Fsleep_for_millisecs, Ssleep_for_millisecs, 1, 1, 0, doc: /* Pause, without updating display, for ARG milliseconds. */) @@ -220,12 +220,12 @@ expressed as a string. If ICON is nil then the original arrow cursor is used. register short *p; register int i; Lisp_Object X_Hot, Y_Hot, Data; - + CHECK_GFX (Qnil); /* * If the icon is null, we just restore the DefaultCursor */ - if (NILP(Icon)) + if (NILP(Icon)) CurrentCursor = DefaultCursor; else { /* @@ -236,7 +236,7 @@ expressed as a string. If ICON is nil then the original arrow cursor is used. X_Hot = XVECTOR(Icon)->contents[0]; Y_Hot = XVECTOR(Icon)->contents[1]; Data = XVECTOR(Icon)->contents[2]; - + CHECK_NUMBER (X_Hot); CHECK_NUMBER (Y_Hot); CHECK_STRING (Data); @@ -267,7 +267,7 @@ sel_write (sel, file) struct selection *sel; FILE *file; { - fwrite (SDATA (Current_Selection), sizeof (char), + fwrite (SDATA (Current_Selection), sizeof (char), sel->sel_items, file); } @@ -285,7 +285,7 @@ sel_read (sel, file) { register int i, n; register char *cp; - + Current_Selection = make_string ("", 0); if (sel->sel_items <= 0) return (0); @@ -306,7 +306,7 @@ sel_read (sel, file) * The shelltool select saves newlines as carriage returns, * but emacs wants newlines. */ - for (i = 0; i < n; i++) + for (i = 0; i < n; i++) if (cp[i] == '\r') cp[i] = '\n'; Current_Selection = make_string (cp, n); @@ -379,16 +379,16 @@ sun_item_create (Pair) return menu_item; } -Menu +Menu sun_menu_create (Vector) Lisp_Object Vector; { Menu menu; int i; CHECK_VECTOR(Vector); - menu=menu_create(0); + menu=menu_create(0); for(i = 0; i < XVECTOR(Vector)->size; i++) { - menu_set (menu, MENU_APPEND_ITEM, + menu_set (menu, MENU_APPEND_ITEM, sun_item_create(XVECTOR(Vector)->contents[i]), 0); } return menu; @@ -445,7 +445,7 @@ as a menu label. */) Event event0; Event *event = &event0; Lisp_Object Value, Pair; - + CHECK_NUMBER(X_Position); CHECK_NUMBER(Y_Position); CHECK_LIVE_WINDOW(window); diff --git a/src/syntax.c b/src/syntax.c index 116249fe283..799f44d3c2f 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1774,7 +1774,7 @@ forw_comment (from, from_byte, stop, nesting, style, prev_syntax, } DEFUN ("forward-comment", Fforward_comment, Sforward_comment, 1, 1, 0, - doc: /* + doc: /* Move forward across up to COUNT comments. If COUNT is negative, move backward. Stop scanning if we find something other than a comment or whitespace. Set point to where scanning stops. diff --git a/src/syntax.h b/src/syntax.h index 4cbd2e2edf9..6d8f201baeb 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -90,7 +90,7 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int)); #endif /* SYNTAX_ENTRY fetches the information from the entry for character C - in syntax table TABLE, or from globally kept data (gl_state). + in syntax table TABLE, or from globally kept data (gl_state). Does inheritance. */ /* CURRENT_SYNTAX_TABLE gives the syntax table valid for current position, it is either the buffer's syntax table, or syntax table @@ -277,7 +277,7 @@ extern char syntax_code_spec[16]; search, or after the last position of the backward search. It makes sure that the first char is picked up with correct table, so one does not need to call UPDATE_SYNTAX_TABLE immediately after the - call. + call. Sign of COUNT gives the direction of the search. */ diff --git a/src/sysdep.c b/src/sysdep.c index 265cb61f393..1e4ed7576dd 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -391,7 +391,7 @@ init_baud_rate () emacs_ospeed = sg.c_cflag & CBAUD; #else /* neither VMS nor TERMIOS nor TERMIO */ struct sgttyb sg; - + sg.sg_ospeed = B9600; if (ioctl (input_fd, TIOCGETP, &sg) < 0) abort (); @@ -402,7 +402,7 @@ init_baud_rate () #endif /* not DOS_NT */ #endif /* not INIT_BAUD_RATE */ } - + baud_rate = (emacs_ospeed < sizeof baud_convert / sizeof baud_convert[0] ? baud_convert[emacs_ospeed] : 9600); if (baud_rate == 0) @@ -543,7 +543,7 @@ wait_for_termination (pid) * flush any pending output * (may flush input as well; it does not matter the way we use it) */ - + void flush_pending_output (channel) int channel; @@ -812,7 +812,7 @@ sys_subshell () save_signal_handlers (saved_handlers); synch_process_alive = 1; #endif /* __DJGPP__ > 1 */ -#else +#else pid = vfork (); if (pid == -1) error ("Can't spawn subshell"); @@ -1002,7 +1002,7 @@ unrequest_sigio () } #else /* not FASYNC, not STRIDE */ - + #ifdef _CX_UX #include <termios.h> @@ -1046,7 +1046,7 @@ request_sigio () croak ("request_sigio"); } - + void unrequest_sigio () { @@ -1258,7 +1258,7 @@ emacs_set_tty (fd, settings, flushp) || ioctl (fd, TIOCLSET, &settings->lmode) < 0) return -1; #endif - + /* We have survived the tempest. */ return 0; } @@ -1298,13 +1298,13 @@ unsigned char _sobuf[BUFSIZ+8]; char _sobuf[BUFSIZ]; #endif #endif - + #ifdef HAVE_LTCHARS static struct ltchars new_ltchars = {-1,-1,-1,-1,-1,-1}; #endif #ifdef HAVE_TCHARS static struct tchars new_tchars = {-1,-1,-1,-1,-1,-1}; -#endif +#endif void init_sys_modes () @@ -1413,7 +1413,7 @@ nil means don't delete them until `list-processes' is run. */); } else tty.main.c_iflag &= ~IXON; /* Disable start/stop output control */ - tty.main.c_oflag &= ~ONLCR; /* Disable map of NL to CR-NL + tty.main.c_oflag &= ~ONLCR; /* Disable map of NL to CR-NL on output */ tty.main.c_oflag &= ~TAB3; /* Disable tab expansion */ #ifdef CS8 @@ -1554,7 +1554,7 @@ nil means don't delete them until `list-processes' is run. */); anything, and leaving it in breaks the meta key. Go figure. */ tty.lmode &= ~LLITOUT; #endif - + #ifdef BSD4_1 lmode = tty.lmode; #endif @@ -1679,7 +1679,7 @@ nil means don't delete them until `list-processes' is run. */); /* Return nonzero if safe to use tabs in output. At the time this is called, init_sys_modes has not been done yet. */ - + int tabs_safe_p () { @@ -1715,7 +1715,7 @@ get_frame_size (widthp, heightp) #ifdef TIOCGSIZE /* SunOS - style. */ - struct ttysize size; + struct ttysize size; if (ioctl (input_fd, TIOCGSIZE, &size) == -1) *widthp = *heightp = 0; @@ -1729,7 +1729,7 @@ get_frame_size (widthp, heightp) #ifdef VMS struct sensemode tty; - + SYS$QIOW (0, input_fd, IO$_SENSEMODE, &tty, 0, 0, &tty.class, 12, 0, 0, 0, 0); *widthp = tty.scr_wid; @@ -1772,7 +1772,7 @@ set_window_size (fd, height, width) #ifdef TIOCSSIZE /* SunOS - style. */ - struct ttysize size; + struct ttysize size; size.ts_lines = height; size.ts_cols = width; @@ -1793,7 +1793,7 @@ void reset_sys_modes () { struct frame *sf; - + if (noninteractive) { fflush (stdout); @@ -1820,7 +1820,7 @@ reset_sys_modes () cursor_to (FRAME_HEIGHT (sf) - 1, 0); #if defined (IBMR2AIX) && defined (AIXHFT) { - /* HFT devices normally use ^J as a LF/CR. We forced it to + /* HFT devices normally use ^J as a LF/CR. We forced it to do the LF only. Now, we need to reset it. */ struct termio tty; @@ -1903,13 +1903,13 @@ setup_pty (fd) does this. Also it is known that telnet mode will hang in such a way that Emacs must be stopped (perhaps this is the same problem). - + If TIOCREMOTE is turned off, then there is a bug in hp-ux which sometimes loses data. Apparently the code which blocks the master process when the internal buffer fills up does not work. Other than this, though, everything else seems to work fine. - + Since the latter lossage is more benign, we may as well lose that way. -- cph */ #ifdef FIONBIO @@ -1941,7 +1941,7 @@ void init_vms_input () { int status; - + if (input_fd == 0) { status = SYS$ASSIGN (&input_dsc, &input_fd, 0, 0); @@ -2142,7 +2142,7 @@ sys_sleep (timeval) int time [2]; static int zero = 0; static int large = -10000000; - + LIB$EMUL (&timeval, &large, &zero, time); /* Convert to VMS format */ SYS$CANTIM (1, 0); @@ -2242,7 +2242,7 @@ start_of_text () * will be patched by unexec to the correct value. * */ - + #ifndef start_of_data char * start_of_data () @@ -2542,7 +2542,7 @@ sys_select (nfds, rfds, wfds, efds, timeout) /* Once a second, till the timer expires, check all the flagged read * descriptors to see if any input is available. If there is some then * set the corresponding bit in the return copy of rfds. - */ + */ while (1) { register int to_check, fd; @@ -2589,7 +2589,7 @@ sys_select (nfds, rfds, wfds, efds, timeout) signal (SIGALRM, select_alarm); select_alarmed = 0; alarm (SELECT_PAUSE); - + /* Wait for a SIGALRM (or maybe a SIGTINT) */ while (select_alarmed == 0 && *local_timeout != 0 && process_tick == update_tick) @@ -2607,10 +2607,10 @@ sys_select (nfds, rfds, wfds, efds, timeout) pause (); } (*local_timeout) -= SELECT_PAUSE; - + /* Reset the old alarm if there was one. */ turn_on_atimers (1); - + if (*local_timeout == 0) /* Stop on timer being cleared */ break; } @@ -3239,10 +3239,10 @@ emacs_open (path, oflag, mode) register int rtnval; #ifdef BSD4_1 - if (oflag & O_CREAT) + if (oflag & O_CREAT) return creat (path, mode); #endif - + while ((rtnval = open (path, oflag, mode)) == -1 && (errno == EINTR)); return (rtnval); @@ -3275,7 +3275,7 @@ emacs_read (fildes, buf, nbyte) unsigned int nbyte; { register int rtnval; - + while ((rtnval = read (fildes, buf, nbyte)) == -1 && (errno == EINTR)); return (rtnval); @@ -3415,7 +3415,7 @@ dup2 (oldd, newd) int newd; { register int fd, ret; - + emacs_close (newd); #ifdef F_DUPFD @@ -3444,7 +3444,7 @@ dup2 (oldd, newd) #ifndef VMS #ifndef HAVE_GETTIMEOFDAY #ifdef HAVE_TIMEVAL - + /* ARGSUSED */ int gettimeofday (tp, tzp) @@ -3453,18 +3453,18 @@ gettimeofday (tp, tzp) { extern long time (); - tp->tv_sec = time ((long *)0); + tp->tv_sec = time ((long *)0); tp->tv_usec = 0; if (tzp != 0) tzp->tz_minuteswest = -1; return 0; } - + #endif #endif #endif #endif /* subprocess && !HAVE_GETTIMEOFDAY && HAVE_TIMEVAL && !VMS */ - + /* * This function will go away as soon as all the stubs fixed. (fnf) */ @@ -3831,7 +3831,7 @@ vmserrstr (status) #ifdef access #undef access - + /* The following is necessary because 'access' emulation by VMS C (2.0) does * not work correctly. (It also doesn't work well in version 2.3.) */ @@ -3872,7 +3872,7 @@ sys_access (path, mode) * access can treat the directory like a file. */ if (directory_file_name (path, dir_fn)) path = dir_fn; - + if (mode == F_OK) return access (path, mode); if (user == NULL && (user = (char *) getenv ("USER")) == NULL) @@ -3886,7 +3886,7 @@ sys_access (path, mode) static int constant = ACL$C_FILE; DESCRIPTOR (path_desc, path); DESCRIPTOR (user_desc, user); - + flags = 0; acces = 0; if ((mode & X_OK) && ((stat = access (path, mode)) < 0 || mode == X_OK)) @@ -3951,7 +3951,7 @@ sys_access (filename, type) return access (filename, type); /* Check write protection. */ - + #define CHECKPRIV(bit) (prvmask.bit) #define WRITABLE(field) (! ((xab.xab$w_pro >> field) & XAB$M_NOWRITE)) @@ -4013,7 +4013,7 @@ sys_access (filename, type) } #endif /* not VMS4_4 */ #endif /* access */ - + static char vtbuf[NAM$C_MAXRSS+1]; /* translate a vms file spec to a unix path */ @@ -4054,7 +4054,7 @@ sys_translate_vms (vfile) *targ++ = '.'; *targ++ = '.'; break; - + default: *targ++ = *vfile; break; @@ -4147,7 +4147,7 @@ sys_translate_unix (ufile) ufile++; } *targ = '\0'; - + return utbuf; } @@ -4169,7 +4169,7 @@ getwd (pathname) } strcpy (pathname, ptr); xfree (ptr); - + return pathname; } @@ -4506,7 +4506,7 @@ sys_fwrite (ptr, size, num, fp) * when this is not the desired behavior, for instance, when writing an * auto save file (you only want one version), or when you don't have * write permission in the directory containing the file (but the file - * itself is writable). Hence this routine, which is equivalent to + * itself is writable). Hence this routine, which is equivalent to * "close (creat (fn, 0));" on Unix if fn already exists. */ int @@ -4563,7 +4563,7 @@ get_uaf_name (uname) register status; struct FAB uaf_fab; struct RAB uaf_rab; - + uaf_fab = cc$rms_fab; uaf_rab = cc$rms_rab; /* initialize fab fields */ @@ -4627,7 +4627,7 @@ get_uaf_uic (uic) register status; struct FAB uaf_fab; struct RAB uaf_rab; - + uaf_fab = cc$rms_fab; uaf_rab = cc$rms_rab; /* initialize fab fields */ @@ -4920,7 +4920,7 @@ rename (from, to) bits). To maintain portability, the VMS implementation of `chmod' wires the W and D bits together. */ - + static struct fibdef fib; /* We need this initialized to zero */ char vms_file_written[NAM$C_MAXRSS]; @@ -5088,7 +5088,7 @@ hft_init () /* If we're not on an HFT we shouldn't do any of this. We determine if we are on an HFT by trying to get an HFT error code. If this - call fails, we're not on an HFT. */ + call fails, we're not on an HFT. */ #ifdef IBMR2AIX if (ioctl (0, HFQERROR, &junk) < 0) return; diff --git a/src/syssignal.h b/src/syssignal.h index 2ea83b68b90..2a579f3ba45 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -96,7 +96,7 @@ extern SIGMASKTYPE sigprocmask_set; #ifdef USG #ifndef sigunblock -#define sigunblock(sig) +#define sigunblock(sig) #endif #else diff --git a/src/systime.h b/src/systime.h index 12c66b48605..d05b5a7de9a 100644 --- a/src/systime.h +++ b/src/systime.h @@ -81,7 +81,7 @@ extern time_t timezone; result in DEST. SRC should not be negative. EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and - stores the result in DEST. SRC should not be negative. + stores the result in DEST. SRC should not be negative. EMACS_TIME_NEG_P (TIME) is true iff TIME is negative. */ diff --git a/src/systty.h b/src/systty.h index fdd1f70f4c1..39ae61be1c9 100644 --- a/src/systty.h +++ b/src/systty.h @@ -112,7 +112,7 @@ static struct sensemode { #ifdef NEED_BSDTTY #include <sys/bsdtty.h> -#endif +#endif #if defined (HPUX) && defined (HAVE_PTYS) #include <sys/ptyio.h> diff --git a/src/syswait.h b/src/syswait.h index f317227b7ab..9b0a6899f87 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -90,7 +90,7 @@ Boston, MA 02111-1307, USA. */ #define WCOREDUMP(w) ((w&0200) != 0) #endif -#else +#else #ifdef BSD4_1 #include <wait.h> diff --git a/src/term.c b/src/term.c index 3add820421e..9fe490786ea 100644 --- a/src/term.c +++ b/src/term.c @@ -76,7 +76,7 @@ static void tty_hide_cursor P_ ((void)); tputs (a, (int) (FRAME_HEIGHT (XFRAME (selected_frame)) \ - curY), cmputc); \ } while (0) - + #define OUTPUT1_IF(a) do { if (a) tputs (a, 1, cmputc); } while (0) /* Function to use to ring the bell. */ @@ -203,7 +203,7 @@ void (*set_vertical_scroll_bar_hook) /* Arrange for all scroll bars on FRAME to be removed at the next call to `*judge_scroll_bars_hook'. A scroll bar may be spared if - `*redeem_scroll_bar_hook' is applied to its window before the judgment. + `*redeem_scroll_bar_hook' is applied to its window before the judgment. This should be applied to each frame each time its window tree is redisplayed, even if it is not displaying scroll bars at the moment; @@ -222,7 +222,7 @@ void (*condemn_scroll_bars_hook) P_ ((FRAME_PTR frame)); void (*redeem_scroll_bar_hook) P_ ((struct window *window)); /* Remove all scroll bars on FRAME that haven't been saved since the - last call to `*condemn_scroll_bars_hook'. + last call to `*condemn_scroll_bars_hook'. This should be applied to each frame after each time its window tree is redisplayed, even if it is not displaying scroll bars at the @@ -431,7 +431,7 @@ ring_bell () We don't specbind it, because that would carefully restore the bad value if there's an error and make the loop of errors happen anyway. */ - + function = Vring_bell_function; Vring_bell_function = Qnil; @@ -499,7 +499,7 @@ update_end (f) } else update_end_hook (f); - + updating_frame = NULL; } @@ -523,7 +523,7 @@ set_scroll_region (start, stop) { char *buf; struct frame *sf = XFRAME (selected_frame); - + if (TS_set_scroll_region) buf = tparam (TS_set_scroll_region, 0, 0, start, stop - 1); else if (TS_set_scroll_region_1) @@ -533,7 +533,7 @@ set_scroll_region (start, stop) FRAME_HEIGHT (sf)); else buf = tparam (TS_set_window, 0, 0, start, 0, stop, FRAME_WIDTH (sf)); - + OUTPUT (buf); xfree (buf); losecursor (); @@ -644,7 +644,7 @@ cursor_to (vpos, hpos) int vpos, hpos; { struct frame *f = updating_frame ? updating_frame : XFRAME (selected_frame); - + if (! FRAME_TERMCAP_P (f) && cursor_to_hook) { (*cursor_to_hook) (vpos, hpos); @@ -720,7 +720,7 @@ void clear_frame () { struct frame *sf = XFRAME (selected_frame); - + if (clear_frame_hook && ! FRAME_TERMCAP_P ((updating_frame ? updating_frame : sf))) { @@ -872,7 +872,7 @@ encode_terminal_code (src, dst, src_len, dst_len, consumed) coding->src_multibyte = STRING_MULTIBYTE (tbase[g]); } } - + result = encode_coding (coding, buf, dst, len, dst_end - dst); len -= coding->consumed; dst += coding->produced; @@ -895,7 +895,7 @@ encode_terminal_code (src, dst, src_len, dst_len, consumed) } src++; } - + *consumed = src - src_start; return (dst - dst_start); } @@ -933,17 +933,17 @@ write_glyphs (string, len) return; cmplus (len); - + /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at the tail. */ terminal_coding.mode &= ~CODING_MODE_LAST_BLOCK; - + while (len > 0) { /* Identify a run of glyphs with the same face. */ int face_id = string->face_id; int n; - + for (n = 1; n < len; ++n) if (string[n].face_id != face_id) break; @@ -977,7 +977,7 @@ write_glyphs (string, len) turn_off_face (f, face_id); turn_off_highlight (); } - + /* We may have to output some codes to terminate the writing. */ if (CODING_REQUIRE_FLUSHING (&terminal_coding)) { @@ -994,12 +994,12 @@ write_glyphs (string, len) termscript); } } - + cmcheckmagic (); } /* If start is zero, insert blanks instead of a string at start */ - + void insert_glyphs (start, len) register struct glyph *start; @@ -1087,7 +1087,7 @@ insert_glyphs (start, len) turn_off_highlight (); } } - + cmcheckmagic (); } @@ -1148,7 +1148,7 @@ ins_del_lines (vpos, n) } sf = XFRAME (selected_frame); - + /* If the lines below the insertion are being pushed into the end of the window, this is the same as clearing; and we know the lines are already clear, since the matching @@ -1462,7 +1462,7 @@ static char **term_get_fkeys_arg; static Lisp_Object term_get_fkeys_1 (); /* Find the escape codes sent by the function keys for Vfunction_key_map. - This function scans the termcap function key sequence entries, and + This function scans the termcap function key sequence entries, and adds entries to Vfunction_key_map for each function key it finds. */ void @@ -1567,7 +1567,7 @@ term_get_fkeys_1 () Fmake_vector (make_number (1), \ intern (sym))); \ } - + /* if there's no key_next keycap, map key_npage to `next' keysym */ CONDITIONAL_REASSIGN ("%5", "kN", "next"); /* if there's no key_prev keycap, map key_ppage to `previous' keysym */ @@ -1607,7 +1607,7 @@ static void append_glyph P_ ((struct it *)); for which to produce glyphs; IT->face_id contains the character's face. Padding glyphs are appended if IT->c has a IT->pixel_width > 1. */ - + static void append_glyph (it) struct it *it; @@ -1620,8 +1620,8 @@ append_glyph (it) + it->glyph_row->used[it->area]); end = it->glyph_row->glyphs[1 + it->area]; - for (i = 0; - i < it->pixel_width && glyph < end; + for (i = 0; + i < it->pixel_width && glyph < end; ++i) { glyph->type = CHAR_GLYPH; @@ -1631,7 +1631,7 @@ append_glyph (it) glyph->padding_p = i > 0; glyph->charpos = CHARPOS (it->position); glyph->object = it->object; - + ++it->glyph_row->used[it->area]; ++glyph; } @@ -1656,7 +1656,7 @@ append_glyph (it) Callers usually don't call produce_glyphs directly; instead they use the macro PRODUCE_GLYPHS. */ -void +void produce_glyphs (it) struct it *it; { @@ -1665,7 +1665,7 @@ produce_glyphs (it) || it->what == IT_COMPOSITION || it->what == IT_IMAGE || it->what == IT_STRETCH); - + /* Nothing but characters are supported on terminal frames. For a composition sequence, it->c is the first character of the sequence. */ @@ -1684,8 +1684,8 @@ produce_glyphs (it) { int absolute_x = (it->current_x + it->continuation_lines_width); - int next_tab_x - = (((1 + absolute_x + it->tab_width - 1) + int next_tab_x + = (((1 + absolute_x + it->tab_width - 1) / it->tab_width) * it->tab_width); int nspaces; @@ -1696,17 +1696,17 @@ produce_glyphs (it) continued line. So, we will get the right number of spaces here. */ nspaces = next_tab_x - absolute_x; - + if (it->glyph_row) { int n = nspaces; - + it->c = ' '; it->pixel_width = it->len = 1; - + while (n--) append_glyph (it); - + it->c = '\t'; } @@ -1734,12 +1734,12 @@ produce_glyphs (it) it->pixel_width = CHARSET_WIDTH (charset); it->nglyphs = it->pixel_width; - + if (it->glyph_row) append_glyph (it); } - /* Advance current_x by the pixel width as a convenience for + /* Advance current_x by the pixel width as a convenience for the caller. */ if (it->area == TEXT_AREA) it->current_x += it->pixel_width; @@ -1760,7 +1760,7 @@ produce_special_glyphs (it, what) enum display_element_type what; { struct it temp_it; - + temp_it = *it; temp_it.dp = NULL; temp_it.what = IT_CHARACTER; @@ -1780,7 +1780,7 @@ produce_special_glyphs (it, what) } else temp_it.c = '\\'; - + produce_glyphs (&temp_it); it->pixel_width = temp_it.pixel_width; it->nglyphs = temp_it.pixel_width; @@ -1797,7 +1797,7 @@ produce_special_glyphs (it, what) } else temp_it.c = '$'; - + produce_glyphs (&temp_it); it->pixel_width = temp_it.pixel_width; it->nglyphs = temp_it.pixel_width; @@ -1918,7 +1918,7 @@ turn_on_face (f, face_id) if (TN_max_colors > 0) { char *p; - + if (fg >= 0 && TS_set_foreground) { p = tparam (TS_set_foreground, NULL, 0, (int) fg); @@ -1934,7 +1934,7 @@ turn_on_face (f, face_id) } } } - + /* Turn off appearances of face FACE_ID on tty frame F. */ @@ -1986,8 +1986,8 @@ turn_off_face (f, face_id) && face->background != FACE_TTY_DEFAULT_BG_COLOR))) OUTPUT1_IF (TS_orig_pair); } - - + + /* Return non-zero if the terminal on frame F supports all of the capabilities in CAPS simultaneously, with foreground and background colors FG and BG. */ @@ -2316,7 +2316,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", TS_cursor_visible = tgetstr ("vs", address); TS_cursor_invisible = tgetstr ("vi", address); TS_set_window = tgetstr ("wi", address); - + TS_enter_underline_mode = tgetstr ("us", address); TS_exit_underline_mode = tgetstr ("ue", address); TS_enter_bold_mode = tgetstr ("md", address); @@ -2326,7 +2326,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", TS_enter_alt_charset_mode = tgetstr ("as", address); TS_exit_alt_charset_mode = tgetstr ("ae", address); TS_exit_attribute_mode = tgetstr ("me", address); - + MultiUp = tgetstr ("UP", address); MultiDown = tgetstr ("DO", address); MultiLeft = tgetstr ("LE", address); @@ -2346,10 +2346,10 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", TS_set_foreground = tgetstr ("Sf", address); TS_set_background = tgetstr ("Sb", address); } - + TN_max_colors = tgetnum ("Co"); TN_max_pairs = tgetnum ("pa"); - + TN_no_color_video = tgetnum ("NC"); if (TN_no_color_video == -1) TN_no_color_video = 0; @@ -2387,7 +2387,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", SET_FRAME_WIDTH (sf, FRAME_WIDTH (sf)); if (FRAME_HEIGHT (sf) <= 0) FRAME_HEIGHT (sf) = tgetnum ("li"); - + if (FRAME_HEIGHT (sf) < 3 || FRAME_WIDTH (sf) < 3) fatal ("Screen size %dx%d is too small", FRAME_HEIGHT (sf), FRAME_WIDTH (sf)); @@ -2414,7 +2414,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", if (TabWidth < 0) TabWidth = 8; - + /* Turned off since /etc/termcap seems to have :ta= for most terminals and newer termcap doc does not seem to say there is a default. if (!Wcm.cm_tab) diff --git a/src/termhooks.h b/src/termhooks.h index 443e4c69331..5a5dc7cdaf7 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -162,7 +162,7 @@ extern void (*set_vertical_scroll_bar_hook) /* Arrange for all scroll bars on FRAME to be removed at the next call to `*judge_scroll_bars_hook'. A scroll bar may be spared if - `*redeem_scroll_bar_hook' is applied to its window before the judgement. + `*redeem_scroll_bar_hook' is applied to its window before the judgement. This should be applied to each frame each time its window tree is redisplayed, even if it is not displaying scroll bars at the moment; @@ -179,7 +179,7 @@ extern void (*condemn_scroll_bars_hook) P_ ((struct frame *frame)); extern void (*redeem_scroll_bar_hook) P_ ((struct window *window)); /* Remove all scroll bars on FRAME that haven't been saved since the - last call to `*condemn_scroll_bars_hook'. + last call to `*condemn_scroll_bars_hook'. This should be applied to each frame after each time its window tree is redisplayed, even if it is not displaying scroll bars at the @@ -241,8 +241,8 @@ enum event_kind .timestamp gives a timestamp (in milliseconds) for the click. */ #if defined(WINDOWSNT) || defined(MAC_OSX) - MOUSE_WHEEL_EVENT, /* A mouse-wheel event is generated - on WINDOWSNT or MAC_OSX by a + MOUSE_WHEEL_EVENT, /* A mouse-wheel event is generated + on WINDOWSNT or MAC_OSX by a wheel on a mouse (e.g., MS Intellimouse). The event contains a delta that corresponds to the amount and direction that the wheel @@ -298,7 +298,7 @@ enum event_kind files selected outside of Emacs are dropped onto an Emacs window. Currently used only on Windows NT. - .modifiers holds the state of the + .modifiers holds the state of the modifier keys. .x and .y give the mouse position, in characters, within the window. @@ -346,7 +346,7 @@ struct input_event { /* What kind of event was this? */ enum event_kind kind; - + /* For an ASCII_KEYSTROKE_EVENT and MULTIBYTE_CHAR_KEYSTROKE_EVENT, this is the character. For a NON_ASCII_KEYSTROKE_EVENT, this is the keysym code. @@ -386,7 +386,7 @@ extern void (*frame_up_to_date_hook) P_ ((struct frame *)); /* Bits in the modifiers member of the input_event structure. Note that reorder_modifiers assumes that the bits are in canonical - order. + order. The modifiers applied to mouse clicks are rather ornate. The window-system-specific code should store mouse clicks with diff --git a/src/tparam.c b/src/tparam.c index 844e5f6f175..fb71e05b3e4 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -169,7 +169,7 @@ tparam1 (string, outstring, len, up, left, argp) outlen *= 2; new = (char *) xrealloc (outstring, outlen); } - + op = new + offset; outend = new + outlen; outstring = new; diff --git a/src/undo.c b/src/undo.c index f378ce8aae7..fa802fe205a 100644 --- a/src/undo.c +++ b/src/undo.c @@ -81,7 +81,7 @@ record_point (pt) if (MODIFF <= SAVE_MODIFF) record_first_change (); - /* If we are just after an undo boundary, and + /* If we are just after an undo boundary, and point wasn't at start of deleted range, record where it was. */ if (at_boundary && last_point_position != pt @@ -175,7 +175,7 @@ record_marker_adjustment (marker, adjustment) if (NILP (pending_boundary)) pending_boundary = Fcons (Qnil, Qnil); - if (!BUFFERP (last_undo_buffer) + if (!BUFFERP (last_undo_buffer) || current_buffer != XBUFFER (last_undo_buffer)) Fundo_boundary (); XSETBUFFER (last_undo_buffer, current_buffer); @@ -312,7 +312,7 @@ truncate_undo_list (list, minsize, maxsize) If the first element is an undo boundary, skip past it. Skip, skip, skip the undo, skip, skip, skip the undo, - Skip, skip, skip the undo, skip to the undo bound'ry. + Skip, skip, skip the undo, skip to the undo bound'ry. (Get it? "Skip to my Loo?") */ if (CONSP (next) && NILP (XCAR (next))) { @@ -402,7 +402,7 @@ Return what remains of the list. */) Lisp_Object next; int count = SPECPDL_INDEX (); register int arg; - + #if 0 /* This is a good feature, but would make undo-start unable to do what is expected. */ Lisp_Object tem; diff --git a/src/unexaix.c b/src/unexaix.c index 17df5b5174b..3c629346bc0 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -175,7 +175,7 @@ int unexec (char *new_name, char *a_name, || unrelocate_symbols (new, a_out, a_name, new_name) < 0) { close (new); - return -1; + return -1; } close (new); @@ -358,7 +358,7 @@ make_hdr (int new, int a_out, s->s_scnptr += bias; ptr = s->s_scnptr; } - + ptr = ptr + s->s_size; } } @@ -413,7 +413,7 @@ make_hdr (int new, int a_out, } /* **************************************************************** - + * * Copy the text and data segments from memory to the new a.out */ @@ -589,7 +589,7 @@ unrelocate_symbols (int new, int a_out, char *a_name, char *new_name) #ifndef ALIGN_DATA_RELOC ulong d_reloc = (ulong) &_data - f_ohdr.data_start; #else - /* This worked (and was needed) before AIX 4.2. + /* This worked (and was needed) before AIX 4.2. I have no idea why. -- Mike */ ulong d_reloc = (ulong) &_data - ALIGN(f_ohdr.data_start, 2); #endif diff --git a/src/unexalpha.c b/src/unexalpha.c index e4eed3922bd..5eada5e0d0f 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c @@ -486,9 +486,9 @@ update_dynamic_symbols (old, new_name, new, aout) fprintf (stderr, "...relocated\n"); #endif - if (rd_base[i].type == R_REFLONG) + if (rd_base[i].type == R_REFLONG) len = 4; - else if (rd_base[i].type == R_REFQUAD) + else if (rd_base[i].type == R_REFQUAD) len = 8; else fatal_unexec ("unrecognized relocation type in .dyn.rel section (symbol #%d)", (char *) i); diff --git a/src/unexconvex.c b/src/unexconvex.c index 3197e21a6ef..a040add1224 100644 --- a/src/unexconvex.c +++ b/src/unexconvex.c @@ -137,7 +137,7 @@ before writing it (above and beyond the number of bytes of actual program text). HDR's standard fields are already correct, except that this adjustment to the `a_text' field has not yet been made; thus, the amount of offset can depend on the data in the file. - + * A_TEXT_SEEK(HDR) If defined, this macro specifies the number of bytes to seek into the @@ -244,7 +244,7 @@ unsigned data_start, bss_start, entry_address; || copy_text_and_data (new) < 0 || copy_sym (new, a_out, a_name, new_name) < 0 ) { close (new); - return -1; + return -1; } close (new); diff --git a/src/unexec.c b/src/unexec.c index 82427568595..e6bcb635faa 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -134,7 +134,7 @@ before writing it (above and beyond the number of bytes of actual program text). HDR's standard fields are already correct, except that this adjustment to the `a_text' field has not yet been made; thus, the amount of offset can depend on the data in the file. - + * A_TEXT_SEEK(HDR) If defined, this macro specifies the number of bytes to seek into the @@ -399,7 +399,7 @@ unexec (new_name, a_name, data_start, bss_start, entry_address) { close (new); /* unlink (new_name); /* Failed, unlink new a.out */ - return -1; + return -1; } close (new); @@ -992,7 +992,7 @@ copy_text_and_data (new, a_out) char c; int mcount_address, mcount_offset, count; extern char *_execname; - + /* The use of _execname is incompatible with RISCiX 1.1 */ sprintf (command, "nm %s | fgrep mcount", _execname); @@ -1012,7 +1012,7 @@ copy_text_and_data (new, a_out) { sprintf (errbuf, "Failed to execute the command '%s'\n", command); PERROR (errbuf); - } + } sscanf(address_text, "%x", &mcount_address); ptr = (char *) unexec_text_start; diff --git a/src/unexenix.c b/src/unexenix.c index 10413bd65a0..2121c26839f 100644 --- a/src/unexenix.c +++ b/src/unexenix.c @@ -187,7 +187,7 @@ unexec (new_name, a_name, data_start, bss_start, entry_address) WRITE (outfd, data_org, datalen, "write error on %s", new_name); - for (i = 2, segpos += (2 * sizeof (struct xseg)); + for (i = 2, segpos += (2 * sizeof (struct xseg)); i < nsegs; i++, segpos += sizeof (struct xseg)) { diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c index 686a1ed1ebb..0948ccf9a18 100644 --- a/src/unexhp9k800.c +++ b/src/unexhp9k800.c @@ -13,25 +13,25 @@ area with the current data area. When the new file is executed, the process will see the same data structures and data values that the original process had when unexec was called. - + Unlike other versions of unexec, this one copies symbol table and debug information to the new a.out file. Thus, the new a.out file may be debugged with symbolic debuggers. - + If you fix any bugs in this, I'd like to incorporate your fixes. Send them to uunet!hpda!hpsemc!jmorris or jmorris%hpsemc@hplabs.HP.COM. - + CAVEATS: This routine saves the current value of all static and external variables. This means that any data structure that needs to be initialized must be explicitly reset. Variables will not have their expected default values. - + Unfortunately, the HP-UX signal handler has internal initialization flags which are not explicitly reset. Thus, for signals to work in conjunction with this routine, the following code must executed when the new process starts up. - + void _sigreturn (); ... sigsetreturn (_sigreturn); @@ -54,7 +54,7 @@ /* brk value to restore, stored as a global. This is really used only if we used shared libraries. */ static long brk_on_dump = 0; - + /* Called from main, if we use shared libraries. */ int run_time_remap (ignored) @@ -81,14 +81,14 @@ unexec (new_name, old_name, new_end_of_text, dummy1, dummy2) struct header hdr; struct som_exec_auxhdr auxhdr; long i; - + /* For the greatest flexibility, should create a temporary file in the same directory as the new file. When everything is complete, rename the temp file to the new name. This way, a program could update its own a.out file even while it is still executing. If problems occur, everything is still intact. NOT implemented. */ - + /* Open the input and output a.out files */ old = open (old_name, O_RDONLY); if (old < 0) @@ -96,36 +96,36 @@ unexec (new_name, old_name, new_end_of_text, dummy1, dummy2) new = open (new_name, O_CREAT|O_RDWR|O_TRUNC, 0777); if (new < 0) { perror (new_name); exit (1); } - + /* Read the old headers */ read_header (old, &hdr, &auxhdr); brk_on_dump = (long) sbrk (0); - + /* Decide how large the new and old data areas are */ old_size = auxhdr.exec_dsize; /* I suspect these two statements are separate to avoid a compiler bug in hpux version 8. */ i = (long) sbrk (0); new_size = i - auxhdr.exec_dmem; - + /* Copy the old file to the new, up to the data space */ lseek (old, 0, 0); copy_file (old, new, auxhdr.exec_dfile); - + /* Skip the old data segment and write a new one */ lseek (old, old_size, 1); save_data_space (new, &hdr, &auxhdr, new_size); - + /* Copy the rest of the file */ copy_rest (old, new); - + /* Update file pointers since we probably changed size of data area */ update_file_ptrs (new, &hdr, &auxhdr, auxhdr.exec_dfile, new_size-old_size); - + /* Save the modified header */ write_header (new, &hdr, &auxhdr); - + /* Close the binary file */ close (old); close (new); @@ -143,7 +143,7 @@ save_data_space (file, hdr, auxhdr, size) /* Write the entire data space out to the file */ if (write (file, auxhdr->exec_dmem, size) != size) { perror ("Can't save new data space"); exit (1); } - + /* Update the header to reflect the new data size */ auxhdr->exec_dsize = size; auxhdr->exec_bsize = 0; @@ -160,10 +160,10 @@ update_file_ptrs (file, hdr, auxhdr, location, offset) { struct subspace_dictionary_record subspace; int i; - + /* Increase the overall size of the module */ hdr->som_length += offset; - + /* Update the various file pointers in the header */ #define update(ptr) if (ptr > location) ptr = ptr + offset update (hdr->aux_header_location); @@ -176,16 +176,16 @@ update_file_ptrs (file, hdr, auxhdr, location, offset) update (hdr->unloadable_sp_location); update (auxhdr->exec_tfile); update (auxhdr->exec_dfile); - + /* Do for each subspace dictionary entry */ lseek (file, hdr->subspace_location, 0); for (i = 0; i < hdr->subspace_total; i++) { if (read (file, &subspace, sizeof (subspace)) != sizeof (subspace)) { perror ("Can't read subspace record"); exit (1); } - + /* If subspace has a file location, update it */ - if (subspace.initialization_length > 0 + if (subspace.initialization_length > 0 && subspace.file_loc_init_value > location) { subspace.file_loc_init_value += offset; @@ -193,8 +193,8 @@ update_file_ptrs (file, hdr, auxhdr, location, offset) if (write (file, &subspace, sizeof (subspace)) != sizeof (subspace)) { perror ("Can't update subspace record"); exit (1); } } - } - + } + /* Do for each initialization pointer record */ /* (I don't think it applies to executable files, only relocatables) */ #undef update @@ -207,25 +207,25 @@ read_header (file, hdr, auxhdr) struct header *hdr; struct som_exec_auxhdr *auxhdr; { - + /* Read the header in */ lseek (file, 0, 0); if (read (file, hdr, sizeof (*hdr)) != sizeof (*hdr)) { perror ("Couldn't read header from a.out file"); exit (1); } - + if (hdr->a_magic != EXEC_MAGIC && hdr->a_magic != SHARE_MAGIC && hdr->a_magic != DEMAND_MAGIC) { - fprintf (stderr, "a.out file doesn't have legal magic number\n"); - exit (1); + fprintf (stderr, "a.out file doesn't have legal magic number\n"); + exit (1); } - + lseek (file, hdr->aux_header_location, 0); if (read (file, auxhdr, sizeof (*auxhdr)) != sizeof (*auxhdr)) { perror ("Couldn't read auxiliary header from a.out file"); exit (1); - } + } } /* Write out the header records into an a.out file. */ @@ -237,7 +237,7 @@ write_header (file, hdr, auxhdr) { /* Update the checksum */ hdr->checksum = calculate_checksum (hdr); - + /* Write the header back into the a.out file */ lseek (file, 0, 0); if (write (file, hdr, sizeof (*hdr)) != sizeof (*hdr)) @@ -253,12 +253,12 @@ calculate_checksum (hdr) struct header *hdr; { int checksum, i, *ptr; - + checksum = 0; ptr = (int *) hdr; - + for (i = 0; i < sizeof (*hdr) / sizeof (int) - 1; i++) checksum ^= ptr[i]; - + return (checksum); } @@ -270,7 +270,7 @@ copy_file (old, new, size) { int len; int buffer[8192]; /* word aligned will be faster */ - + for (; size > 0; size -= len) { len = min (size, sizeof (buffer)); @@ -288,11 +288,11 @@ copy_rest (old, new) { int buffer[4096]; int len; - + /* Copy bytes until end of file or error */ while ((len = read (old, buffer, sizeof (buffer))) > 0) if (write (new, buffer, len) != len) break; - + if (len != 0) { perror ("Unable to copy the rest of the file"); exit (1); } } @@ -304,7 +304,7 @@ display_header (hdr, auxhdr) { /* Display the header information (debug) */ printf ("\n\nFILE HEADER\n"); - printf ("magic number %d \n", hdr->a_magic); + printf ("magic number %d \n", hdr->a_magic); printf ("text loc %.8x size %d \n", auxhdr->exec_tmem, auxhdr->exec_tsize); printf ("data loc %.8x size %d \n", auxhdr->exec_dmem, auxhdr->exec_dsize); printf ("entry %x \n", auxhdr->exec_entry); diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 03aafd2912a..4f1c29b1ef8 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -276,7 +276,7 @@ print_regions () if (object_name != MACH_PORT_NULL) mach_port_deallocate (target_task, object_name); - + address += size; } } @@ -329,15 +329,15 @@ build_region_list () else { r = (struct region_t *) malloc (sizeof (struct region_t)); - + if (!r) unexec_error ("cannot allocate region structure"); - + r->address = address; r->size = size; r->protection = info.protection; r->max_protection = info.max_protection; - + r->next = 0; if (region_list_head == 0) { @@ -349,13 +349,13 @@ build_region_list () region_list_tail->next = r; region_list_tail = r; } - + /* Deallocate (unused) object name returned by vm_region. */ if (object_name != MACH_PORT_NULL) mach_port_deallocate (target_task, object_name); } - + address += size; } @@ -498,7 +498,7 @@ read_load_commands () nlc = mh.ncmds; lca = (struct load_command **) malloc (nlc * sizeof (struct load_command *)); - + for (i = 0; i < nlc; i++) { struct load_command lc; @@ -513,7 +513,7 @@ read_load_commands () if (lc.cmd == LC_SEGMENT) { struct segment_command *scp = (struct segment_command *) lca[i]; - + if (scp->vmaddr + scp->vmsize > infile_lc_highest_addr) infile_lc_highest_addr = scp->vmaddr + scp->vmsize; @@ -647,7 +647,7 @@ copy_data_segment (struct load_command *lc) } else unexec_error ("unrecognized section name in __DATA segment"); - + printf (" section %-16.16s at %#8x - %#8x (sz: %#8x)\n", sectp->sectname, sectp->offset, sectp->offset + sectp->size, sectp->size); @@ -675,7 +675,7 @@ copy_data_segment (struct load_command *lc) for (j = 0; j < num_unexec_regions; j++) { struct segment_command sc; - + sc.cmd = LC_SEGMENT; sc.cmdsize = sizeof (struct segment_command); strncpy (sc.segname, SEG_DATA, 16); @@ -687,7 +687,7 @@ copy_data_segment (struct load_command *lc) sc.initprot = VM_PROT_READ | VM_PROT_WRITE; sc.nsects = 0; sc.flags = 0; - + printf ("Writing segment %-16.16s at %#8x - %#8x (sz: %#8x)\n", sc.segname, sc.fileoff, sc.fileoff + sc.filesize, sc.filesize); @@ -696,7 +696,7 @@ copy_data_segment (struct load_command *lc) unexec_error ("cannot write new __DATA segment"); delta += sc.filesize; file_offset += sc.filesize; - + if (!unexec_write (curr_header_offset, &sc, sc.cmdsize)) unexec_error ("cannot write new __DATA segment's header"); curr_header_offset += sc.cmdsize; @@ -850,7 +850,7 @@ unexec (char *outfile, char *infile, void *start_data, void *start_bss, { unexec_error ("cannot open input file `%s'", infile); } - + outfd = open (outfile, O_WRONLY | O_TRUNC | O_CREAT, 0755); if (outfd < 0) { diff --git a/src/unexnext.c b/src/unexnext.c index f17dd8e9ee7..649d0e0226f 100644 --- a/src/unexnext.c +++ b/src/unexnext.c @@ -44,7 +44,7 @@ int malloc_cookie; * pages it vm_allocated and write only those out into the data segment. * * This kludge may break when we stop using fixed virtual address - * shared libraries. Actually, emacs will probably continue working, but be + * shared libraries. Actually, emacs will probably continue working, but be * much larger on disk than it needs to be (because non-malloced data will * be in the file). */ @@ -73,7 +73,7 @@ grow( *the_commands = malloc(sizeof(*the_commands)); } else { (*the_commands_len)++; - *the_commands = realloc(*the_commands, + *the_commands = realloc(*the_commands, (*the_commands_len * sizeof(**the_commands))); } @@ -125,7 +125,7 @@ read_macho( return (0); } for (i = 0; i < the_header->ncmds; i++) { - if (read(fd, &command, sizeof(struct load_command)) != + if (read(fd, &command, sizeof(struct load_command)) != sizeof(struct load_command)) { fatal_unexec("cannot read macho load command header"); return (0); @@ -138,8 +138,8 @@ read_macho( buf = malloc(command.cmdsize); buf->cmd = command.cmd; buf->cmdsize = command.cmdsize; - if (read(fd, ((char *)buf + - sizeof(struct load_command)), + if (read(fd, ((char *)buf + + sizeof(struct load_command)), size) != size) { fatal_unexec("cannot read load command data"); return (0); @@ -184,31 +184,31 @@ get_data_region( region.address = 0; *address = 0; for (;;) { - ret = vm_region(task_self(), - ®ion.address, - ®ion.size, - ®ion.protection, - ®ion.max_protection, + ret = vm_region(task_self(), + ®ion.address, + ®ion.size, + ®ion.protection, + ®ion.max_protection, ®ion.inheritance, - ®ion.shared, - ®ion.object_name, + ®ion.shared, + ®ion.object_name, ®ion.offset); if (ret != KERN_SUCCESS || region.address >= VM_HIGHDATA) { break; } if (*address != 0) { if (region.address > *address + *size) { - if (!filldatagap(*address, size, + if (!filldatagap(*address, size, region.address)) { return (0); } - } + } *size += region.size; } else { if (region.address == sect->addr) { *address = region.address; *size = region.size; - } + } } region.address += region.size; } @@ -293,7 +293,7 @@ unexec_doit( if (strcmp(segment->segname, SEG_DATA) == 0) { fdatastart = segment->fileoff; fdatasize = segment->filesize; - fgrowth = (data_size - + fgrowth = (data_size - segment->filesize); segment->vmsize = data_size; segment->filesize = data_size; @@ -332,37 +332,37 @@ unexec_doit( break; } } - + /* * Write header */ - if (write(outfd, &the_header, + if (write(outfd, &the_header, sizeof(the_header)) != sizeof(the_header)) { fatal_unexec("cannot write output file"); return (0); } - + /* * Write commands */ for (i = 0; i < the_commands_len; i++) { - if (write(outfd, the_commands[i], - the_commands[i]->cmdsize) != + if (write(outfd, the_commands[i], + the_commands[i]->cmdsize) != the_commands[i]->cmdsize) { fatal_unexec("cannot write output file"); return (0); } } - + /* * Write original text */ - if (lseek(infd, the_header.sizeofcmds + sizeof(the_header), + if (lseek(infd, the_header.sizeofcmds + sizeof(the_header), L_SET) < 0) { fatal_unexec("cannot seek input file"); return (0); } - size = fdatastart - (sizeof(the_header) + + size = fdatastart - (sizeof(the_header) + the_header.sizeofcmds); buf = my_malloc(size); if (read(infd, buf, size) != size) { @@ -375,17 +375,17 @@ unexec_doit( return (0); } my_free(buf, size); - - + + /* * Write new data */ - if (write(outfd, (char *)data_address, + if (write(outfd, (char *)data_address, data_size) != data_size) { fatal_unexec("cannot write output file"); return (0); } - + } /* @@ -424,7 +424,7 @@ unexec_doit( fatal_unexec("cannot seek input file"); return (0); } - + for (i = 0; i < nextrel; i++) { long zeroval = 0; @@ -482,7 +482,7 @@ unexec( fatal_unexec("cannot open input file `%s'", infile); exit(1); } - + tmpnam(tmpbuf); tmpfile = rindex(tmpbuf, '/'); if (tmpfile == NULL) { diff --git a/src/unexsni.c b/src/unexsni.c index c819b0b7938..c9abec07e17 100644 --- a/src/unexsni.c +++ b/src/unexsni.c @@ -90,24 +90,24 @@ what you give them. Help stamp out software-hoarding! */ * is made the last in the table to avoid changing any existing index. */ -/* Modified by wtien@urbana.mcd.mot.com of Motorola Inc. - * +/* Modified by wtien@urbana.mcd.mot.com of Motorola Inc. + * * The above mechanism does not work if the unexeced ELF file is being - * re-layout by other applications (such as `strip'). All the applications + * re-layout by other applications (such as `strip'). All the applications * that re-layout the internal of ELF will layout all sections in ascending - * order of their file offsets. After the re-layout, the data2 section will - * still be the LAST section in the section header vector, but its file offset + * order of their file offsets. After the re-layout, the data2 section will + * still be the LAST section in the section header vector, but its file offset * is now being pushed far away down, and causes part of it not to be mapped - * in (ie. not covered by the load segment entry in PHDR vector), therefore + * in (ie. not covered by the load segment entry in PHDR vector), therefore * causes the new binary to fail. * * The solution is to modify the unexec algorithm to insert the new data2 * section header right before the new bss section header, so their file - * offsets will be in the ascending order. Since some of the section's (all - * sections AFTER the bss section) indexes are now changed, we also need to - * modify some fields to make them point to the right sections. This is done + * offsets will be in the ascending order. Since some of the section's (all + * sections AFTER the bss section) indexes are now changed, we also need to + * modify some fields to make them point to the right sections. This is done * by macro PATCH_INDEX. All the fields that need to be patched are: - * + * * 1. ELF header e_shstrndx field. * 2. section header sh_link and sh_info field. * 3. symbol table entry st_shndx field. @@ -124,7 +124,7 @@ what you give them. Help stamp out software-hoarding! */ * * /home1/marco/emacs/emacs-19.22/src * dump -hv temacs - * + * * temacs: * * **** SECTION HEADER TABLE **** @@ -132,83 +132,83 @@ what you give them. Help stamp out software-hoarding! */ * Link Info Adralgn Entsize * * [1] PBIT -A-- 0x4000f4 0xf4 0x13 .interp - * 0 0 0x1 0 + * 0 0 0x1 0 * * [2] REGI -A-- 0x400108 0x108 0x18 .reginfo - * 0 0 0x4 0x18 + * 0 0 0x4 0x18 * * [3] DYNM -A-- 0x400120 0x120 0xb8 .dynamic - * 6 0 0x4 0x8 + * 6 0 0x4 0x8 * * [4] HASH -A-- 0x4001d8 0x1d8 0x8a0 .hash - * 5 0 0x4 0x4 + * 5 0 0x4 0x4 * * [5] DYNS -A-- 0x400a78 0xa78 0x11f0 .dynsym - * 6 2 0x4 0x10 + * 6 2 0x4 0x10 * * [6] STRT -A-- 0x401c68 0x1c68 0xbf9 .dynstr - * 0 0 0x1 0 + * 0 0 0x1 0 * * [7] REL -A-- 0x402864 0x2864 0x18 .rel.dyn - * 5 14 0x4 0x8 + * 5 14 0x4 0x8 * * [8] PBIT -AI- 0x402880 0x2880 0x60 .init - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [9] PBIT -AI- 0x4028e0 0x28e0 0x1234 .plt - * 0 0 0x4 0x4 + * 0 0 0x4 0x4 * * [10] PBIT -AI- 0x403b20 0x3b20 0xee400 .text - * 0 0 0x20 0x1 + * 0 0 0x20 0x1 * * [11] PBIT -AI- 0x4f1f20 0xf1f20 0x60 .fini - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [12] PBIT -A-- 0x4f1f80 0xf1f80 0xd90 .rdata - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [13] PBIT -A-- 0x4f2d10 0xf2d10 0x17e0 .rodata - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [14] PBIT WA-- 0x5344f0 0xf44f0 0x4b3e4 .data <<<<< - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [15] PBIT WA-G 0x57f8d4 0x13f8d4 0x2a84 .got - * 0 0 0x4 0x4 + * 0 0 0x4 0x4 * * [16] PBIT WA-G 0x582360 0x142360 0x10 .sdata <<<<< - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [17] NOBI WA-G 0x582370 0x142370 0xb84 .sbss <<<<< - * 0 0 0x4 0 + * 0 0 0x4 0 * * [18] NOBI WA-- 0x582f00 0x142370 0x27ec0 .bss <<<<< - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [19] SYMT ---- 0 0x142370 0x10e40 .symtab - * 20 1108 0x4 0x10 + * 20 1108 0x4 0x10 * * [20] STRT ---- 0 0x1531b0 0xed9e .strtab - * 0 0 0x1 0 + * 0 0 0x1 0 * * [21] STRT ---- 0 0x161f4e 0xb5 .shstrtab - * 0 0 0x1 0 + * 0 0 0x1 0 * * [22] PBIT ---- 0 0x162003 0x28e2a .comment - * 0 0 0x1 0x1 + * 0 0 0x1 0x1 * * [23] PBIT ---- 0 0x18ae2d 0x592 .debug - * 0 0 0x1 0 + * 0 0 0x1 0 * * [24] PBIT ---- 0 0x18b3bf 0x80 .line - * 0 0 0x1 0 + * 0 0 0x1 0 * * [25] MDBG ---- 0 0x18b440 0x60 .mdebug - * 0 0 0x4 0 + * 0 0 0x4 0 * * * dump -hv emacs - * + * * emacs: * * **** SECTION HEADER TABLE **** @@ -216,82 +216,82 @@ what you give them. Help stamp out software-hoarding! */ * Link Info Adralgn Entsize * * [1] PBIT -A-- 0x4000f4 0xf4 0x13 .interp - * 0 0 0x1 0 + * 0 0 0x1 0 * * [2] REGI -A-- 0x400108 0x108 0x18 .reginfo - * 0 0 0x4 0x18 + * 0 0 0x4 0x18 * * [3] DYNM -A-- 0x400120 0x120 0xb8 .dynamic - * 6 0 0x4 0x8 + * 6 0 0x4 0x8 * * [4] HASH -A-- 0x4001d8 0x1d8 0x8a0 .hash - * 5 0 0x4 0x4 + * 5 0 0x4 0x4 * * [5] DYNS -A-- 0x400a78 0xa78 0x11f0 .dynsym - * 6 2 0x4 0x10 + * 6 2 0x4 0x10 * * [6] STRT -A-- 0x401c68 0x1c68 0xbf9 .dynstr - * 0 0 0x1 0 + * 0 0 0x1 0 * * [7] REL -A-- 0x402864 0x2864 0x18 .rel.dyn - * 5 14 0x4 0x8 + * 5 14 0x4 0x8 * * [8] PBIT -AI- 0x402880 0x2880 0x60 .init - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [9] PBIT -AI- 0x4028e0 0x28e0 0x1234 .plt - * 0 0 0x4 0x4 + * 0 0 0x4 0x4 * * [10] PBIT -AI- 0x403b20 0x3b20 0xee400 .text - * 0 0 0x20 0x1 + * 0 0 0x20 0x1 * * [11] PBIT -AI- 0x4f1f20 0xf1f20 0x60 .fini - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [12] PBIT -A-- 0x4f1f80 0xf1f80 0xd90 .rdata - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [13] PBIT -A-- 0x4f2d10 0xf2d10 0x17e0 .rodata - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [14] PBIT WA-- 0x5344f0 0xf44f0 0x4b3e4 .data <<<<< - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [15] PBIT WA-G 0x57f8d4 0x13f8d4 0x2a84 .got - * 0 0 0x4 0x4 + * 0 0 0x4 0x4 * * [16] PBIT WA-G 0x582360 0x142360 0xb94 .sdata <<<<< - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [17] PBIT WA-- 0x582f00 0x142f00 0x94100 .data <<<<< - * 0 0 0x10 0x1 + * 0 0 0x10 0x1 * * [18] NOBI WA-G 0x617000 0x1d7000 0 .sbss <<<<< - * 0 0 0x4 0 + * 0 0 0x4 0 * * [19] NOBI WA-- 0x617000 0x1d7000 0 .bss <<<<< - * 0 0 0x4 0x1 + * 0 0 0x4 0x1 * * [20] SYMT ---- 0 0x1d7000 0x10e40 .symtab - * 21 1109 0x4 0x10 + * 21 1109 0x4 0x10 * * [21] STRT ---- 0 0x1e7e40 0xed9e .strtab - * 0 0 0x1 0 + * 0 0 0x1 0 * * [22] STRT ---- 0 0x1f6bde 0xb5 .shstrtab - * 0 0 0x1 0 + * 0 0 0x1 0 * * [23] PBIT ---- 0 0x1f6c93 0x28e2a .comment - * 0 0 0x1 0x1 + * 0 0 0x1 0x1 * * [24] PBIT ---- 0 0x21fabd 0x592 .debug - * 0 0 0x1 0 + * 0 0 0x1 0 * * [25] PBIT ---- 0 0x22004f 0x80 .line - * 0 0 0x1 0 + * 0 0 0x1 0 * * [26] MDBG ---- 0 0x2200d0 0x60 .mdebug - * 0 0 0x4 0 + * 0 0 0x4 0 * */ @@ -450,7 +450,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) { old_sdata_index = old_sbss_index - 1; } - + /* Find the old .bss section. */ @@ -683,7 +683,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) if (old_data_index == old_file_h->e_shnum) fatal ("Can't find .data in %s.\n", old_name, 0); - /* Walk through all section headers, insert the new data2 section right + /* Walk through all section headers, insert the new data2 section right before the new bss section. */ for (n = 1, nn = 1; n < old_file_h->e_shnum; n++, nn++) { @@ -698,7 +698,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) { memcpy (&NEW_SECTION_H(nn), &OLD_SECTION_H(old_data_index), new_file_h->e_shentsize); - + NEW_SECTION_H(nn).sh_addr = new_data3_addr; NEW_SECTION_H(nn).sh_offset = new_data3_offset; NEW_SECTION_H(nn).sh_size = new_data3_size; @@ -709,8 +709,8 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) NEW_SECTION_H(nn).sh_addralign = OLD_SECTION_H(n).sh_addralign; /* Now copy over what we have in the memory now. */ - memcpy (NEW_SECTION_H(nn).sh_offset + new_base, - (caddr_t) OLD_SECTION_H(n).sh_addr, + memcpy (NEW_SECTION_H(nn).sh_offset + new_base, + (caddr_t) OLD_SECTION_H(n).sh_addr, new_data3_size); /* the new .data2 section should also come before the * new .sbss section */ @@ -721,14 +721,14 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) /* We always have a .sdata section: append the contents of the * old .sbss section. */ - memcpy (new_data3_offset + new_base, - (caddr_t) OLD_SECTION_H(n).sh_addr, + memcpy (new_data3_offset + new_base, + (caddr_t) OLD_SECTION_H(n).sh_addr, new_data3_size); nn ++; } } else if (n == old_bss_index) - + /* If it is bss section, insert the new data2 section before it. */ { Elf32_Word tmp_align; @@ -741,7 +741,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) /* Steal the data section header for this data2 section. */ memcpy (&NEW_SECTION_H(nn), &OLD_SECTION_H(old_data_index), new_file_h->e_shentsize); - + NEW_SECTION_H(nn).sh_addr = new_data2_addr; NEW_SECTION_H(nn).sh_offset = new_data2_offset; NEW_SECTION_H(nn).sh_size = new_data2_size; @@ -751,14 +751,14 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) NEW_SECTION_H(nn).sh_addralign = tmp_align; /* Now copy over what we have in the memory now. */ - memcpy (NEW_SECTION_H(nn).sh_offset + new_base, + memcpy (NEW_SECTION_H(nn).sh_offset + new_base, (caddr_t) tmp_addr, new_data2_size); nn += 2; } - - memcpy (&NEW_SECTION_H(nn), &OLD_SECTION_H(n), + + memcpy (&NEW_SECTION_H(nn), &OLD_SECTION_H(n), old_file_h->e_shentsize); - + if (old_sdata_index && n == old_sdata_index) /* The old .sdata section has now a new size */ NEW_SECTION_H(nn).sh_size = new_sdata_size; @@ -773,7 +773,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) NEW_SECTION_H(nn).sh_addr += new_data2_size + new_data2_align + new_data3_size; /* Let the new bss section address alignment be the same as the - section address alignment followed the old bss section, so + section address alignment followed the old bss section, so this section will be placed in exactly the same place. */ NEW_SECTION_H(nn).sh_addralign = OLD_SECTION_H(nn + (old_sdata_index ? 1 : 0)).sh_addralign; @@ -786,7 +786,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) new_data3_size - old_bss_padding; NEW_SECTION_H(nn).sh_addr += new_data2_size; /* Let the new bss section address alignment be the same as the - section address alignment followed the old bss section, so + section address alignment followed the old bss section, so this section will be placed in exactly the same place. */ NEW_SECTION_H(nn).sh_addralign = OLD_SECTION_H((nn - (old_sdata_index ? 0 : 1))).sh_addralign; @@ -799,19 +799,19 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) new_data2_align + new_data3_size - old_bss_padding; - + /* If any section hdr refers to the section after the new .data - section, make it refer to next one because we have inserted + section, make it refer to next one because we have inserted a new section in between. */ - + PATCH_INDEX(NEW_SECTION_H(nn).sh_link); PATCH_INDEX(NEW_SECTION_H(nn).sh_info); - + /* Now, start to copy the content of sections. */ if (NEW_SECTION_H(nn).sh_type == SHT_NULL || NEW_SECTION_H(nn).sh_type == SHT_NOBITS) continue; - + /* Write out the sections. .data, .data1 and .sdata get copied from * the current process instead of the old file. */ @@ -821,7 +821,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) src = (caddr_t) OLD_SECTION_H(n).sh_addr; else src = old_base + OLD_SECTION_H(n).sh_offset; - + memcpy (NEW_SECTION_H(nn).sh_offset + new_base, src, ((n == old_sdata_index) ? old_sdata_size : @@ -833,7 +833,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) { Elf32_Shdr *spt = &NEW_SECTION_H(nn); unsigned int num = spt->sh_size / spt->sh_entsize; - Elf32_Sym * sym = (Elf32_Sym *) (NEW_SECTION_H(nn).sh_offset + + Elf32_Sym * sym = (Elf32_Sym *) (NEW_SECTION_H(nn).sh_offset + new_base); for (; num--; sym++) { @@ -841,7 +841,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address) || (sym->st_shndx == SHN_ABS) || (sym->st_shndx == SHN_COMMON)) continue; - + PATCH_INDEX(sym->st_shndx); } } diff --git a/src/unexsunos4.c b/src/unexsunos4.c index 76480db9b33..6ceab884a99 100644 --- a/src/unexsunos4.c +++ b/src/unexsunos4.c @@ -98,7 +98,7 @@ static int rd_only_len; static long cookie; -unexec (new_name, a_name, bndry, bss_start, entry) +unexec (new_name, a_name, bndry, bss_start, entry) char *new_name, *a_name; unsigned bndry, bss_start, entry; { @@ -163,7 +163,7 @@ unexec (new_name, a_name, bndry, bss_start, entry) /* Have to do this some time before dumping the data */ initialized = 1; #endif - + /* Handle new data and bss sizes and optional new entry point. No one actually uses bss_start and entry, but tradition compels one to support them. @@ -171,7 +171,7 @@ unexec (new_name, a_name, bndry, bss_start, entry) but the caller is *supposed* to know what she is doing. */ nhdr.a_data = (bss_start ? bss_start : brk_value) - N_DATADDR (nhdr); nhdr.a_bss = bss_start ? brk_value - bss_start : 0; - if (entry) + if (entry) nhdr.a_entry = entry; /* @@ -296,14 +296,14 @@ run_time_remap (progname) * First try argv[0], will almost always succeed as shells tend to give * the full path from the hash list rather than using execvp () */ - if (is_it (progname)) + if (is_it (progname)) return; /* * If argv[0] is a full path and does not exist, not much sense in * searching further */ - if (strchr (progname, '/')) + if (strchr (progname, '/')) return; /* diff --git a/src/unexw32.c b/src/unexw32.c index 7b907beda6e..60cd9517027 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -148,17 +148,17 @@ open_input_file (file_data *p_file, char *filename) file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE) return FALSE; size = GetFileSize (file, &upper_size); - file_mapping = CreateFileMapping (file, NULL, PAGE_READONLY, + file_mapping = CreateFileMapping (file, NULL, PAGE_READONLY, 0, size, NULL); - if (!file_mapping) + if (!file_mapping) return FALSE; file_base = MapViewOfFile (file_mapping, FILE_MAP_READ, 0, 0, size); - if (file_base == 0) + if (file_base == 0) return FALSE; p_file->name = filename; @@ -179,18 +179,18 @@ open_output_file (file_data *p_file, char *filename, unsigned long size) file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE) return FALSE; - file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, + file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, 0, size, NULL); - if (!file_mapping) + if (!file_mapping) return FALSE; - + file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size); - if (file_base == 0) + if (file_base == 0) return FALSE; - + p_file->name = filename; p_file->size = size; p_file->file = file; @@ -345,24 +345,24 @@ get_section_info (file_data *p_infile) PIMAGE_NT_HEADERS nt_header; PIMAGE_SECTION_HEADER section; int overlap; - + dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base; - if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) + if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) { printf ("Unknown EXE header in %s...bailing.\n", p_infile->name); exit (1); } - nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + + nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + dos_header->e_lfanew); - if (nt_header == NULL) + if (nt_header == NULL) { - printf ("Failed to find IMAGE_NT_HEADER in %s...bailing.\n", + printf ("Failed to find IMAGE_NT_HEADER in %s...bailing.\n", p_infile->name); exit (1); } /* Check the NT header signature ... */ - if (nt_header->Signature != IMAGE_NT_SIGNATURE) + if (nt_header->Signature != IMAGE_NT_SIGNATURE) { printf ("Invalid IMAGE_NT_SIGNATURE 0x%x in %s...bailing.\n", nt_header->Signature, p_infile->name); @@ -482,7 +482,7 @@ get_section_info (file_data *p_infile) /* The dump routines. */ void -copy_executable_and_dump_data (file_data *p_infile, +copy_executable_and_dump_data (file_data *p_infile, file_data *p_outfile) { unsigned char *dst, *dst_save; @@ -537,10 +537,10 @@ copy_executable_and_dump_data (file_data *p_infile, Note that dst is updated implicitly by each COPY_CHUNK. */ dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base; - nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + + nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + dos_header->e_lfanew); section = IMAGE_FIRST_SECTION (nt_header); - + dst = (unsigned char *) p_outfile->file_base; COPY_CHUNK ("Copying DOS header...", dos_header, @@ -736,7 +736,7 @@ unexec (char *new_name, char *old_name, void *start_data, void *start_bss, if ((q = strrchr (new_name, '/')) == NULL) abort (); strcpy (p, q); - + /* Make sure that the output filename has the ".exe" extension...patch it up if not. */ p = out_filename + strlen (out_filename) - 4; @@ -752,7 +752,7 @@ unexec (char *new_name, char *old_name, void *start_data, void *start_bss, /* Open the undumped executable file. */ if (!open_input_file (&in_file, in_filename)) { - printf ("Failed to open %s (%d)...bailing.\n", + printf ("Failed to open %s (%d)...bailing.\n", in_filename, GetLastError ()); exit (1); } @@ -768,7 +768,7 @@ unexec (char *new_name, char *old_name, void *start_data, void *start_bss, extra_bss_size_static; if (!open_output_file (&out_file, out_filename, size)) { - printf ("Failed to open %s (%d)...bailing.\n", + printf ("Failed to open %s (%d)...bailing.\n", out_filename, GetLastError ()); exit (1); } diff --git a/src/vm-limit.c b/src/vm-limit.c index 721e740bd02..c0bab2e48a4 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -76,7 +76,7 @@ check_memory_limits () if (warn_function) switch (warnlevel) { - case 0: + case 0: if (data_size > five_percent * 15) { warnlevel++; @@ -84,7 +84,7 @@ check_memory_limits () } break; - case 1: + case 1: if (data_size > five_percent * 17) { warnlevel++; @@ -92,7 +92,7 @@ check_memory_limits () } break; - case 2: + case 2: if (data_size > five_percent * 19) { warnlevel++; diff --git a/src/w32.c b/src/w32.c index 57b0e28d0ca..744cc593133 100644 --- a/src/w32.c +++ b/src/w32.c @@ -343,7 +343,7 @@ getwd (char *dir) int gethostname (char *buffer, int size) { - /* NT only allows small host names, so the buffer is + /* NT only allows small host names, so the buffer is certainly large enough. */ return !GetComputerName (buffer, &size); } @@ -356,7 +356,7 @@ getloadavg (double loadavg[], int nelem) int i; /* A faithful emulation is going to have to be saved for a rainy day. */ - for (i = 0; i < nelem; i++) + for (i = 0; i < nelem; i++) { loadavg[i] = 0.0; } @@ -373,7 +373,7 @@ static char the_passwd_gecos[PASSWD_FIELD_SIZE]; static char the_passwd_dir[PASSWD_FIELD_SIZE]; static char the_passwd_shell[PASSWD_FIELD_SIZE]; -static struct passwd the_passwd = +static struct passwd the_passwd = { the_passwd_name, the_passwd_passwd, @@ -385,30 +385,30 @@ static struct passwd the_passwd = the_passwd_shell, }; -int -getuid () -{ +int +getuid () +{ return the_passwd.pw_uid; } -int -geteuid () -{ +int +geteuid () +{ /* I could imagine arguing for checking to see whether the user is in the Administrators group and returning a UID of 0 for that case, but I don't know how wise that would be in the long run. */ - return getuid (); + return getuid (); } -int -getgid () -{ +int +getgid () +{ return the_passwd.pw_gid; } -int -getegid () -{ +int +getegid () +{ return getgid (); } @@ -424,7 +424,7 @@ struct passwd * getpwnam (char *name) { struct passwd *pw; - + pw = getpwuid (getuid ()); if (!pw) return pw; @@ -782,57 +782,57 @@ is_unc_volume (const char *filename) /* Routines that are no-ops on NT but are defined to get Emacs to compile. */ -int -sigsetmask (int signal_mask) -{ +int +sigsetmask (int signal_mask) +{ return 0; } -int -sigmask (int sig) -{ +int +sigmask (int sig) +{ return 0; } -int -sigblock (int sig) -{ +int +sigblock (int sig) +{ return 0; } -int -sigunblock (int sig) -{ +int +sigunblock (int sig) +{ return 0; } -int -setpgrp (int pid, int gid) -{ +int +setpgrp (int pid, int gid) +{ return 0; } -int -alarm (int seconds) -{ +int +alarm (int seconds) +{ return 0; } -void -unrequest_sigio (void) -{ +void +unrequest_sigio (void) +{ return; } void -request_sigio (void) -{ +request_sigio (void) +{ return; } #define REG_ROOT "SOFTWARE\\GNU\\Emacs" -LPBYTE +LPBYTE w32_get_resource (key, lpdwtype) char *key; LPDWORD lpdwtype; @@ -841,42 +841,42 @@ w32_get_resource (key, lpdwtype) HKEY hrootkey = NULL; DWORD cbData; BOOL ok = FALSE; - - /* Check both the current user and the local machine to see if + + /* Check both the current user and the local machine to see if we have any resources. */ - + if (RegOpenKeyEx (HKEY_CURRENT_USER, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) { lpvalue = NULL; - if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData) == ERROR_SUCCESS - && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL + if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData) == ERROR_SUCCESS + && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL && RegQueryValueEx (hrootkey, key, NULL, lpdwtype, lpvalue, &cbData) == ERROR_SUCCESS) { return (lpvalue); } if (lpvalue) xfree (lpvalue); - + RegCloseKey (hrootkey); - } - + } + if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) { lpvalue = NULL; - + if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData) == ERROR_SUCCESS && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL && RegQueryValueEx (hrootkey, key, NULL, lpdwtype, lpvalue, &cbData) == ERROR_SUCCESS) { return (lpvalue); } - + if (lpvalue) xfree (lpvalue); - + RegCloseKey (hrootkey); - } - + } + return (NULL); } @@ -933,7 +933,7 @@ init_environment (char ** argv) { char * name; char * def_value; - } env_vars[] = + } env_vars[] = { {"HOME", "C:/"}, {"PRELOAD_WINSOCK", NULL}, @@ -987,7 +987,7 @@ init_environment (char ** argv) *p = 0; for (p = modname; *p; p++) if (*p == '\\') *p = '/'; - + _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname); _putenv (strdup (buf)); } @@ -1019,7 +1019,7 @@ init_environment (char ** argv) else if (dwType == REG_SZ) { char buf[SET_ENV_BUF_SIZE]; - + _snprintf (buf, sizeof(buf)-1, "%s=%s", env_vars[i].name, lpval); _putenv (strdup (buf)); } @@ -1113,7 +1113,7 @@ get_emacs_configuration (void) static char configuration_buffer[32]; /* Determine the processor type. */ - switch (get_processor_type ()) + switch (get_processor_type ()) { #ifdef PROCESSOR_INTEL_386 @@ -1230,7 +1230,7 @@ get_emacs_configuration_options (void) #include <sys/timeb.h> /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95). */ -void +void gettimeofday (struct timeval *tv, struct timezone *tz) { struct timeb tb; @@ -1238,7 +1238,7 @@ gettimeofday (struct timeval *tv, struct timezone *tz) tv->tv_sec = tb.time; tv->tv_usec = tb.millitm * 1000L; - if (tz) + if (tz) { tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich */ tz->tz_dsttime = tb.dstflag; /* type of dst correction */ @@ -1250,7 +1250,7 @@ gettimeofday (struct timeval *tv, struct timezone *tz) /* ------------------------------------------------------------------------- */ /* Place a wrapper around the MSVC version of ctime. It returns NULL - on network directories, so we handle that case here. + on network directories, so we handle that case here. (Ulrich Leodolter, 1/11/95). */ char * sys_ctime (const time_t *t) @@ -1356,7 +1356,7 @@ GetCachedVolumeInformation (char * root_dir) tell whether they are or not. Also, the UNC association of drive letters mapped to remote volumes can be changed at any time (even by other processes) without notice. - + As a compromise, so we can benefit from caching info for remote volumes, we use a simple expiry mechanism to invalidate cache entries that are more than ten seconds old. */ @@ -1462,7 +1462,7 @@ get_volume_info (const char * name, const char ** pPath) if (pPath) *pPath = name; - + info = GetCachedVolumeInformation (rootname); if (info != NULL) { @@ -1600,7 +1600,7 @@ is_exec (const char * name) stricmp (p, ".cmd") == 0)); } -/* Emulate the Unix directory procedures opendir, closedir, +/* Emulate the Unix directory procedures opendir, closedir, and readdir. We can't use the procedures supplied in sysdep.c, so we provide them here. */ @@ -1673,8 +1673,8 @@ readdir (DIR *dirp) { if (wnet_enum_handle != INVALID_HANDLE_VALUE) { - if (!read_unc_volume (wnet_enum_handle, - dir_find_data.cFileName, + if (!read_unc_volume (wnet_enum_handle, + dir_find_data.cFileName, MAX_PATH)) return NULL; } @@ -1700,14 +1700,14 @@ readdir (DIR *dirp) if (!FindNextFile (dir_find_handle, &dir_find_data)) return NULL; } - + /* Emacs never uses this value, so don't bother making it match value returned by stat(). */ dir_static.d_ino = 1; - + dir_static.d_reclen = sizeof (struct direct) - MAXNAMLEN + 3 + dir_static.d_namlen - dir_static.d_namlen % 4; - + dir_static.d_namlen = strlen (dir_find_data.cFileName); strcpy (dir_static.d_name, dir_find_data.cFileName); if (dir_is_fat) @@ -1721,27 +1721,27 @@ readdir (DIR *dirp) if (!*p) _strlwr (dir_static.d_name); } - + return &dir_static; } HANDLE open_unc_volume (char *path) { - NETRESOURCE nr; + NETRESOURCE nr; HANDLE henum; int result; - nr.dwScope = RESOURCE_GLOBALNET; - nr.dwType = RESOURCETYPE_DISK; - nr.dwDisplayType = RESOURCEDISPLAYTYPE_SERVER; - nr.dwUsage = RESOURCEUSAGE_CONTAINER; - nr.lpLocalName = NULL; + nr.dwScope = RESOURCE_GLOBALNET; + nr.dwType = RESOURCETYPE_DISK; + nr.dwDisplayType = RESOURCEDISPLAYTYPE_SERVER; + nr.dwUsage = RESOURCEUSAGE_CONTAINER; + nr.lpLocalName = NULL; nr.lpRemoteName = map_w32_filename (path, NULL); - nr.lpComment = NULL; - nr.lpProvider = NULL; + nr.lpComment = NULL; + nr.lpProvider = NULL; - result = WNetOpenEnum(RESOURCE_GLOBALNET, RESOURCETYPE_DISK, + result = WNetOpenEnum(RESOURCE_GLOBALNET, RESOURCETYPE_DISK, RESOURCEUSAGE_CONNECTABLE, &nr, &henum); if (result == NO_ERROR) @@ -1802,7 +1802,7 @@ unc_volume_file_attributes (char *path) /* Shadow some MSVC runtime functions to map requests for long filenames to reasonable short names if necessary. This was originally added to - permit running Emacs on NT 3.1 on a FAT partition, which doesn't support + permit running Emacs on NT 3.1 on a FAT partition, which doesn't support long file names. */ int @@ -2452,7 +2452,7 @@ stat (const char * path, struct stat * buf) permission = _S_IREAD; else permission = _S_IREAD | _S_IWRITE; - + if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) permission |= _S_IEXEC; else if (is_exec (name)) @@ -2536,7 +2536,7 @@ fstat (int desc, struct stat * buf) permission = _S_IREAD; else permission = _S_IREAD | _S_IWRITE; - + if (info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) permission |= _S_IEXEC; else @@ -2788,7 +2788,7 @@ struct { WSAEFAULT , "Bad address", WSAEINVAL , "Invalid argument", WSAEMFILE , "Too many open files", - + WSAEWOULDBLOCK , "Resource temporarily unavailable", WSAEINPROGRESS , "Operation now in progress", WSAEALREADY , "Operation already in progress", @@ -2826,7 +2826,7 @@ struct { WSAEDQUOT , "Double quote in host name", /* really not sure */ WSAESTALE , "Data is stale", /* not sure */ WSAEREMOTE , "Remote error", /* not sure */ - + WSASYSNOTREADY , "Network subsystem is unavailable", WSAVERNOTSUPPORTED , "WINSOCK.DLL version out of range", WSANOTINITIALISED , "Winsock not initialized successfully", @@ -2844,7 +2844,7 @@ struct { WSA_E_CANCELLED , "Operation already cancelled", /* really not sure */ WSAEREFUSED , "Operation refused", /* not sure */ #endif - + WSAHOST_NOT_FOUND , "Host not found", WSATRY_AGAIN , "Authoritative host not found during name lookup", WSANO_RECOVERY , "Non-recoverable error during name lookup", @@ -2899,7 +2899,7 @@ sys_socket(int af, int type, int protocol) /* call the real socket function */ s = pfn_socket (af, type, protocol); - + if (s != INVALID_SOCKET) return socket_to_fd (s); @@ -2972,7 +2972,7 @@ socket_to_fd (SOCKET s) { CloseHandle (new_s); } - } + } } } fd_info[fd].hnd = (HANDLE) s; @@ -3185,7 +3185,7 @@ sys_setsockopt (int s, int level, int optname, const char * optval, int optlen) return rc; } h_errno = ENOTSOCK; - return SOCKET_ERROR; + return SOCKET_ERROR; } int @@ -3206,7 +3206,7 @@ sys_listen (int s, int backlog) return rc; } h_errno = ENOTSOCK; - return SOCKET_ERROR; + return SOCKET_ERROR; } int @@ -3227,7 +3227,7 @@ sys_getsockname (int s, struct sockaddr * name, int * namelen) return rc; } h_errno = ENOTSOCK; - return SOCKET_ERROR; + return SOCKET_ERROR; } int @@ -3425,7 +3425,7 @@ sys_dup2 (int src, int dst) /* make sure we close the destination first if it's a pipe or socket */ if (src != dst && fd_info[dst].flags != 0) sys_close (dst); - + rc = _dup2 (src, dst); if (rc == 0) { @@ -3485,9 +3485,9 @@ _sys_read_ahead (int fd) DebPrint (("_sys_read_ahead: internal error: fd %d is not a pipe or socket!\n", fd)); abort (); } - + cp->status = STATUS_READ_IN_PROGRESS; - + if (fd_info[fd].flags & FILE_PIPE) { rc = _read (fd, &cp->chr, sizeof (char)); @@ -3529,7 +3529,7 @@ _sys_read_ahead (int fd) } } #endif - + if (rc == sizeof (char)) cp->status = STATUS_READ_SUCCEEDED; else @@ -3728,7 +3728,7 @@ sys_write (int fd, const void * buffer, unsigned int count) next[0] = '\n'; dst = next + 1; count++; - } + } else /* copied remaining partial line -> now finished */ break; @@ -3781,7 +3781,7 @@ check_windows_init_file () it cannot find the Windows installation file. If this file does not exist in the expected place, tell the user. */ - if (!noninteractive && !inhibit_window_system) + if (!noninteractive && !inhibit_window_system) { extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; Lisp_Object objs[2]; @@ -3794,14 +3794,14 @@ check_windows_init_file () full_load_path = Fappend (2, objs); init_file = build_string ("term/w32-win"); fd = openp (full_load_path, init_file, Vload_suffixes, NULL, Qnil); - if (fd < 0) + if (fd < 0) { Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil); char *init_file_name = SDATA (init_file); char *load_path = SDATA (load_path_print); char *buffer = alloca (1024); - sprintf (buffer, + sprintf (buffer, "The Emacs Windows initialization file \"%s.el\" " "could not be found in your Emacs installation. " "Emacs checked the following directories for this file:\n" @@ -3866,14 +3866,14 @@ init_ntproc () /* ignore errors when duplicating and closing; typically the handles will be invalid when running as a gui program. */ - DuplicateHandle (parent, - GetStdHandle (STD_INPUT_HANDLE), + DuplicateHandle (parent, + GetStdHandle (STD_INPUT_HANDLE), parent, - &stdin_save, - 0, - FALSE, + &stdin_save, + 0, + FALSE, DUPLICATE_SAME_ACCESS); - + DuplicateHandle (parent, GetStdHandle (STD_OUTPUT_HANDLE), parent, @@ -3881,7 +3881,7 @@ init_ntproc () 0, FALSE, DUPLICATE_SAME_ACCESS); - + DuplicateHandle (parent, GetStdHandle (STD_ERROR_HANDLE), parent, @@ -3889,7 +3889,7 @@ init_ntproc () 0, FALSE, DUPLICATE_SAME_ACCESS); - + fclose (stdin); fclose (stdout); fclose (stderr); @@ -3926,7 +3926,7 @@ init_ntproc () while (*drive <= 'Z') { /* Record if this drive letter refers to a fixed drive. */ - fixed_drives[DRIVE_INDEX (*drive)] = + fixed_drives[DRIVE_INDEX (*drive)] = (GetDriveType (drive) == DRIVE_FIXED); (*drive)++; @@ -3935,7 +3935,7 @@ init_ntproc () /* Reset the volume info cache. */ volume_cache = NULL; } - + /* Check to see if Emacs has been installed correctly. */ check_windows_init_file (); } diff --git a/src/w32.h b/src/w32.h index c8733c41a26..845aca26e30 100644 --- a/src/w32.h +++ b/src/w32.h @@ -112,11 +112,11 @@ extern char * w32_strerror (int error_no); extern BOOL w32_get_long_filename (char * name, char * buf, int size); /* Prepare our standard handles for proper inheritance by child processes. */ -extern void prepare_standard_handles (int in, int out, +extern void prepare_standard_handles (int in, int out, int err, HANDLE handles[4]); /* Reset our standard handles to their original state. */ -extern void reset_standard_handles (int in, int out, +extern void reset_standard_handles (int in, int out, int err, HANDLE handles[4]); /* Return the string resource associated with KEY of type TYPE. */ diff --git a/src/w32bdf.c b/src/w32bdf.c index 5bb5ba72bba..73f40a22df6 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c @@ -54,7 +54,7 @@ cache_bitmap *pcached_bitmap_latest = cached_bitmap_slots; #define FONT_CACHE_SLOT_OVER_P(p) ((p) >= cached_bitmap_slots + BDF_FONT_CACHE_SIZE) -static int +static int search_file_line(char *key, char *start, int len, char **val, char **next) { unsigned int linelen; @@ -73,7 +73,7 @@ search_file_line(char *key, char *start, int len, char **val, char **next) *val = start + strlen(key); return 1; } - + return 0; } @@ -276,7 +276,7 @@ w32_init_bdf_font(char *filename) } bdffontp = (bdffont *) xmalloc(sizeof(bdffont)); - + for(i = 0;i < BDF_FIRST_OFFSET_TABLE;i++) bdffontp->chtbl[i] = NULL; bdffontp->size = fileinfo.nFileSizeLow; @@ -285,7 +285,7 @@ w32_init_bdf_font(char *filename) bdffontp->hfilemap = hfilemap; bdffontp->filename = (char*) xmalloc(strlen(filename) + 1); strcpy(bdffontp->filename, filename); - + if (!set_bdf_font_info(bdffontp)) { w32_free_bdf_font(bdffontp); @@ -364,7 +364,7 @@ cache_char_offset(bdffont *fontp, int index, unsigned char *offset) { pch = fontp->chtbl[BDF_FIRST_OFFSET(index)] = (font_char*) HeapAlloc(hbdf_cp_heap, - HEAP_ZERO_MEMORY, + HEAP_ZERO_MEMORY, sizeof(font_char) * BDF_SECOND_OFFSET_TABLE); if (!pch) return NULL; @@ -578,7 +578,7 @@ get_bitmap_with_cache(bdffont *fontp, int index) pcb->row_byte_size = glyph.row_byte_size; pch->pcbmp = pcb; - + pcached_bitmap_latest++; if (FONT_CACHE_SLOT_OVER_P(pcached_bitmap_latest)) pcached_bitmap_latest = cached_bitmap_slots; @@ -649,7 +649,7 @@ w32_BDF_TextOut(bdffont *fontp, HDC hdc, int left, return 0; textalign = GetTextAlign(hdc); - + hFgBrush = CreateSolidBrush(GetTextColor(hdc)); hOrgBrush = SelectObject(hdc, hFgBrush); @@ -679,7 +679,7 @@ w32_BDF_TextOut(bdffont *fontp, HDC hdc, int left, { width = pcb->metric.bbw; height = pcb->metric.bbh; - + if (!(hBMP && (DIBsection_hdc == hdc) && (DIBsection_width == width) diff --git a/src/w32bdf.h b/src/w32bdf.h index df0976bb1fa..1786786b90b 100644 --- a/src/w32bdf.h +++ b/src/w32bdf.h @@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */ #define BDF_FONT_CACHE_SIZE 3000 #define BDF_FONT_CLEAR_SIZE 600 -/* +/* GLYPH METRIC (# ... character's reference point) ^ y | (urx, ury) diff --git a/src/w32console.c b/src/w32console.c index 490c1e10373..775630b8b0e 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -108,7 +108,7 @@ move_cursor (int row, int col) { cursor_coords.X = col; cursor_coords.Y = row; - + if (updating_frame == (struct frame *) NULL) { SetConsoleCursorPosition (cur_screen, cursor_coords); @@ -120,7 +120,7 @@ void clear_to_end (void) { struct frame * f = PICK_FRAME (); - + clear_end_of_line (FRAME_WIDTH (f) - 1); ins_del_lines (cursor_coords.Y, FRAME_HEIGHT (f) - cursor_coords.Y - 1); } @@ -191,12 +191,12 @@ ins_del_lines (int vpos, int n) } scroll.Left = 0; scroll.Right = FRAME_WIDTH (f); - + dest.X = 0; - + fill.Char.AsciiChar = 0x20; fill.Attributes = char_attr_normal; - + ScrollConsoleScreenBuffer (cur_screen, &scroll, NULL, dest, &fill); /* Here we have to deal with a w32 console flake: If the scroll @@ -222,7 +222,7 @@ ins_del_lines (int vpos, int n) nb = dest.Y + (scroll.Bottom - scroll.Top) + 1; if (nb < scroll.Top) - { + { for (i = nb; i < scroll.Top; i++) { move_cursor (i, 0); @@ -230,7 +230,7 @@ ins_del_lines (int vpos, int n) } } } - + cursor_coords.X = 0; cursor_coords.Y = vpos; } @@ -249,10 +249,10 @@ scroll_line (int dist, int direction) COORD dest; CHAR_INFO fill; struct frame * f = PICK_FRAME (); - + scroll.Top = cursor_coords.Y; scroll.Bottom = cursor_coords.Y; - + if (direction == LEFT) { scroll.Left = cursor_coords.X + dist; @@ -263,10 +263,10 @@ scroll_line (int dist, int direction) scroll.Left = cursor_coords.X; scroll.Right = FRAME_WIDTH (f) - dist - 1; } - + dest.X = cursor_coords.X; dest.Y = cursor_coords.Y; - + fill.Char.AsciiChar = 0x20; fill.Attributes = char_attr_normal; @@ -285,7 +285,7 @@ insert_glyphs (register struct glyph *start, register int len) { /* Print the first len characters of start, cursor_coords.X adjusted by write_glyphs. */ - + write_glyphs (start, len); } else @@ -316,7 +316,7 @@ write_glyphs (register struct glyph *string, register int len) /* Identify a run of glyphs with the same face. */ int face_id = string->face_id; int n; - + for (n = 1; n < len; ++n) if (string[n].face_id != face_id) break; @@ -336,7 +336,7 @@ write_glyphs (register struct glyph *string, register int len) { /* Set the attribute for these characters. */ if (!FillConsoleOutputAttribute (cur_screen, char_attr, - produced, cursor_coords, &r)) + produced, cursor_coords, &r)) { printf ("Failed writing console attributes: %d\n", GetLastError ()); @@ -354,7 +354,7 @@ write_glyphs (register struct glyph *string, register int len) cursor_coords.X += produced; move_cursor (cursor_coords.Y, cursor_coords.X); - } + } len -= consumed; n -= consumed; string += consumed; @@ -371,7 +371,7 @@ write_glyphs (register struct glyph *string, register int len) { if (!FillConsoleOutputAttribute (cur_screen, char_attr_normal, terminal_coding.produced, - cursor_coords, &r)) + cursor_coords, &r)) { printf ("Failed writing console attributes: %d\n", GetLastError ()); @@ -394,8 +394,8 @@ write_glyphs (register struct glyph *string, register int len) void delete_glyphs (int n) { - /* delete chars means scroll chars from cursor_coords.X + n to - cursor_coords.X, anything beyond the edge of the screen should + /* delete chars means scroll chars from cursor_coords.X + n to + cursor_coords.X, anything beyond the edge of the screen should come out empty... */ scroll_line (n, LEFT); @@ -407,7 +407,7 @@ static unsigned int sound_type = 0xFFFFFFFF; void w32_sys_ring_bell (void) { - if (sound_type == 0xFFFFFFFF) + if (sound_type == 0xFFFFFFFF) { Beep (666, 100); } @@ -430,17 +430,17 @@ SOUND is nil to use the normal beep. */) { CHECK_SYMBOL (sound); - if (NILP (sound)) + if (NILP (sound)) sound_type = 0xFFFFFFFF; else if (EQ (sound, intern ("asterisk"))) sound_type = MB_ICONASTERISK; - else if (EQ (sound, intern ("exclamation"))) + else if (EQ (sound, intern ("exclamation"))) sound_type = MB_ICONEXCLAMATION; - else if (EQ (sound, intern ("hand"))) + else if (EQ (sound, intern ("hand"))) sound_type = MB_ICONHAND; - else if (EQ (sound, intern ("question"))) + else if (EQ (sound, intern ("question"))) sound_type = MB_ICONQUESTION; - else if (EQ (sound, intern ("ok"))) + else if (EQ (sound, intern ("ok"))) sound_type = MB_OK; else if (EQ (sound, intern ("silent"))) sound_type = MB_EMACS_SILENT; @@ -449,7 +449,7 @@ SOUND is nil to use the normal beep. */) return sound; } - + void reset_terminal_modes (void) { @@ -482,7 +482,7 @@ set_terminal_modes (void) /* hmmm... perhaps these let us bracket screen changes so that we can flush clumps rather than one-character-at-a-time... - + we'll start with not moving the cursor while an update is in progress. */ void update_begin (struct frame * f) @@ -525,7 +525,7 @@ w32_face_attributes (f, face_id) if (face->background != FACE_TTY_DEFAULT_BG_COLOR && face->background != FACE_TTY_DEFAULT_COLOR) - char_attr = (char_attr & 0xff0f) + ((face->background % 16) << 4); + char_attr = (char_attr & 0xff0f) + ((face->background % 16) << 4); /* NTEMACS_TODO: Faces defined during startup get both foreground @@ -573,7 +573,7 @@ void initialize_w32_display (void) { CONSOLE_SCREEN_BUFFER_INFO info; - + cursor_to_hook = move_cursor; raw_cursor_to_hook = move_cursor; clear_to_end_hook = clear_to_end; @@ -589,7 +589,7 @@ initialize_w32_display (void) set_terminal_window_hook = set_terminal_window; update_begin_hook = update_begin; update_end_hook = update_end; - + read_socket_hook = w32_console_read_socket; mouse_position_hook = w32_console_mouse_position; estimate_mode_line_height_hook = 0; @@ -602,7 +602,7 @@ initialize_w32_display (void) GetConsoleMode (keyboard_handle, &prev_console_mode); prev_screen = GetStdHandle (STD_OUTPUT_HANDLE); - + #ifdef USE_SEPARATE_SCREEN cur_screen = CreateConsoleScreenBuffer (GENERIC_READ | GENERIC_WRITE, 0, NULL, @@ -656,7 +656,7 @@ initialize_w32_display (void) } GetConsoleScreenBufferInfo (cur_screen, &info); - + meta_key = 1; char_attr_normal = info.wAttributes; @@ -668,10 +668,10 @@ initialize_w32_display (void) else { /* Lines per page. Use buffer coords instead of buffer size. */ - FRAME_HEIGHT (SELECTED_FRAME ()) = 1 + info.srWindow.Bottom - - info.srWindow.Top; + FRAME_HEIGHT (SELECTED_FRAME ()) = 1 + info.srWindow.Bottom - + info.srWindow.Top; /* Characters per line. Use buffer coords instead of buffer size. */ - SET_FRAME_WIDTH (SELECTED_FRAME (), 1 + info.srWindow.Right - + SET_FRAME_WIDTH (SELECTED_FRAME (), 1 + info.srWindow.Right - info.srWindow.Left); } @@ -702,7 +702,7 @@ DEFUN ("set-cursor-size", Fset_cursor_size, Sset_cursor_size, 1, 1, 0, cci.dwSize = XFASTINT (size); cci.bVisible = TRUE; (void) SetConsoleCursorInfo (cur_screen, &cci); - + return Qt; } diff --git a/src/w32fns.c b/src/w32fns.c index feed88096f7..658a256ed63 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -10489,7 +10489,7 @@ xpm_load (f, img) string buffer containing data in the same format as an XPM file. */ specified_file = image_spec_value (img->spec, QCfile, NULL); - + { HDC frame_dc = get_frame_dc (f); hdc = CreateCompatibleDC (frame_dc); @@ -10535,7 +10535,7 @@ xpm_load (f, img) fn_XImageFree (xpm_image); } if (xpm_mask && xpm_mask->bitmap) - { + { /* The mask appears to be inverted compared with what we expect. TODO: invert our expectations. See other places where we have to invert bits because our idea of masks is backwards. */ @@ -10546,7 +10546,7 @@ xpm_load (f, img) SelectObject (hdc, old_obj); img->mask = xpm_mask->bitmap; - fn_XImageFree (xpm_mask); + fn_XImageFree (xpm_mask); DeleteDC (hdc); } diff --git a/src/w32inevt.c b/src/w32inevt.c index 6a0b5e5f1a2..f602f8b820b 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -82,15 +82,15 @@ extern unsigned int w32_key_to_modifier (int key); static INPUT_RECORD event_queue[EVENT_QUEUE_SIZE]; static INPUT_RECORD *queue_ptr = event_queue, *queue_end = event_queue; -static int +static int fill_queue (BOOL block) { BOOL rc; DWORD events_waiting; - + if (queue_ptr < queue_end) return queue_end-queue_ptr; - + if (!block) { /* Check to see if there are some events to read before we try @@ -100,7 +100,7 @@ fill_queue (BOOL block) if (events_waiting == 0) return 0; } - + rc = ReadConsoleInput (keyboard_handle, event_queue, EVENT_QUEUE_SIZE, &events_waiting); if (!rc) @@ -114,13 +114,13 @@ fill_queue (BOOL block) and return the frame for it Right now, there's only one frame so return it. */ -static FRAME_PTR +static FRAME_PTR get_frame (void) { return SELECTED_FRAME (); } -/* Translate console modifiers to emacs modifiers. +/* Translate console modifiers to emacs modifiers. German keyboard support (Kai Morgan Zeise 2/18/95). */ int w32_kbd_mods_to_emacs (DWORD mods, WORD key) @@ -129,18 +129,18 @@ w32_kbd_mods_to_emacs (DWORD mods, WORD key) /* If we recognize right-alt and left-ctrl as AltGr, and it has been pressed, first remove those modifiers. */ - if (!NILP (Vw32_recognize_altgr) - && (mods & (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) + if (!NILP (Vw32_recognize_altgr) + && (mods & (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) == (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) mods &= ~ (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED); if (mods & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) retval = ((NILP (Vw32_alt_is_meta)) ? alt_modifier : meta_modifier); - + if (mods & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) { retval |= ctrl_modifier; - if ((mods & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) + if ((mods & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) == (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) retval |= meta_modifier; } @@ -212,14 +212,14 @@ w32_kbd_patch_key (KEY_EVENT_RECORD *event) isdead = 0; return 1; } - if (event->uChar.AsciiChar != 0) + if (event->uChar.AsciiChar != 0) return 1; memset (keystate, 0, sizeof (keystate)); keystate[key_code] = 0x80; - if (mods & SHIFT_PRESSED) + if (mods & SHIFT_PRESSED) keystate[VK_SHIFT] = 0x80; - if (mods & CAPSLOCK_ON) + if (mods & CAPSLOCK_ON) keystate[VK_CAPITAL] = 1; /* If we recognize right-alt and left-ctrl as AltGr, set the key states accordingly before invoking ToAscii. */ @@ -272,7 +272,7 @@ w32_kbd_patch_key (KEY_EVENT_RECORD *event) keystate, (LPWORD) ansi_code, 0); } - if (isdead == 0) + if (isdead == 0) return 0; event->uChar.AsciiChar = ansi_code[0]; return isdead; @@ -283,9 +283,9 @@ extern char *lispy_function_keys[]; static int faked_key = 0; -/* return code -1 means that event_queue_ptr won't be incremented. +/* return code -1 means that event_queue_ptr won't be incremented. In other word, this event makes two key codes. (by himi) */ -int +int key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead) { static int mod_key_state = 0; @@ -506,7 +506,7 @@ w32_console_toggle_lock_key (int vk_code, Lisp_Object new_state) } /* Mouse position hook. */ -void +void w32_console_mouse_position (FRAME_PTR *f, int insist, Lisp_Object *bar_window, @@ -523,16 +523,16 @@ w32_console_mouse_position (FRAME_PTR *f, *bar_window = Qnil; *part = 0; SELECTED_FRAME ()->mouse_moved = 0; - + *x = movement_pos.X; *y = movement_pos.Y; *time = movement_time; - + UNBLOCK_INPUT; } /* Remember mouse motion and notify emacs. */ -static void +static void mouse_moved_to (int x, int y) { /* If we're in the same place, ignore it */ @@ -563,14 +563,14 @@ static int emacs_button_translation[NUM_TRANSLATED_MOUSE_BUTTONS] = 0, 2, 1 }; -static int +static int do_mouse_event (MOUSE_EVENT_RECORD *event, struct input_event *emacs_ev) { static DWORD button_state = 0; DWORD but_change, mask; int i; - + if (event->dwEventFlags == MOUSE_MOVED) { /* For movement events we just note that the mouse has moved @@ -578,14 +578,14 @@ do_mouse_event (MOUSE_EVENT_RECORD *event, mouse_moved_to (event->dwMousePosition.X, event->dwMousePosition.Y); return 0; } - + /* It looks like the console code sends us a mouse event with dwButtonState == 0 when a window is activated. Ignore this case. */ if (event->dwButtonState == button_state) return 0; - + emacs_ev->kind = MOUSE_CLICK_EVENT; - + /* Find out what button has changed state since the last button event. */ but_change = button_state ^ event->dwButtonState; mask = 1; @@ -603,7 +603,7 @@ do_mouse_event (MOUSE_EVENT_RECORD *event, emacs_ev->timestamp = GetTickCount (); emacs_ev->modifiers = w32_kbd_mods_to_emacs (event->dwControlKeyState, 0) | ((event->dwButtonState & mask) ? down_modifier : up_modifier); - + XSETFASTINT (emacs_ev->x, event->dwMousePosition.X); XSETFASTINT (emacs_ev->y, event->dwMousePosition.Y); /* for Mule 2.2 (Based on Emacs 19.28 */ @@ -612,15 +612,15 @@ do_mouse_event (MOUSE_EVENT_RECORD *event, #else XSETFRAME (emacs_ev->frame_or_window, get_frame ()); #endif - + return 1; } -static void +static void resize_event (WINDOW_BUFFER_SIZE_RECORD *event) { FRAME_PTR f = get_frame (); - + change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1); SET_FRAME_GARBAGED (f); } @@ -641,7 +641,7 @@ maybe_generate_resize_event () 0, 0); } -int +int w32_console_read_socket (int sd, struct input_event *bufp, int numchars, int expected) { @@ -654,10 +654,10 @@ w32_console_read_socket (int sd, struct input_event *bufp, int numchars, interrupt_input_pending = 1; return -1; } - + interrupt_input_pending = 0; BLOCK_INPUT; - + for (;;) { nev = fill_queue (0); @@ -677,7 +677,7 @@ w32_console_read_socket (int sd, struct input_event *bufp, int numchars, case KEY_EVENT: add = key_event (&queue_ptr->Event.KeyEvent, bufp, &isdead); if (add == -1) /* 95.7.25 by himi */ - { + { queue_ptr--; add = 1; } @@ -697,13 +697,13 @@ w32_console_read_socket (int sd, struct input_event *bufp, int numchars, if (w32_use_full_screen_buffer) resize_event (&queue_ptr->Event.WindowBufferSizeEvent); break; - + case MENU_EVENT: case FOCUS_EVENT: /* Internal event types, ignored. */ break; } - + queue_ptr++; nev--; } diff --git a/src/w32inevt.h b/src/w32inevt.h index 6ac5ea303e5..7df989bffdc 100644 --- a/src/w32inevt.h +++ b/src/w32inevt.h @@ -21,12 +21,12 @@ Boston, MA 02111-1307, USA. */ #ifndef EMACS_W32INEVT_H #define EMACS_W32INEVT_H -extern int w32_console_read_socket (int sd, struct input_event *bufp, +extern int w32_console_read_socket (int sd, struct input_event *bufp, int numchars, int expected); -extern void w32_console_mouse_position (FRAME_PTR *f, int insist, - Lisp_Object *bar_window, - enum scroll_bar_part *part, - Lisp_Object *x, Lisp_Object *y, +extern void w32_console_mouse_position (FRAME_PTR *f, int insist, + Lisp_Object *bar_window, + enum scroll_bar_part *part, + Lisp_Object *x, Lisp_Object *y, unsigned long *time); #endif /* EMACS_W32INEVT_H */ diff --git a/src/w32menu.c b/src/w32menu.c index 632685c337d..dbf14aaeeb8 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -69,7 +69,7 @@ typedef struct _widget_value char* name; /* value (meaning depend on widget type) */ char* value; - /* keyboard equivalent. no implications for XtTranslations */ + /* keyboard equivalent. no implications for XtTranslations */ char* key; /* Help string or nil if none. GC finds this string through the frame's menu_bar_vector @@ -500,7 +500,7 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth) /* This is a subroutine of single_keymap_panes that handles one keymap entry. - KEY is a key in a keymap and ITEM is its binding. + KEY is a key in a keymap and ITEM is its binding. PENDING_MAPS_PTR points to a list of keymaps waiting to be made into separate panes. If NOTREAL is nonzero, only check for equivalent key bindings, don't @@ -516,7 +516,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth) Lisp_Object map, item_string, enabled; struct gcpro gcpro1, gcpro2; int res; - + /* Parse the menu item and leave the result in item_properties. */ GCPRO2 (key, item); res = parse_menu_item (item, notreal, 0); @@ -525,7 +525,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth) return; /* Not a menu item. */ map = AREF (item_properties, ITEM_PROPERTY_MAP); - + if (notreal) { /* We don't want to make a menu, just traverse the keymaps to @@ -536,7 +536,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth) } enabled = AREF (item_properties, ITEM_PROPERTY_ENABLE); - item_string = AREF (item_properties, ITEM_PROPERTY_NAME); + item_string = AREF (item_properties, ITEM_PROPERTY_NAME); if (!NILP (map) && SREF (item_string, 0) == '@') { @@ -811,7 +811,7 @@ cached information about equivalent key sequences. */) keymaps = 0; } - + if (NILP (position)) { discard_menu_items (); @@ -828,8 +828,8 @@ cached information about equivalent key sequences. */) discard_menu_items (); UNGCPRO; return Qnil; - } - + } + /* Display them in a menu. */ BLOCK_INPUT; @@ -974,7 +974,7 @@ on the left of the dialog box and all following items on the right. But first we recompute the menu bar contents (the whole tree). This way we can safely execute Lisp code. */ - + void x_activate_menubar (f) FRAME_PTR f; @@ -1105,7 +1105,7 @@ free_menubar_widget_value_tree (wv) widget_value *wv; { if (! wv) return; - + wv->name = wv->value = wv->key = (char *) 0xDEADBEEF; if (wv->contents && (wv->contents != (widget_value*)1)) @@ -1171,7 +1171,7 @@ parse_single_submenu (item_key, item_name, maps) item_key, 0, 10); } } - + return top_level_items; } @@ -1200,7 +1200,7 @@ digest_single_submenu (start, end, top_level_items) first_wv = wv; save_wv = 0; prev_wv = 0; - + /* Loop over all panes and items made by the preceding call to parse_single_submenu and construct a tree of widget_value objects. Ignore the panes and items used by previous calls to @@ -1304,7 +1304,7 @@ digest_single_submenu (start, end, top_level_items) #endif /* not HAVE_MULTILINGUAL_MENU */ wv = xmalloc_widget_value (); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else save_wv->contents = wv; @@ -1477,7 +1477,7 @@ set_frame_menubar (f, first_time, deep_p) menu_items_n_panes = submenu_n_panes[i]; wv = digest_single_submenu (submenu_start[i], submenu_end[i], submenu_top_level_items[i]); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else first_wv->contents = wv; @@ -1559,7 +1559,7 @@ set_frame_menubar (f, first_time, deep_p) This value just has to be different from small integers. */ wv->call_data = (void *) (EMACS_INT) (-1); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else first_wv->contents = wv; @@ -1595,7 +1595,7 @@ set_frame_menubar (f, first_time, deep_p) f->output_data.w32->menubar_widget = menubar_widget; SetMenu (FRAME_W32_WINDOW (f), f->output_data.w32->menubar_widget); - /* Causes flicker when menu bar is updated + /* Causes flicker when menu bar is updated DrawMenuBar (FRAME_W32_WINDOW (f)); */ /* Force the window size to be recomputed so that the frame's text @@ -1697,7 +1697,7 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error) wv->help = Qnil; first_wv = wv; first_pane = 1; - + /* Loop over all panes and items, filling in the tree. */ i = 0; while (i < menu_items_used) @@ -1800,9 +1800,9 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error) #endif /* not HAVE_MULTILINGUAL_MENU */ wv = xmalloc_widget_value (); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; - else + else save_wv->contents = wv; wv->name = (char *) SDATA (item_name); if (!NILP (descrip)) @@ -1872,7 +1872,7 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error) menu_item_selection = 0; /* Display the menu. */ - menu_item_selection = SendMessage (FRAME_W32_WINDOW (f), + menu_item_selection = SendMessage (FRAME_W32_WINDOW (f), WM_EMACS_TRACKPOPUPMENU, (WPARAM)menu, (LPARAM)&pos); @@ -1981,7 +1981,7 @@ w32_dialog_show (f, keymaps, title, error) pane_name = AREF (menu_items, MENU_ITEMS_PANE_NAME); prefix = AREF (menu_items, MENU_ITEMS_PANE_PREFIX); pane_string = (NILP (pane_name) - ? "" : (char *) SDATA (pane_name)); + ? "" : (char *) SDATA (pane_name)); prev_wv = xmalloc_widget_value (); prev_wv->value = pane_string; if (keymaps && !NILP (prefix)) @@ -1990,12 +1990,12 @@ w32_dialog_show (f, keymaps, title, error) prev_wv->name = "message"; prev_wv->help = Qnil; first_wv = prev_wv; - + /* Loop over all panes and items, filling in the tree. */ i = MENU_ITEMS_PANE_LENGTH; while (i < menu_items_used) { - + /* Create a new item within current pane. */ Lisp_Object item_name, enable, descrip, help; @@ -2003,7 +2003,7 @@ w32_dialog_show (f, keymaps, title, error) enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY); help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP); - + if (NILP (item_name)) { free_menubar_widget_value_tree (first_wv); @@ -2087,7 +2087,7 @@ w32_dialog_show (f, keymaps, title, error) /* Process events that apply to the menu. */ popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id); - lw_destroy_all_widgets (dialog_id); + lw_destroy_all_widgets (dialog_id); /* Find the selected item, and its pane, to return the proper value. */ @@ -2164,7 +2164,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) fuFlags = MF_SEPARATOR; out_string = NULL; } - else + else { if (wv->enabled) fuFlags = MF_STRING; diff --git a/src/w32proc.c b/src/w32proc.c index c009582b1c7..7241784925c 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -120,11 +120,11 @@ typedef void (_CALLBACK_ *signal_handler)(int); static signal_handler sig_handlers[NSIG]; /* Fake signal implementation to record the SIGCHLD handler. */ -signal_handler +signal_handler sys_signal (int sig, signal_handler handler) { signal_handler old; - + if (sig != SIGCHLD) { errno = EINVAL; @@ -151,7 +151,7 @@ new_child (void) { child_process *cp; DWORD id; - + for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--) if (!CHILD_ACTIVE (cp)) goto Initialise; @@ -182,7 +182,7 @@ new_child (void) return NULL; } -void +void delete_child (child_process *cp) { int i; @@ -257,14 +257,14 @@ find_child_pid (DWORD pid) is normally blocked until woken by select() to check for input by reading one char. When the read completes, char_avail is signalled to wake up the select emulator and the thread blocks itself again. */ -DWORD WINAPI +DWORD WINAPI reader_thread (void *arg) { child_process *cp; - + /* Our identity */ cp = (child_process *)arg; - + /* We have to wait for the go-ahead before we can start */ if (cp == NULL || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0) @@ -287,11 +287,11 @@ reader_thread (void *arg) if (rc == STATUS_READ_ERROR) return 1; - + /* If the read died, the child has died so let the thread die */ if (rc == STATUS_READ_FAILED) break; - + /* Wait until our input is acknowledged before reading again */ if (WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0) { @@ -308,7 +308,7 @@ reader_thread (void *arg) sys_spawnve, and is not generally valid at any other time. */ static char * process_dir; -static BOOL +static BOOL create_child (char *exe, char *cmdline, char *env, int is_gui_app, int * pPid, child_process *cp) { @@ -319,12 +319,12 @@ create_child (char *exe, char *cmdline, char *env, int is_gui_app, #endif DWORD flags; char dir[ MAXPATHLEN ]; - + if (cp == NULL) abort (); - + memset (&start, 0, sizeof (start)); start.cb = sizeof (start); - + #ifdef HAVE_NTGUI if (NILP (Vw32_start_process_show_window) && !is_gui_app) start.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; @@ -347,7 +347,7 @@ create_child (char *exe, char *cmdline, char *env, int is_gui_app, sec_attrs.nLength = sizeof (sec_attrs); sec_attrs.lpSecurityDescriptor = NULL /* &sec_desc */; sec_attrs.bInheritHandle = FALSE; - + strcpy (dir, process_dir); unixtodos_filename (dir); @@ -383,22 +383,22 @@ create_child (char *exe, char *cmdline, char *env, int is_gui_app, to register the handle with the process This way the select emulator knows how to match file handles with entries in child_procs. */ -void +void register_child (int pid, int fd) { child_process *cp; - + cp = find_child_pid (pid); if (cp == NULL) { DebPrint (("register_child unable to find pid %lu\n", pid)); return; } - + #ifdef FULL_DEBUG DebPrint (("register_child registered fd %d with pid %lu\n", fd, pid)); #endif - + cp->fd = fd; /* thread is initially blocked until select is called; set status so @@ -419,7 +419,7 @@ register_child (int pid, int fd) signal failure to the select emulator. The select emulator then calls this routine to clean up. Since the thread signaled failure we can assume it is exiting. */ -static void +static void reap_subprocess (child_process *cp) { if (cp->procinfo.hProcess) @@ -448,7 +448,7 @@ reap_subprocess (child_process *cp) When it does, close its handle Return the pid and fill in the status if non-NULL. */ -int +int sys_wait (int *status) { DWORD active, retval; @@ -456,7 +456,7 @@ sys_wait (int *status) int pid; child_process *cp, *cps[MAX_CHILDREN]; HANDLE wait_hnd[MAX_CHILDREN]; - + nh = 0; if (dead_child != NULL) { @@ -479,7 +479,7 @@ sys_wait (int *status) nh++; } } - + if (nh == 0) { /* Nothing to wait on, so fail */ @@ -535,7 +535,7 @@ get_result: retval = SIGINT; else retval <<= 8; - + cp = cps[active]; pid = cp->pid; #ifdef FULL_DEBUG @@ -571,7 +571,7 @@ get_result: } reap_subprocess (cp); - + return pid; } @@ -580,7 +580,7 @@ w32_executable_type (char * filename, int * is_dos_app, int * is_cygnus_app, int { file_data executable; char * p; - + /* Default values in case we can't tell for sure. */ *is_dos_app = FALSE; *is_cygnus_app = FALSE; @@ -590,7 +590,7 @@ w32_executable_type (char * filename, int * is_dos_app, int * is_cygnus_app, int return; p = strrchr (filename, '.'); - + /* We can only identify DOS .com programs from the extension. */ if (p && stricmp (p, ".com") == 0) *is_dos_app = TRUE; @@ -623,11 +623,11 @@ w32_executable_type (char * filename, int * is_dos_app, int * is_cygnus_app, int nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew); - if ((char *) nt_header > (char *) dos_header + executable.size) + if ((char *) nt_header > (char *) dos_header + executable.size) { /* Some dos headers (pkunzip) have bogus e_lfanew fields. */ *is_dos_app = TRUE; - } + } else if (nt_header->Signature != IMAGE_NT_SIGNATURE && LOWORD (nt_header->Signature) != IMAGE_OS2_SIGNATURE) { @@ -664,7 +664,7 @@ w32_executable_type (char * filename, int * is_dos_app, int * is_cygnus_app, int *is_gui_app = (nt_header->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI); } } - + unwind: close_file_data (&executable); } @@ -717,7 +717,7 @@ merge_and_sort_env (char **envp1, char **envp2, char **new_envp) /* When a new child process is created we need to register it in our list, so intercept spawn requests. */ -int +int sys_spawnve (int mode, char *cmdname, char **argv, char **envp) { Lisp_Object program, full; @@ -746,7 +746,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) if (NILP (Ffile_executable_p (program))) { struct gcpro gcpro1; - + full = Qnil; GCPRO1 (program); openp (Vexec_path, program, Vexec_suffixes, &full, make_number (X_OK)); @@ -789,7 +789,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) } unixtodos_filename (cmdname); } - + /* we have to do some conjuring here to put argv and envp into the form CreateProcess wants... argv needs to be a space separated/null terminated list of parameters, and envp is a null @@ -830,8 +830,8 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) else escape_char = is_cygnus_app ? '"' : '\\'; } - - /* Cygwin apps needs quoting a bit more often */ + + /* Cygwin apps needs quoting a bit more often */ if (escape_char == '"') sepchars = "\r\n\t\f '"; @@ -966,7 +966,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) targ++; } *--parg = '\0'; - + /* and envp... */ arglen = 1; targ = envp; @@ -977,7 +977,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) numenv++; } /* extra env vars... */ - sprintf (ppid_env_var_buffer, "EM_PARENT_PROCESS_ID=%d", + sprintf (ppid_env_var_buffer, "EM_PARENT_PROCESS_ID=%d", GetCurrentProcessId ()); arglen += strlen (ppid_env_var_buffer) + 1; numenv++; @@ -1004,7 +1004,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) errno = EAGAIN; return -1; } - + /* Now create the process. */ if (!create_child (cmdname, cmdline, env, is_gui_app, &pid, cp)) { @@ -1012,7 +1012,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) errno = ENOEXEC; return -1; } - + return pid; } @@ -1043,7 +1043,7 @@ extern HANDLE interrupt_handle; /* From process.c */ extern int proc_buffered_char[]; -int +int sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, EMACS_TIME *timeout) { @@ -1054,11 +1054,11 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, child_process *cp, *cps[MAX_CHILDREN]; HANDLE wait_hnd[MAXDESC + MAX_CHILDREN]; int fdindex[MAXDESC]; /* mapping from wait handles back to descriptors */ - + timeout_ms = timeout ? (timeout->tv_sec * 1000 + timeout->tv_usec / 1000) : INFINITE; /* If the descriptor sets are NULL but timeout isn't, then just Sleep. */ - if (rfds == NULL && wfds == NULL && efds == NULL && timeout != NULL) + if (rfds == NULL && wfds == NULL && efds == NULL && timeout != NULL) { Sleep (timeout_ms); return 0; @@ -1070,7 +1070,7 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, errno = EINVAL; return -1; } - + orfds = *rfds; FD_ZERO (rfds); nr = 0; @@ -1078,7 +1078,7 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, /* Always wait on interrupt_handle, to detect C-g (quit). */ wait_hnd[0] = interrupt_handle; fdindex[0] = -1; - + /* Build a list of pipe handles to wait on. */ nh = 1; for (i = 0; i < nfds; i++) @@ -1195,15 +1195,15 @@ count_children: cps[nc] = cp; nc++; } - + /* Nothing to look for, so we didn't find anything */ - if (nh + nc == 0) + if (nh + nc == 0) { if (timeout) Sleep (timeout_ms); return 0; } - + start_time = GetTickCount (); /* Wait for input or child death to be signalled. If user input is @@ -1362,14 +1362,14 @@ find_child_console (HWND hwnd, LPARAM arg) return TRUE; } -int +int sys_kill (int pid, int sig) { child_process *cp; HANDLE proc_hand; int need_to_free = 0; int rc = 0; - + /* Only handle signals that will result in the process dying */ if (sig != SIGINT && sig != SIGKILL && sig != SIGQUIT && sig != SIGHUP) { @@ -1396,7 +1396,7 @@ sys_kill (int pid, int sig) /* Try to locate console window for process. */ EnumWindows (find_child_console, (LPARAM) cp); } - + if (sig == SIGINT || sig == SIGQUIT) { if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd) @@ -1572,15 +1572,15 @@ prepare_standard_handles (int in, int out, int err, HANDLE handles[3]) handles[2] = GetStdHandle (STD_ERROR_HANDLE); /* make inheritable copies of the new handles */ - if (!DuplicateHandle (parent, + if (!DuplicateHandle (parent, (HANDLE) _get_osfhandle (in), parent, - &newstdin, - 0, - TRUE, + &newstdin, + 0, + TRUE, DUPLICATE_SAME_ACCESS)) report_file_error ("Duplicating input handle for child", Qnil); - + if (!DuplicateHandle (parent, (HANDLE) _get_osfhandle (out), parent, @@ -1589,7 +1589,7 @@ prepare_standard_handles (int in, int out, int err, HANDLE handles[3]) TRUE, DUPLICATE_SAME_ACCESS)) report_file_error ("Duplicating output handle for child", Qnil); - + if (!DuplicateHandle (parent, (HANDLE) _get_osfhandle (err), parent, @@ -1602,7 +1602,7 @@ prepare_standard_handles (int in, int out, int err, HANDLE handles[3]) /* and store them as our std handles */ if (!SetStdHandle (STD_INPUT_HANDLE, newstdin)) report_file_error ("Changing stdin handle", Qnil); - + if (!SetStdHandle (STD_OUTPUT_HANDLE, newstdout)) report_file_error ("Changing stdout handle", Qnil); @@ -1933,7 +1933,7 @@ human-readable form. */) return make_number (GetUserDefaultLCID ()); } - + DEFUN ("w32-set-current-locale", Fw32_set_current_locale, Sw32_set_current_locale, 1, 1, 0, doc: /* Make Windows locale LCID be the current locale setting for Emacs. If successful, the new locale id is returned, otherwise nil. */) @@ -1990,7 +1990,7 @@ DEFUN ("w32-get-console-codepage", Fw32_get_console_codepage, return make_number (GetConsoleCP ()); } - + DEFUN ("w32-set-console-codepage", Fw32_set_console_codepage, Sw32_set_console_codepage, 1, 1, 0, doc: /* Make Windows codepage CP be the current codepage setting for Emacs. @@ -2019,7 +2019,7 @@ DEFUN ("w32-get-console-output-codepage", Fw32_get_console_output_codepage, return make_number (GetConsoleOutputCP ()); } - + DEFUN ("w32-set-console-output-codepage", Fw32_set_console_output_codepage, Sw32_set_console_output_codepage, 1, 1, 0, doc: /* Make Windows codepage CP be the current codepage setting for Emacs. @@ -2099,7 +2099,7 @@ The return value is the cons of the language id and the layout id. */) make_number ((kl >> 16) & 0xffff)); } - + DEFUN ("w32-set-keyboard-layout", Fw32_set_keyboard_layout, Sw32_set_keyboard_layout, 1, 1, 0, doc: /* Make LAYOUT be the current keyboard layout for Emacs. @@ -2218,7 +2218,7 @@ process temporarily). A value of zero disables waiting entirely. */); This applies when performing completions and file name expansion. Note that the value of this setting also affects remote file names, so you probably don't want to set to non-nil if you use case-sensitive -filesystems via ange-ftp. */); +filesystems via ange-ftp. */); Vw32_downcase_file_names = Qnil; #if 0 diff --git a/src/w32reg.c b/src/w32reg.c index 6a8413fdc08..3a2bd1b68d9 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */ #define REG_ROOT "SOFTWARE\\GNU\\Emacs" -LPBYTE +LPBYTE w32_get_string_resource (name, class, dwexptype) char *name, *class; DWORD dwexptype; @@ -41,23 +41,23 @@ w32_get_string_resource (name, class, dwexptype) DWORD cbData; BOOL ok = FALSE; HKEY hive = HKEY_CURRENT_USER; - + trykey: BLOCK_INPUT; - + /* Check both the current user and the local machine to see if we have any resources */ if (RegOpenKeyEx (hive, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) { char *keyname; - + if (RegQueryValueEx (hrootkey, name, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS && dwType == dwexptype) { keyname = name; - } + } else if (RegQueryValueEx (hrootkey, class, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS && dwType == dwexptype) { @@ -67,17 +67,17 @@ w32_get_string_resource (name, class, dwexptype) { keyname = NULL; } - + ok = (keyname && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL && RegQueryValueEx (hrootkey, keyname, NULL, NULL, lpvalue, &cbData) == ERROR_SUCCESS); - + RegCloseKey (hrootkey); } - + UNBLOCK_INPUT; - - if (!ok) + + if (!ok) { if (lpvalue) { @@ -90,7 +90,7 @@ w32_get_string_resource (name, class, dwexptype) goto trykey; } return (NULL); - } + } return (lpvalue); } diff --git a/src/w32term.h b/src/w32term.h index bc99e0f36f2..667bf9a5b45 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -66,7 +66,7 @@ extern struct frame *x_window_to_frame (); /* Structure recording bitmaps and reference count. If REFCOUNT is 0 then this record is free to be reused. */ -struct w32_bitmap_record +struct w32_bitmap_record { Pixmap pixmap; char *file; @@ -337,7 +337,7 @@ struct w32_output /* Foreground color for scroll bars. A value of -1 means use the default (black for non-toolkit scroll bars). */ COLORREF scroll_bar_foreground_pixel; - + /* Background color for scroll bars. A value of -1 means use the default (background color of the frame for non-toolkit scroll bars). */ @@ -355,7 +355,7 @@ struct w32_output /* Window whose cursor is hourglass_cursor. This window is temporarily mapped to display an hourglass cursor. */ Window hourglass_window; - + /* Non-zero means hourglass cursor is currently displayed. */ unsigned hourglass_p : 1; @@ -595,7 +595,7 @@ struct scroll_bar { /* Return the length of the rectangle within which the top of the handle must stay. This isn't equivalent to the inside height, - because the scroll bar handle has a minimum height. + because the scroll bar handle has a minimum height. This is the real range of motion for the scroll bar, so when we're scaling buffer positions to scroll bar positions, we use this, not @@ -658,7 +658,7 @@ struct scroll_bar { + (f)->output_data.w32->internal_border_width) -/* Return the row/column (zero-based) of the character cell containing +/* Return the row/column (zero-based) of the character cell containing the pixel on FRAME at ROW/COL. */ #define PIXEL_TO_CHAR_ROW(f, row) \ (((row) - (f)->output_data.w32->internal_border_width) \ @@ -739,11 +739,11 @@ extern void x_fullscreen_adjust P_ ((struct frame *f, int *, int *, #define WM_EMACS_SETCURSOR (WM_EMACS_START + 19) #define WM_EMACS_END (WM_EMACS_START + 20) -#define WND_FONTWIDTH_INDEX (0) -#define WND_LINEHEIGHT_INDEX (4) -#define WND_BORDER_INDEX (8) -#define WND_SCROLLBAR_INDEX (12) -#define WND_BACKGROUND_INDEX (16) +#define WND_FONTWIDTH_INDEX (0) +#define WND_LINEHEIGHT_INDEX (4) +#define WND_BORDER_INDEX (8) +#define WND_SCROLLBAR_INDEX (12) +#define WND_BACKGROUND_INDEX (16) #define WND_LAST_INDEX (20) #define WND_EXTRA_BYTES (WND_LAST_INDEX) @@ -831,7 +831,7 @@ extern BOOL parse_button (); #define WM_MOUSELEAVE 0x02A3 #define TME_LEAVE 0x00000002; -typedef struct tagTRACKMOUSEEVENT +typedef struct tagTRACKMOUSEEVENT { DWORD cbSize; DWORD dwFlags; diff --git a/src/w32xfns.c b/src/w32xfns.c index 689a2829eb3..887320aa746 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -38,7 +38,7 @@ extern HANDLE keyboard_handle; HANDLE input_available = NULL; HANDLE interrupt_handle = NULL; -void +void init_crit () { InitializeCriticalSection (&critsect); @@ -56,7 +56,7 @@ init_crit () interrupt_handle = CreateEvent (NULL, TRUE, FALSE, NULL); } -void +void delete_crit () { DeleteCriticalSection (&critsect); @@ -160,33 +160,33 @@ int_msg *lpHead = NULL; int_msg *lpTail = NULL; int nQueue = 0; -BOOL +BOOL get_next_msg (lpmsg, bWait) W32Msg * lpmsg; BOOL bWait; { BOOL bRet = FALSE; - + enter_crit (); - + /* The while loop takes care of multiple sets */ - + while (!nQueue && bWait) { leave_crit (); WaitForSingleObject (input_available, INFINITE); enter_crit (); } - + if (nQueue) { bcopy (&(lpHead->w32msg), lpmsg, sizeof (W32Msg)); { int_msg * lpCur = lpHead; - + lpHead = lpHead->lpNext; - + myfree (lpCur); } @@ -197,13 +197,13 @@ get_next_msg (lpmsg, bWait) if (nQueue == 0) ResetEvent (input_available); - + leave_crit (); - + return (bRet); } -BOOL +BOOL post_msg (lpmsg) W32Msg * lpmsg; { @@ -221,14 +221,14 @@ post_msg (lpmsg) { lpTail->lpNext = lpNew; } - else + else { lpHead = lpNew; } lpTail = lpNew; SetEvent (input_available); - + leave_crit (); return (TRUE); @@ -277,7 +277,7 @@ drain_message_queue () * It returns a bitmask that indicates which of the four values * were actually found in the string. For each value found, * the corresponding argument is updated; for each value - * not found, the corresponding argument is left unchanged. + * not found, the corresponding argument is left unchanged. */ static int @@ -287,7 +287,7 @@ read_integer (string, NextString) { register int Result = 0; int Sign = 1; - + if (*string == '+') string++; else if (*string == '-') @@ -306,7 +306,7 @@ read_integer (string, NextString) return (-Result); } -int +int XParseGeometry (string, x, y, width, height) char *string; int *x, *y; @@ -317,23 +317,23 @@ XParseGeometry (string, x, y, width, height) unsigned int tempWidth, tempHeight; int tempX, tempY; char *nextCharacter; - + if ((string == NULL) || (*string == '\0')) return (mask); if (*string == '=') string++; /* ignore possible '=' at beg of geometry spec */ - + strind = (char *)string; - if (*strind != '+' && *strind != '-' && *strind != 'x') + if (*strind != '+' && *strind != '-' && *strind != 'x') { tempWidth = read_integer (strind, &nextCharacter); - if (strind == nextCharacter) + if (strind == nextCharacter) return (0); strind = nextCharacter; mask |= WidthValue; } - - if (*strind == 'x' || *strind == 'X') - { + + if (*strind == 'x' || *strind == 'X') + { strind++; tempHeight = read_integer (strind, &nextCharacter); if (strind == nextCharacter) @@ -341,10 +341,10 @@ XParseGeometry (string, x, y, width, height) strind = nextCharacter; mask |= HeightValue; } - - if ((*strind == '+') || (*strind == '-')) + + if ((*strind == '+') || (*strind == '-')) { - if (*strind == '-') + if (*strind == '-') { strind++; tempX = -read_integer (strind, &nextCharacter); @@ -355,7 +355,7 @@ XParseGeometry (string, x, y, width, height) } else - { + { strind++; tempX = read_integer (strind, &nextCharacter); if (strind == nextCharacter) @@ -363,9 +363,9 @@ XParseGeometry (string, x, y, width, height) strind = nextCharacter; } mask |= XValue; - if ((*strind == '+') || (*strind == '-')) + if ((*strind == '+') || (*strind == '-')) { - if (*strind == '-') + if (*strind == '-') { strind++; tempY = -read_integer (strind, &nextCharacter); @@ -386,12 +386,12 @@ XParseGeometry (string, x, y, width, height) mask |= YValue; } } - + /* If strind isn't at the end of the string the it's an invalid geometry specification. */ - + if (*strind != '\0') return (0); - + if (mask & XValue) *x = tempX; if (mask & YValue) diff --git a/src/widget.c b/src/widget.c index f71193585e6..0bdac7b0bff 100644 --- a/src/widget.c +++ b/src/widget.c @@ -296,7 +296,7 @@ set_frame_size (ew) (the menubar and the parent of the menubar and all that sort of thing are managed by lwlib.) - The EmacsShell widget is simply a replacement for the Shell widget + The EmacsShell widget is simply a replacement for the Shell widget which is able to deal with using an externally-supplied window instead of always creating its own. It is not actually emacs specific, and should possibly have class "Shell" instead of "EmacsShell" to simplify @@ -307,13 +307,13 @@ set_frame_size (ew) /* Hairily merged geometry */ unsigned int w = ew->emacs_frame.frame->width; unsigned int h = ew->emacs_frame.frame->height; - + Widget wmshell = get_wm_shell ((Widget) ew); /* Each Emacs shell is now independent and top-level. */ - + if (! XtIsSubclass (wmshell, shellWidgetClass)) abort (); - /* We don't need this for the moment. The geometry is computed in + /* We don't need this for the moment. The geometry is computed in xfns.c. */ #if 0 /* If the EmacsFrame doesn't have a geometry but the shell does, @@ -326,20 +326,20 @@ set_frame_size (ew) this bogus? I'm not sure.) */ if (!ew->emacs_frame.iconic) XtVaGetValues (wmshell, XtNiconic, &ew->emacs_frame.iconic, NULL); - - + + { char *geom = 0; XtVaGetValues (app_shell, XtNgeometry, &geom, NULL); if (geom) app_flags = XParseGeometry (geom, &app_x, &app_y, &app_w, &app_h); } - + if (ew->emacs_frame.geometry) frame_flags = XParseGeometry (ew->emacs_frame.geometry, &frame_x, &frame_y, &frame_w, &frame_h); - + if (first_frame_p) { /* If this is the first frame created: @@ -516,7 +516,7 @@ update_wm_hints (ew) &char_width, &char_height); char_to_pixel_size (ew, char_width, char_height, &rounded_width, &rounded_height); - get_default_char_pixel_size (ew, &cw, &ch); + get_default_char_pixel_size (ew, &cw, &ch); base_width = (wmshell->core.width - ew->core.width + (rounded_width - (char_width * cw))); @@ -531,7 +531,7 @@ update_wm_hints (ew) XtVaSetValues (wmshell, XtNbaseWidth, (XtArgVal) base_width, XtNbaseHeight, (XtArgVal) base_height, - XtNwidthInc, (XtArgVal) cw, + XtNwidthInc, (XtArgVal) cw, XtNheightInc, (XtArgVal) ch, XtNminWidth, (XtArgVal) (base_width + min_cols * cw), XtNminHeight, (XtArgVal) (base_height + min_rows * ch), @@ -667,7 +667,7 @@ update_from_various_frame_slots (ew) ew->core.border_pixel = x->border_pixel; } -static void +static void EmacsFrameInitialize (request, new, dum1, dum2) Widget request; Widget new; @@ -706,7 +706,7 @@ EmacsFrameInitialize (request, new, dum1, dum2) face_res.default_addr = 0; XtGetSubresources ((Widget) ew, (XtPointer) &f, "default", "Face", &face_res, 1, NULL, 0); - + if (f) ew->emacs_frame.font = f; else if (! ew->emacs_frame.font) @@ -721,7 +721,7 @@ EmacsFrameInitialize (request, new, dum1, dum2) #endif update_from_various_frame_slots (ew); - set_frame_size (ew); + set_frame_size (ew); /*create_frame_gcs (ew); setup_frame_gcs (ew); update_various_frame_slots (ew); */ @@ -745,7 +745,7 @@ EmacsFrameRealize (widget, mask, attrs) *mask |= CWEventMask; XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask, attrs); - update_wm_hints (ew); + update_wm_hints (ew); } extern void free_frame_faces (/* struct frame * */); @@ -781,7 +781,7 @@ EmacsFrameResize (widget) pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows); change_frame_size (f, rows, columns, 0, 1, 0); - update_wm_hints (ew); + update_wm_hints (ew); update_various_frame_slots (ew); cancel_mouse_face (f); @@ -806,14 +806,14 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2) int char_width, char_height; Dimension pixel_width; Dimension pixel_height; - + has_to_recompute_gcs = (cur->emacs_frame.font != new->emacs_frame.font || (cur->emacs_frame.foreground_pixel != new->emacs_frame.foreground_pixel) || (cur->core.background_pixel != new->core.background_pixel) ); - + has_to_recompute_size = (cur->emacs_frame.font != new->emacs_frame.font && cur->core.width == new->core.width && cur->core.height == new->core.height); @@ -825,7 +825,7 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2) setup_frame_gcs (new); needs_a_refresh = True; } - + if (has_to_recompute_size) { pixel_width = new->core.width; @@ -906,7 +906,7 @@ EmacsFrameSetCharSize (widget, columns, rows) EmacsFrame ew = (EmacsFrame) widget; Dimension pixel_width, pixel_height; struct frame *f = ew->emacs_frame.frame; - + if (columns < 3) columns = 3; /* no way buddy */ check_frame_size (f, &rows, &columns); @@ -968,7 +968,7 @@ EmacsFrameSetCharSize (widget, columns, rows) #ifdef SIGIO sigblock (sigmask (SIGIO)); #endif - + /* Do parents first, otherwise LessTif's geometry management enters an infinite loop (as of 2000-01-15). This is fixed in later versions of LessTif (as of 2001-03-13); I'll leave it @@ -991,7 +991,7 @@ EmacsFrameSetCharSize (widget, columns, rows) sigunblock (sigmask (SIGIO)); #endif turn_on_atimers (1); - + lw_refigure_widget (f->output_data.x->column_widget, True); update_hints_inhibit = 0; diff --git a/src/widgetprv.h b/src/widgetprv.h index 91a64c16025..d7bec41289c 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -38,7 +38,7 @@ typedef struct { /* The rest of this is crap and should be deleted. */ int minibuffer; /* 0: normal frames with minibuffers. - * 1: frames without minibuffers + * 1: frames without minibuffers * 2: minibuffer only. */ Boolean unsplittable; /* frame can only have one window */ diff --git a/src/window.c b/src/window.c index 83440f440cc..302eef2414d 100644 --- a/src/window.c +++ b/src/window.c @@ -451,11 +451,11 @@ window so that the location of point becomes invisible. */) CHECK_NUMBER (ncol); hscroll = max (0, XINT (ncol)); - + /* Prevent redisplay shortcuts when changing the hscroll. */ if (XINT (w->hscroll) != hscroll) XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; - + w->hscroll = make_number (hscroll); return ncol; } @@ -543,7 +543,7 @@ coordinates_in_window (w, x, y) if (*x < x0 || *x >= x1) return ON_NOTHING; - + /* In what's below, we subtract 1 when computing right_x because we want the rightmost pixel, which is given by left_pixel+width-1. */ if (w->pseudo_window_p) @@ -578,7 +578,7 @@ coordinates_in_window (w, x, y) as the vertical border. If scroll bars on the left, return the right window. */ part = ON_MODE_LINE; - + if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) { if (abs (*x - x0) < grabbable_width) @@ -592,7 +592,7 @@ coordinates_in_window (w, x, y) && *y >= top_y) { part = ON_HEADER_LINE; - + if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) { if (abs (*x - x0) < grabbable_width) @@ -626,7 +626,7 @@ coordinates_in_window (w, x, y) { /* Other lines than the mode line don't include fringes and scroll bars on the left. */ - + /* Convert X and Y to window-relative pixel coordinates. */ *x -= left_x; *y -= top_y; @@ -659,7 +659,7 @@ coordinates_in_window (w, x, y) { /* Other lines than the mode line don't include fringes and scroll bars on the left. */ - + /* Convert X and Y to window-relative pixel coordinates. */ *x -= left_x; *y -= top_y; @@ -744,7 +744,7 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\ case ON_TEXT: /* X and Y are now window relative pixel coordinates. Convert them to canonical char units before returning them. */ - return Fcons (CANON_X_FROM_PIXEL_X (f, x), + return Fcons (CANON_X_FROM_PIXEL_X (f, x), CANON_Y_FROM_PIXEL_Y (f, y)); case ON_MODE_LINE: @@ -758,13 +758,13 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\ case ON_LEFT_FRINGE: return Qleft_fringe; - + case ON_RIGHT_FRINGE: return Qright_fringe; case ON_LEFT_MARGIN: return Qleft_margin; - + case ON_RIGHT_MARGIN: return Qright_margin; @@ -805,7 +805,7 @@ check_window_containing (w, user_data) XSETWINDOW (*cw->window, w); continue_p = 0; } - + return continue_p; } @@ -839,7 +839,7 @@ window_from_coordinates (f, x, y, part, tool_bar_p) window = Qnil; cw.window = &window, cw.x = &x, cw.y = &y; cw.part = part; foreach_window (f, check_window_containing, &cw); - + /* If not found above, see if it's in the tool bar window, if a tool bar exists. */ if (NILP (window) @@ -876,7 +876,7 @@ column 0. */) CHECK_NUMBER_OR_FLOAT (x); CHECK_NUMBER_OR_FLOAT (y); - return window_from_coordinates (f, + return window_from_coordinates (f, PIXEL_X_FROM_CANON_X (f, x), PIXEL_Y_FROM_CANON_Y (f, y), &part, 0); @@ -976,13 +976,13 @@ if it isn't already recorded. */) old_buffer = current_buffer; set_buffer_internal (b); } - + start_display (&it, w, startp); move_it_vertically (&it, window_box_height (w)); if (it.current_y < it.last_visible_y) move_it_past_eol (&it); value = make_number (IT_CHARPOS (it)); - + if (old_buffer) set_buffer_internal (old_buffer); } @@ -1010,7 +1010,7 @@ DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0, the new value of point. */ if (!EQ (window, selected_window)) ++windows_or_buffers_changed; - + return pos; } @@ -1093,7 +1093,7 @@ window_display_table (w) else if (BUFFERP (w->buffer)) { struct buffer *b = XBUFFER (w->buffer); - + if (DISP_TABLE_P (b->display_table)) dp = XCHAR_TABLE (b->display_table); else if (DISP_TABLE_P (Vstandard_display_table)) @@ -1159,7 +1159,7 @@ unshow_buffer (w) clip_to_bounds (BUF_BEGV_BYTE (b), marker_byte_position (w->pointm), BUF_ZV_BYTE (b))); - + if (WINDOWP (b->last_selected_window) && w == XWINDOW (b->last_selected_window)) b->last_selected_window = Qnil; @@ -1441,7 +1441,7 @@ window_list () Vwindow_list = Fnconc (2, args); } } - + return Vwindow_list; } @@ -1518,14 +1518,14 @@ decode_next_window_args (window, minibuf, all_frames) *window = selected_window; else CHECK_LIVE_WINDOW (*window); - + /* MINIBUF nil may or may not include minibuffers. Decide if it does. */ if (NILP (*minibuf)) *minibuf = minibuf_level ? minibuf_window : Qlambda; else if (!EQ (*minibuf, Qt)) *minibuf = Qlambda; - + /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' => count none of them, or a specific minibuffer window (the active one) to count. */ @@ -1543,7 +1543,7 @@ decode_next_window_args (window, minibuf, all_frames) ; else if (!EQ (*all_frames, Qt)) *all_frames = Qnil; - + /* Now *ALL_FRAMES is t meaning search all frames, nil meaning search just current frame, `visible' meaning search just visible frames, 0 meaning search visible and iconified frames, or a @@ -1563,17 +1563,17 @@ next_window (window, minibuf, all_frames, next_p) int next_p; { decode_next_window_args (&window, &minibuf, &all_frames); - + /* If ALL_FRAMES is a frame, and WINDOW isn't on that frame, just return the first window on the frame. */ if (FRAMEP (all_frames) && !EQ (all_frames, XWINDOW (window)->frame)) return Fframe_first_window (all_frames); - + if (next_p) { Lisp_Object list; - + /* Find WINDOW in the list of all windows. */ list = Fmemq (window, window_list ()); @@ -1597,7 +1597,7 @@ next_window (window, minibuf, all_frames, next_p) else { Lisp_Object candidate, list; - + /* Scan through the list of windows for candidates. If there are candidate windows in front of WINDOW, the last one of these is the one we want. If there are candidates following WINDOW @@ -1703,7 +1703,7 @@ argument ALL_FRAMES is non-nil, cycle through all frames. */) CHECK_NUMBER (arg); window = selected_window; - + for (i = XINT (arg); i > 0; --i) window = Fnext_window (window, Qnil, all_frames); for (; i < 0; ++i) @@ -1748,11 +1748,11 @@ window_list_1 (window, minibuf, all_frames) decode_next_window_args (&window, &minibuf, &all_frames); list = Qnil; - + for (tail = window_list (); CONSP (tail); tail = XCDR (tail)) if (candidate_window_p (XCAR (tail), window, minibuf, all_frames)) list = Fcons (XCAR (tail), list); - + return Fnreverse (list); } @@ -1787,7 +1787,7 @@ window_loop (type, obj, mini, frames) Lisp_Object window, windows, best_window, frame_arg; struct frame *f; struct gcpro gcpro1; - + /* If we're only looping through windows on a particular frame, frame points to that frame. If we're looping through windows on all frames, frame is 0. */ @@ -1797,7 +1797,7 @@ window_loop (type, obj, mini, frames) f = SELECTED_FRAME (); else f = NULL; - + if (f) frame_arg = Qlambda; else if (XFASTINT (frames) == 0) @@ -1826,10 +1826,10 @@ window_loop (type, obj, mini, frames) for (; CONSP (windows); windows = CDR (windows)) { struct window *w; - + window = XCAR (windows); w = XWINDOW (window); - + /* Note that we do not pay attention here to whether the frame is visible, since Fwindow_list skips non-visible frames if that is desired, under the control of frame_arg. */ @@ -1891,7 +1891,7 @@ window_loop (type, obj, mini, frames) && EQ (XWINDOW (XCAR (windows))->frame, XWINDOW (XCAR (XCDR (windows)))->frame)) windows = XCDR (windows); - + /* Now we can safely delete the frame. */ Fdelete_frame (w->frame, Qnil); } @@ -1916,7 +1916,7 @@ window_loop (type, obj, mini, frames) /* Ignore dedicated windows and minibuffers. */ if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) break; - + if (NILP (best_window)) best_window = window; else @@ -1934,10 +1934,10 @@ window_loop (type, obj, mini, frames) { Lisp_Object buffer; struct frame *f = XFRAME (w->frame); - + /* Find another buffer to show in this window. */ buffer = Fother_buffer (obj, Qnil, w->frame); - + /* If this window is dedicated, and in a frame of its own, kill the frame. */ if (EQ (window, FRAME_ROOT_WINDOW (f)) @@ -1950,7 +1950,7 @@ window_loop (type, obj, mini, frames) && EQ (XWINDOW (XCAR (windows))->frame, XWINDOW (XCAR (XCDR (windows)))->frame)) windows = XCDR (windows); - + /* Now we can safely delete the frame. */ Fdelete_frame (w->frame, Qnil); } @@ -2136,7 +2136,7 @@ If FRAME is a frame, search only that frame. */) CHECK_BUFFER (buffer); window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); } - + return Qnil; } @@ -2212,7 +2212,7 @@ check_frame_size (frame, rows, cols) = ((FRAME_MINIBUF_ONLY_P (frame) || ! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT : 2 * MIN_SAFE_WINDOW_HEIGHT); - + if (FRAME_TOP_MARGIN (frame) > 0) min_height += FRAME_TOP_MARGIN (frame); @@ -2236,11 +2236,11 @@ window_fixed_size_p (w, width_p, check_siblings_p) { int fixed_p; struct window *c; - + if (!NILP (w->hchild)) { c = XWINDOW (w->hchild); - + if (width_p) { /* A horiz. combination is fixed-width if all of if its @@ -2261,7 +2261,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) else if (!NILP (w->vchild)) { c = XWINDOW (w->vchild); - + if (width_p) { /* A vert. combination is fixed-width if one of if its @@ -2287,7 +2287,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) { struct buffer *old = current_buffer; Lisp_Object val; - + current_buffer = XBUFFER (w->buffer); val = find_symbol_value (Qwindow_size_fixed); current_buffer = old; @@ -2296,7 +2296,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) if (!EQ (val, Qunbound)) { fixed_p = !NILP (val); - + if (fixed_p && ((EQ (val, Qheight) && width_p) || (EQ (val, Qwidth) && !width_p))) @@ -2309,7 +2309,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) { Lisp_Object child; - + for (child = w->prev; !NILP (child); child = XWINDOW (child)->prev) if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) break; @@ -2328,7 +2328,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) return fixed_p; } - + /* Return the minimum size of window W, not taking fixed-width windows into account. WIDTH_P non-zero means return the minimum width, @@ -2342,12 +2342,12 @@ window_min_size_1 (w, width_p) { struct window *c; int size; - + if (!NILP (w->hchild)) { c = XWINDOW (w->hchild); size = 0; - + if (width_p) { /* The min width of a horizontal combination is @@ -2374,7 +2374,7 @@ window_min_size_1 (w, width_p) { c = XWINDOW (w->vchild); size = 0; - + if (width_p) { /* The min width of a vertical combination is @@ -2433,15 +2433,15 @@ window_min_size (w, width_p, ignore_fixed_p, fixed) fixed_p = 0; else fixed_p = window_fixed_size_p (w, width_p, 1); - + if (fixed) *fixed = fixed_p; - + if (fixed_p) size = width_p ? XFASTINT (w->width) : XFASTINT (w->height); else size = window_min_size_1 (w, width_p); - + return size; } @@ -2470,7 +2470,7 @@ size_window (window, size, width_p, nodelete_p) check_min_window_sizes (); size = max (0, size); - + /* If the window has been "too small" at one point, don't delete it for being "too small" in the future. Preserve it as long as that is at all possible. */ @@ -2495,7 +2495,7 @@ size_window (window, size, width_p, nodelete_p) min_size = width_p ? MIN_SAFE_WINDOW_WIDTH : MIN_SAFE_WINDOW_HEIGHT; else min_size = width_p ? window_min_width : window_min_height; - + if (size < min_size) { delete_window (window); @@ -2547,11 +2547,11 @@ size_window (window, size, width_p, nodelete_p) for (child = *forward; !NILP (child); child = c->next, ++nchildren) { int child_size; - + c = XWINDOW (child); child_size = width_p ? XINT (c->width) : XINT (c->height); total += child_size; - + if (window_fixed_size_p (c, width_p, 0)) { fixed_size += child_size; @@ -2576,7 +2576,7 @@ size_window (window, size, width_p, nodelete_p) for (child = *forward; !NILP (child); child = c->next) { int new_size, old_size; - + c = XWINDOW (child); old_size = width_p ? XFASTINT (c->width) : XFASTINT (c->height); new_size = old_size; @@ -2594,7 +2594,7 @@ size_window (window, size, width_p, nodelete_p) new_size = old_size + each + extra; extra = 0; } - + /* Set new height. Note that size_window also propagates edge positions to children, so it's not a no-op if we didn't change the child's size. */ @@ -2607,7 +2607,7 @@ size_window (window, size, width_p, nodelete_p) /* We should have covered the parent exactly with child windows. */ xassert (size == last_pos - first_pos); - + /* Now delete any children that became too small. */ if (!nodelete_p) for (child = *forward; !NILP (child); child = c->next) @@ -2779,7 +2779,7 @@ selects the buffer of the selected window before each command. */) /* Note that selected_window can be nil when this is called from Fset_window_configuration. */ - + static Lisp_Object select_window_1 (window, recordflag) register Lisp_Object window; @@ -2862,9 +2862,9 @@ display_buffer_1 (window) { Lisp_Object frame = XWINDOW (window)->frame; FRAME_PTR f = XFRAME (frame); - + FRAME_SAMPLE_VISIBILITY (f); - + if (!EQ (frame, selected_frame)) { if (FRAME_ICONIFIED_P (f)) @@ -2872,7 +2872,7 @@ display_buffer_1 (window) else if (FRAME_VISIBLE_P (f)) Fraise_frame (frame); } - + return window; } @@ -2908,7 +2908,7 @@ See `special-display-buffer-names', and `special-display-regexps'. */) return XCDR (car); } return Qnil; -} +} DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0, doc: /* Returns non-nil if a new buffer named BUFFER-NAME would use the same window. @@ -3011,7 +3011,7 @@ displayed. */) XSETFASTINT (tem, 0); else XSETFRAME (tem, last_nonminibuf_frame); - + window = Fget_buffer_window (buffer, tem); if (!NILP (window) && (NILP (not_this_window) || !EQ (window, selected_window))) @@ -3418,7 +3418,7 @@ window_width (window) return XFASTINT (p->width); } - + #define CURBEG(w) \ *(widthflag ? &(XWINDOW (w)->left) : &(XWINDOW (w)->top)) @@ -3461,19 +3461,19 @@ enlarge_window (window, delta, widthflag, preserve_before) { p = XWINDOW (window); parent = p->parent; - + if (NILP (parent)) { if (widthflag) error ("No other window to side of this one"); break; } - + if (widthflag ? !NILP (XWINDOW (parent)->hchild) : !NILP (XWINDOW (parent)->vchild)) break; - + window = parent; } @@ -3563,19 +3563,19 @@ enlarge_window (window, delta, widthflag, preserve_before) { if (this_one > delta) this_one = delta; - + (*setsizefun) (next, (*sizefun) (next) - this_one, 0); (*setsizefun) (window, XINT (*sizep) + this_one, 0); delta -= this_one; } - + next = XWINDOW (next)->next; } - + if (delta == 0) break; - + if (!preserve_before && ! NILP (prev)) { int this_one = ((*sizefun) (prev) @@ -3585,15 +3585,15 @@ enlarge_window (window, delta, widthflag, preserve_before) { if (this_one > delta) this_one = delta; - + first_affected = prev; - + (*setsizefun) (prev, (*sizefun) (prev) - this_one, 0); (*setsizefun) (window, XINT (*sizep) + this_one, 0); delta -= this_one; } - + prev = XWINDOW (prev)->prev; } } @@ -3657,7 +3657,7 @@ enlarge_window (window, delta, widthflag, preserve_before) The function size_window will compute the new height h' of the window from delta1 as: - + e = delta1/n x = delta1 - delta1/n * n for the 1st resizable child h' = h + e + x @@ -3665,11 +3665,11 @@ enlarge_window (window, delta, widthflag, preserve_before) where n is the number of children that can be resized. We can ignore x by choosing a delta1 that is a multiple of n. We want the height of this window to come out as - + h' = h + delta So, delta1 must be - + h + e = h + delta delta1/n = delta delta1 = n * delta. @@ -3731,7 +3731,7 @@ enum save_restore_action RESTORE_ORIG_SIZES }; -static int save_restore_orig_size P_ ((struct window *, +static int save_restore_orig_size P_ ((struct window *, enum save_restore_action)); /* Shrink windows rooted in window W to HEIGHT. Take the space needed @@ -3773,7 +3773,7 @@ shrink_window_lowest_first (w, height) int last_top; last_child = Qnil; - + /* Find the last child. We are taking space from lowest windows first, so we iterate over children from the last child backwards. */ @@ -3784,7 +3784,7 @@ shrink_window_lowest_first (w, height) for (child = last_child; delta && !NILP (child); child = c->prev) { int this_one; - + c = XWINDOW (child); this_one = XFASTINT (c->height) - MIN_SAFE_WINDOW_HEIGHT; @@ -3814,7 +3814,7 @@ shrink_window_lowest_first (w, height) If ACTION is CHECK_ORIG_SIZES, check if orig_top and orig_height members are valid for all windows in the window tree. Value is non-zero if they are valid. - + If ACTION is SAVE_ORIG_SIZES, save members top and height in orig_top and orig_height for all windows in the tree. @@ -3840,7 +3840,7 @@ save_restore_orig_size (w, action) if (!save_restore_orig_size (XWINDOW (w->vchild), action)) success_p = 0; } - + switch (action) { case CHECK_ORIG_SIZES: @@ -3885,10 +3885,10 @@ grow_mini_window (w, delta) { struct frame *f = XFRAME (w->frame); struct window *root; - + xassert (MINI_WINDOW_P (w)); xassert (delta >= 0); - + /* Check values of window_min_width and window_min_height for validity. */ check_min_window_sizes (); @@ -3904,7 +3904,7 @@ grow_mini_window (w, delta) min_height. */ delta = max (0, XFASTINT (root->height) - min_height); } - + if (delta) { /* Save original window sizes and positions, if not already done. */ @@ -3919,7 +3919,7 @@ grow_mini_window (w, delta) w->height = make_number (XFASTINT (w->height) + delta); XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); - + adjust_glyphs (f); } } @@ -4085,7 +4085,7 @@ window_scroll_pixel_based (window, n, whole, noerror) int vscrolled = 0; SET_TEXT_POS_FROM_MARKER (start, w->start); - + /* If PT is not visible in WINDOW, move back one half of the screen. Allow PT to be partially visible, otherwise something like (scroll-down 1) with PT in the line before @@ -4099,7 +4099,7 @@ window_scroll_pixel_based (window, n, whole, noerror) init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); it.current_y = it.last_visible_y; move_it_vertically (&it, - window_box_height (w) / 2); - + /* The function move_iterator_vertically may move over more than the specified y-distance. If it->w is small, e.g. a mini-buffer window, we may end up in front of the window's @@ -4207,9 +4207,9 @@ window_scroll_pixel_based (window, n, whole, noerror) window-scroll-functions. */ w->force_start = Qt; } - + it.current_y = it.vpos = 0; - + /* Preserve the screen position if we must. */ if (preserve_y >= 0) { @@ -4250,7 +4250,7 @@ window_scroll_pixel_based (window, n, whole, noerror) /* Save our position, in case it's correct. */ charpos = IT_CHARPOS (it); bytepos = IT_BYTEPOS (it); - + /* See if point is on a partially visible line at the end. */ move_it_by_lines (&it, 1, 1); if (it.current_y > it.last_visible_y) @@ -4584,7 +4584,7 @@ by this function. */) Lisp_Object result; int hscroll; struct window *w = XWINDOW (selected_window); - + if (NILP (arg)) XSETFASTINT (arg, window_internal_width (w) - 2); else @@ -4614,7 +4614,7 @@ by this function. */) Lisp_Object result; int hscroll; struct window *w = XWINDOW (selected_window); - + if (NILP (arg)) XSETFASTINT (arg, window_internal_width (w) - 2); else @@ -4622,7 +4622,7 @@ by this function. */) hscroll = XINT (w->hscroll) - XINT (arg); result = Fset_window_hscroll (selected_window, make_number (hscroll)); - + if (interactive_p (0)) w->min_hscroll = w->hscroll; @@ -4754,7 +4754,7 @@ and redisplay normally--don't erase and redraw the frame. */) { struct it it; struct text_pos pt; - + SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); move_it_vertically (&it, - window_box_height (w) / 2); @@ -4766,7 +4766,7 @@ and redisplay normally--don't erase and redraw the frame. */) struct it it; struct text_pos pt; int y0, y1, h, nlines; - + SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); y0 = it.current_y; @@ -4783,7 +4783,7 @@ and redisplay normally--don't erase and redraw the frame. */) the end of the buffer, count in some empty lines. */ if (it.vpos < nlines) y1 += (nlines - it.vpos) * CANON_Y_UNIT (it.f); - + h = window_box_height (w) - (y1 - y0); start_display (&it, w, pt); @@ -4808,7 +4808,7 @@ and redisplay normally--don't erase and redraw the frame. */) arg = make_number (ht / 2); else if (XINT (arg) < 0) arg = make_number (XINT (arg) + ht); - + pos = *vmotion (PT, - XINT (arg), w); charpos = pos.bufpos; bytepos = pos.bytepos; @@ -4817,14 +4817,14 @@ and redisplay normally--don't erase and redraw the frame. */) /* Set the new window start. */ set_marker_both (w->start, w->buffer, charpos, bytepos); w->window_end_valid = Qnil; - + w->optional_new_start = Qt; if (bytepos == BEGV_BYTE || FETCH_BYTE (bytepos - 1) == '\n') w->start_at_line_beg = Qt; else w->start_at_line_beg = Qnil; - + set_buffer_internal (obuf); return Qnil; } @@ -5000,7 +5000,7 @@ the return value is nil. Otherwise the value is t. */) frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame; f = XFRAME (frame); - + /* If f is a dead frame, don't bother rebuilding its window tree. However, there is other stuff we should still try to do below. */ if (FRAME_LIVE_P (f)) @@ -5057,7 +5057,7 @@ the return value is nil. Otherwise the value is t. */) FRAME_WINDOW_SIZES_CHANGED (f) = 1; /* Problem: Freeing all matrices and later allocating them again - is a serious redisplay flickering problem. What we would + is a serious redisplay flickering problem. What we would really like to do is to free only those matrices not reused below. */ root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); @@ -5192,7 +5192,7 @@ the return value is nil. Otherwise the value is t. */) set_marker_restricted (XWINDOW (data->current_window)->pointm, make_number (old_point), XWINDOW (data->current_window)->buffer); - + Fselect_window (data->current_window); XBUFFER (XWINDOW (selected_window)->buffer)->last_selected_window = selected_window; @@ -5231,14 +5231,14 @@ the return value is nil. Otherwise the value is t. */) if (NILP (leaf_windows[i]->buffer)) { /* Assert it's not reused as a combination. */ - xassert (NILP (leaf_windows[i]->hchild) + xassert (NILP (leaf_windows[i]->hchild) && NILP (leaf_windows[i]->vchild)); free_window_matrices (leaf_windows[i]); } else if (EQ (leaf_windows[i]->buffer, new_current_buffer)) ++n; } - + adjust_glyphs (f); UNBLOCK_INPUT; @@ -5314,7 +5314,7 @@ count_windows (window) } -/* Fill vector FLAT with leaf windows under W, starting at index I. +/* Fill vector FLAT with leaf windows under W, starting at index I. Value is last index + 1. */ static int @@ -5329,7 +5329,7 @@ get_leaf_windows (w, flat, i) i = get_leaf_windows (XWINDOW (w->hchild), flat, i); else if (!NILP (w->vchild)) i = get_leaf_windows (XWINDOW (w->vchild), flat, i); - else + else flat[i++] = w; w = NILP (w->next) ? 0 : XWINDOW (w->next); @@ -5541,7 +5541,7 @@ A nil width parameter means no margin. */) XSETFASTINT (left, 0); if (INTEGERP (left) && XFASTINT (left) == 0) left = Qnil; - + if ((INTEGERP (right) && XINT (right) < 0) || (FLOATP (right) && XFLOAT_DATA (right) <= 0)) XSETFASTINT (right, 0); @@ -5587,14 +5587,14 @@ Value is a multiple of the canonical character height of WINDOW. */) Lisp_Object result; struct frame *f; struct window *w; - + if (NILP (window)) window = selected_window; else CHECK_WINDOW (window); w = XWINDOW (window); f = XFRAME (w->frame); - + if (FRAME_WINDOW_P (f)) result = CANON_Y_FROM_PIXEL_Y (f, -w->vscroll); else @@ -5613,20 +5613,20 @@ multiple of the canonical character height of WINDOW. */) { struct window *w; struct frame *f; - + if (NILP (window)) window = selected_window; else CHECK_WINDOW (window); CHECK_NUMBER_OR_FLOAT (vscroll); - + w = XWINDOW (window); f = XFRAME (w->frame); if (FRAME_WINDOW_P (f)) { int old_dy = w->vscroll; - + w->vscroll = - CANON_Y_UNIT (f) * XFLOATINT (vscroll); w->vscroll = min (w->vscroll, 0); @@ -5634,14 +5634,14 @@ multiple of the canonical character height of WINDOW. */) area becomes larger than before. */ if (w->vscroll < 0 && w->vscroll < old_dy) adjust_glyphs (f); - + /* Prevent redisplay shortcuts. */ XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; } - + return Fwindow_vscroll (window); } - + /* Call FN for all leaf windows on frame F. FN is called with the first argument being a pointer to the leaf window, and with @@ -5669,16 +5669,16 @@ foreach_window_1 (w, fn, user_data) void *user_data; { int cont; - + for (cont = 1; w && cont;) { if (!NILP (w->hchild)) cont = foreach_window_1 (XWINDOW (w->hchild), fn, user_data); else if (!NILP (w->vchild)) cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); - else + else cont = fn (w, user_data); - + w = NILP (w->next) ? 0 : XWINDOW (w->next); } @@ -5701,7 +5701,7 @@ freeze_window_start (w, freeze_p) && ! NILP (Vminibuf_scroll_window) && w == XWINDOW (Vminibuf_scroll_window))) freeze_p = NULL; - + w->frozen_window_start_p = freeze_p != NULL; return 1; } @@ -5740,7 +5740,7 @@ compare_window_configurations (c1, c2, ignore_positions) wrong_type_argument (Qwindow_configuration_p, c1); if (!WINDOW_CONFIGURATIONP (c2)) wrong_type_argument (Qwindow_configuration_p, c2); - + d1 = (struct save_window_data *) XVECTOR (c1); d2 = (struct save_window_data *) XVECTOR (c2); sw1 = XVECTOR (d1->saved_windows); @@ -5871,7 +5871,7 @@ syms_of_window () { Qwindow_size_fixed = intern ("window-size-fixed"); staticpro (&Qwindow_size_fixed); - + staticpro (&Qwindow_configuration_change_hook); Qwindow_configuration_change_hook = intern ("window-configuration-change-hook"); diff --git a/src/window.h b/src/window.h index 141d482bb60..5f76163231a 100644 --- a/src/window.h +++ b/src/window.h @@ -212,7 +212,7 @@ struct window /* Original window height and top before mini-window was enlarged. */ Lisp_Object orig_height, orig_top; - + /* No Lisp data may follow below this point without changing mark_object in alloc.c. The member current_matrix must be the first non-Lisp member. */ @@ -228,17 +228,17 @@ struct window /* Intended cursor position. This is a position within the glyph matrix. */ struct cursor_pos cursor; - + /* Where the cursor actually is. */ struct cursor_pos phys_cursor; - - /* Cursor type and width of last cursor drawn on the window. + + /* Cursor type and width of last cursor drawn on the window. Used for X and w32 frames; -1 initially. */ int phys_cursor_type, phys_cursor_width; /* This is handy for undrawing the cursor. */ int phys_cursor_ascent, phys_cursor_height; - + /* Non-zero means the cursor is currently displayed. This can be set to zero by functions overpainting the cursor image. */ unsigned phys_cursor_on_p : 1; @@ -261,7 +261,7 @@ struct window /* Amount by which lines of this window are scrolled in y-direction (smooth scrolling). */ int vscroll; - + /* Z_BYTE - the buffer position of the last glyph in the current matrix of W. Only valid if WINDOW_END_VALID is not nil. */ int window_end_bytepos; @@ -284,7 +284,7 @@ struct window /* Return the window column at which the text in window W starts. This is different from the `left' field because it does not include a left-hand scroll bar if any. */ - + #define WINDOW_LEFT_MARGIN(W) \ (XFASTINT ((W)->left) \ + FRAME_LEFT_SCROLL_BAR_WIDTH (XFRAME (WINDOW_FRAME (W)))) @@ -305,16 +305,16 @@ struct window ? FRAME_SCROLL_BAR_COLS (XFRAME (WINDOW_FRAME (W))) \ : 0)) -/* 1 if window W takes up the full width of its frame. */ +/* 1 if window W takes up the full width of its frame. */ #define WINDOW_FULL_WIDTH_P(W) \ (XFASTINT ((W)->width) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W)))) -/* 1 if window W's has no other windows to its right in its frame. */ +/* 1 if window W's has no other windows to its right in its frame. */ #define WINDOW_RIGHTMOST_P(W) \ (WINDOW_RIGHT_EDGE (W) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W)))) - + /* This is the window in which the terminal's cursor should be left when nothing is being done with it. This must diff --git a/src/xdisp.c b/src/xdisp.c index edbf69dfe78..5d3602366da 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -8001,7 +8001,7 @@ redisplay_tool_bar (f) struct it it; struct glyph_row *row; int change_height_p = 0; - + #ifdef USE_GTK if (FRAME_EXTERNAL_TOOL_BAR(f)) update_frame_tool_bar (f); @@ -10908,7 +10908,7 @@ redisplay_window (window, just_this_one_p) redisplay_tool_bar_p = WINDOWP (f->tool_bar_window) && (FRAME_TOOL_BAR_LINES (f) > 0 || auto_resize_tool_bars_p); - + #endif if (redisplay_tool_bar_p) diff --git a/src/xfaces.c b/src/xfaces.c index 4dd0d76155f..bf942be245f 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -494,7 +494,7 @@ static int font_list_1 P_ ((struct frame *, Lisp_Object, Lisp_Object, Lisp_Object, struct font_name **)); static int font_list P_ ((struct frame *, Lisp_Object, Lisp_Object, Lisp_Object, struct font_name **)); -static int try_font_list P_ ((struct frame *, Lisp_Object *, +static int try_font_list P_ ((struct frame *, Lisp_Object *, Lisp_Object, Lisp_Object, struct font_name **, int)); static int try_alternative_families P_ ((struct frame *f, Lisp_Object, @@ -974,13 +974,13 @@ clear_face_cache (clear_fonts_p) || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) { struct x_display_info *dpyinfo; - + /* Fonts are common for frames on one display, i.e. on one X screen. */ for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) if (dpyinfo->n_fonts > CLEAR_FONT_TABLE_NFONTS) clear_font_table (dpyinfo); - + /* From time to time see if we can unload some fonts. This also frees all realized faces on all frames. Fonts needed by faces will be loaded again when faces are realized again. */ @@ -1401,7 +1401,7 @@ tty_defined_color (f, color_name, color_def, alloc) int status = 1; /* Defaults. */ - color_def->pixel = FACE_TTY_DEFAULT_COLOR; + color_def->pixel = FACE_TTY_DEFAULT_COLOR; color_def->red = 0; color_def->blue = 0; color_def->green = 0; @@ -2238,7 +2238,7 @@ xlfd_point_size (f, font) } else pixel = atoi (pixel_field); - + if (pixel == 0) real_pt = 0; else @@ -2306,7 +2306,7 @@ split_font_name (f, font, numeric_p) { char *start, *end; int j; - + for (++p; *p && *p != ']'; ++p) if (*p == '~') *p = '-'; @@ -2689,7 +2689,7 @@ concat_font_list (fonts1, nfonts1, fonts2, nfonts2) If REGISTRY is non-nil, return fonts with that registry and the alternative registries from Vface_alternative_font_registry_alist. - + If REGISTRY is nil return fonts of any registry. Set *FONTS to a vector of font_name structures allocated from the @@ -2703,7 +2703,7 @@ font_list (f, pattern, family, registry, fonts) struct font_name **fonts; { int nfonts = font_list_1 (f, pattern, family, registry, fonts); - + if (!NILP (registry) && CONSP (Vface_alternative_font_registry_alist)) { @@ -3167,7 +3167,7 @@ lface_fully_specified_p (attrs) for (i = 1; i < LFACE_VECTOR_SIZE; ++i) if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX && i != LFACE_AVGWIDTH_INDEX) - if (UNSPECIFIEDP (attrs[i])) + if (UNSPECIFIEDP (attrs[i])) break; return i == LFACE_VECTOR_SIZE; @@ -4308,7 +4308,7 @@ set_font_frame_param (frame, lface) { Lisp_Object font_name; char *font; - + if (STRINGP (LFACE_FONT (lface))) font_name = LFACE_FONT (lface); else @@ -4322,7 +4322,7 @@ set_font_frame_param (frame, lface) font_name = build_string (font); xfree (font); } - + Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), Qnil)); } } @@ -4524,7 +4524,7 @@ x_update_menu_appearance (f) #else const char *popup_path = "menu.popup"; #endif - + if (STRINGP (LFACE_FOREGROUND (lface))) { sprintf (line, "%s.%s*foreground: %s", @@ -4548,7 +4548,7 @@ x_update_menu_appearance (f) XrmPutLineResource (&rdb, line); changed_p = 1; } - + if (face->font_name && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) @@ -4579,7 +4579,7 @@ x_update_menu_appearance (f) #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ -DEFUN ("face-attribute-relative-p", Fface_attribute_relative_p, +DEFUN ("face-attribute-relative-p", Fface_attribute_relative_p, Sface_attribute_relative_p, 2, 2, 0, doc: /* Return non-nil if face ATTRIBUTE VALUE is relative. */) @@ -5252,7 +5252,7 @@ substitution of a `dim' face for italic. */) else if (weight < XLFD_WEIGHT_MEDIUM) test_caps = TTY_CAP_DIM; } - + /* underlining */ val = attrs[LFACE_UNDERLINE_INDEX]; if (!UNSPECIFIEDP (val) && !NILP (val)) @@ -6286,7 +6286,7 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike) REGISTRY, if a string, specifies a font registry and encoding to match. A value of nil means include fonts of any registry and encoding. - + Return in *FONTS a pointer to a vector of font_name structures for the fonts matched. Value is the number of fonts found. */ @@ -6314,7 +6314,7 @@ try_alternative_families (f, family, registry, fonts) nfonts = font_list (f, Qnil, XCAR (alter), registry, fonts); } } - + /* Try scalable fonts before giving up. */ if (nfonts == 0 && NILP (Vscalable_fonts_allowed)) { @@ -6337,7 +6337,7 @@ try_alternative_families (f, family, registry, fonts) REGISTRY, if a string, specifies a font registry and encoding to match. A value of nil means include fonts of any registry and encoding. - + If PREFER_FACE_FAMILY is nonzero, perfer face's family to FAMILY. Otherwise, prefer FAMILY. @@ -6388,7 +6388,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family) family = build_string ("fixed"); nfonts = font_list (f, Qnil, family, registry, fonts); } - + /* Try any family with the given registry. */ if (nfonts == 0) nfonts = font_list (f, Qnil, Qnil, registry, fonts); @@ -6447,7 +6447,7 @@ choose_face_font (f, attrs, fontset, c, needs_overstrike) xassert (!SINGLE_BYTE_CHAR_P (c)); return NULL; } - + /* If what we got is a name pattern, return it. */ if (STRINGP (pattern)) return xstrdup (SDATA (pattern)); @@ -6510,7 +6510,7 @@ realize_basic_faces (f) x_update_menu_appearance (f); #endif } - + success_p = 1; } @@ -6954,10 +6954,10 @@ map_tty_color (f, face, idx, defaulted) pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; } - + XSETFRAME (frame, f); color = face->lface[idx]; - + if (STRINGP (color) && SCHARS (color) && CONSP (Vtty_defined_color_alist) @@ -7052,7 +7052,7 @@ realize_tty_face (cache, attrs, c) /* Map color names to color indices. */ map_tty_color (f, face, LFACE_FOREGROUND_INDEX, &face_colors_defaulted); map_tty_color (f, face, LFACE_BACKGROUND_INDEX, &face_colors_defaulted); - + /* Swap colors if face is inverse-video. If the colors are taken from the frame colors, they are already inverted, since the frame-creation function calls x-handle-reverse-video. */ diff --git a/src/xfns.c b/src/xfns.c index 9612d1c80ce..44a54dafe2c 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -288,11 +288,11 @@ check_x_display_info (frame) Lisp_Object frame; { struct x_display_info *dpyinfo = NULL; - + if (NILP (frame)) { struct frame *sf = XFRAME (selected_frame); - + if (FRAME_X_P (sf) && FRAME_LIVE_P (sf)) dpyinfo = FRAME_X_DISPLAY_INFO (sf); else if (x_display_list != 0) @@ -336,7 +336,7 @@ x_window_to_frame (dpyinfo, wdesc) if (f->output_data.x->hourglass_window == wdesc) return f; #ifdef USE_X_TOOLKIT - if ((f->output_data.x->edit_widget + if ((f->output_data.x->edit_widget && XtWindow (f->output_data.x->edit_widget) == wdesc) /* A tooltip frame? */ || (!f->output_data.x->edit_widget @@ -380,7 +380,7 @@ x_any_window_to_frame (dpyinfo, wdesc) frame = XCAR (tail); if (!GC_FRAMEP (frame)) continue; - + f = XFRAME (frame); if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo) { @@ -399,8 +399,8 @@ x_any_window_to_frame (dpyinfo, wdesc) || gwdesc == x->menubar_widget)) found = f; #else - if (wdesc == XtWindow (x->widget) - || wdesc == XtWindow (x->column_widget) + if (wdesc == XtWindow (x->widget) + || wdesc == XtWindow (x->column_widget) || wdesc == XtWindow (x->edit_widget)) found = f; /* Match if the window is this frame's menubar. */ @@ -413,7 +413,7 @@ x_any_window_to_frame (dpyinfo, wdesc) found = f; } } - + return found; } @@ -450,8 +450,8 @@ x_non_menubar_window_to_frame (dpyinfo, wdesc) || gwdesc == x->vbox_widget)) return f; #else - if (wdesc == XtWindow (x->widget) - || wdesc == XtWindow (x->column_widget) + if (wdesc == XtWindow (x->widget) + || wdesc == XtWindow (x->column_widget) || wdesc == XtWindow (x->edit_widget)) return f; #endif @@ -489,7 +489,7 @@ x_menubar_window_to_frame (dpyinfo, wdesc) { GtkWidget *gwdesc = xg_win_to_widget (wdesc); int found = 0; - + BLOCK_INPUT; if (gwdesc != 0 && (gwdesc == x->menubar_widget @@ -543,7 +543,7 @@ x_top_window_to_frame (dpyinfo, wdesc) but it seems logically wrong, and it causes trouble for MapNotify events. */ /* Match if the window is this frame's menubar. */ - if (x->menubar_widget + if (x->menubar_widget && wdesc == XtWindow (x->menubar_widget)) return f; #endif @@ -860,7 +860,7 @@ static struct x_frame_parm_table x_frame_parms[] = {"right-fringe", x_set_fringe_width}, {"wait-for-wm", x_set_wait_for_wm}, {"fullscreen", x_set_fullscreen}, - + }; /* Attach the `x-frame-parameter' properties to @@ -979,7 +979,7 @@ x_set_frame_parameters (f, alist) cursor_color) are dependent upon them. */ /* Process default font as well, since fringe widths depends on it. */ /* Also, process fullscreen, width and height depend upon that */ - for (p = 0; p < i; p++) + for (p = 0; p < i; p++) { Lisp_Object prop, val; @@ -994,7 +994,7 @@ x_set_frame_parameters (f, alist) old_value = get_frame_param (f, prop); fullscreen_is_being_set |= EQ (prop, Qfullscreen); - + if (NILP (Fequal (val, old_value))) { store_frame_param (f, prop, val); @@ -1094,11 +1094,11 @@ x_set_frame_parameters (f, alist) position. Resize of the frame is taken care of in the code after this if-statement. */ int new_left, new_top; - + x_fullscreen_adjust (f, &width, &height, &new_top, &new_left); x_fullscreen_move (f, new_top, new_left); } - + /* Don't set these parameters unless they've been explicitly specified. The window might be mapped or resized while we're in this function, and we don't want to override that unless the lisp @@ -1242,12 +1242,12 @@ x_real_positions (f, xptr, yptr) win = wm_window; } - + if (! had_errors) { int ign; Window child, rootw; - + /* Get the real coordinates for the WM window upper left corner */ XGetGeometry (FRAME_X_DISPLAY (f), win, &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); @@ -1286,23 +1286,23 @@ x_real_positions (f, xptr, yptr) /* From-window, to-window. */ FRAME_X_DISPLAY_INFO (f)->root_window, FRAME_OUTER_WINDOW (f), - + /* From-position, to-position. */ real_x, real_y, &outer_x, &outer_y, - + /* Child of win. */ &child); } had_errors = x_had_errors_p (FRAME_X_DISPLAY (f)); } - + x_uncatch_errors (FRAME_X_DISPLAY (f), count); - + UNBLOCK_INPUT; if (had_errors) return; - + f->output_data.x->x_pixels_diff = -win_x; f->output_data.x->y_pixels_diff = -win_y; f->output_data.x->x_pixels_outer_diff = -outer_x; @@ -1562,7 +1562,7 @@ x_set_foreground_color (f, arg, oldval) if (FRAME_X_WINDOW (f) != 0) { Display *dpy = FRAME_X_DISPLAY (f); - + BLOCK_INPUT; XSetForeground (dpy, x->normal_gc, fg); XSetBackground (dpy, x->reverse_gc, fg); @@ -1573,15 +1573,15 @@ x_set_foreground_color (f, arg, oldval) x->cursor_pixel = x_copy_color (f, fg); XSetBackground (dpy, x->cursor_gc, x->cursor_pixel); } - + UNBLOCK_INPUT; - + update_face_from_frame_parameter (f, Qforeground_color, arg); - + if (FRAME_VISIBLE_P (f)) redraw_frame (f); } - + unload_color (f, old_fg); } @@ -1600,7 +1600,7 @@ x_set_background_color (f, arg, oldval) if (FRAME_X_WINDOW (f) != 0) { Display *dpy = FRAME_X_DISPLAY (f); - + BLOCK_INPUT; XSetBackground (dpy, x->normal_gc, bg); XSetForeground (dpy, x->reverse_gc, bg); @@ -1689,7 +1689,7 @@ x_set_mouse_color (f, arg, oldval) else hourglass_cursor = XCreateFontCursor (dpy, XC_watch); x_check_errors (dpy, "bad hourglass pointer cursor: %s"); - + x_check_errors (dpy, "bad nontext pointer cursor: %s"); if (!NILP (Vx_mode_pointer_shape)) { @@ -1730,7 +1730,7 @@ x_set_mouse_color (f, arg, oldval) x_query_color (f, &fore_color); back_color.pixel = mask_color; x_query_color (f, &back_color); - + XRecolorCursor (dpy, cursor, &fore_color, &back_color); XRecolorCursor (dpy, nontext_cursor, &fore_color, &back_color); XRecolorCursor (dpy, mode_cursor, &fore_color, &back_color); @@ -1761,7 +1761,7 @@ x_set_mouse_color (f, arg, oldval) && x->modeline_cursor != 0) XFreeCursor (dpy, f->output_data.x->modeline_cursor); x->modeline_cursor = mode_cursor; - + if (cross_cursor != x->cross_cursor && x->cross_cursor != 0) XFreeCursor (dpy, x->cross_cursor); @@ -1795,7 +1795,7 @@ x_set_cursor_color (f, arg, oldval) } else fore_pixel = x->background_pixel; - + pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); pixel_allocated_p = 1; @@ -1807,7 +1807,7 @@ x_set_cursor_color (f, arg, oldval) x_free_colors (f, &pixel, 1); pixel_allocated_p = 0; } - + pixel = x->mouse_pixel; if (pixel == fore_pixel) { @@ -2015,7 +2015,7 @@ x_set_font (f, arg, oldval) ? x_new_fontset (f, SDATA (fontset_name)) : x_new_font (f, SDATA (arg))); UNBLOCK_INPUT; - + if (EQ (result, Qnil)) error ("Font `%s' is not defined", SDATA (arg)); else if (EQ (result, Qt)) @@ -2031,7 +2031,7 @@ x_set_font (f, arg, oldval) } else if (!NILP (Fequal (result, oldval))) return; - + store_frame_param (f, Qfont, result); recompute_basic_faces (f); } @@ -2245,7 +2245,7 @@ x_set_tool_bar_lines (f, value, oldval) return; #endif - + /* Make sure we redisplay all windows in this frame. */ ++windows_or_buffers_changed; @@ -2263,7 +2263,7 @@ x_set_tool_bar_lines (f, value, oldval) FRAME_TOOL_BAR_LINES (f) = nlines; x_change_window_heights (root_window, delta); adjust_glyphs (f); - + /* We also have to make sure that the internal border at the top of the frame, below the menu bar or tool bar, is redrawn when the tool bar disappears. This is so because the internal border is @@ -2309,7 +2309,7 @@ x_set_scroll_bar_foreground (f, value, oldval) Lisp_Object value, oldval; { unsigned long pixel; - + if (STRINGP (value)) pixel = x_decode_color (f, value, BLACK_PIX_DEFAULT (f)); else @@ -2317,7 +2317,7 @@ x_set_scroll_bar_foreground (f, value, oldval) if (f->output_data.x->scroll_bar_foreground_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_foreground_pixel); - + f->output_data.x->scroll_bar_foreground_pixel = pixel; if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) { @@ -2349,10 +2349,10 @@ x_set_scroll_bar_background (f, value, oldval) pixel = x_decode_color (f, value, WHITE_PIX_DEFAULT (f)); else pixel = -1; - + if (f->output_data.x->scroll_bar_background_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_background_pixel); - + #ifdef USE_TOOLKIT_SCROLL_BARS /* Scrollbar shadow colors. */ if (f->output_data.x->scroll_bar_top_shadow_pixel != -1) @@ -2375,7 +2375,7 @@ x_set_scroll_bar_background (f, value, oldval) (*condemn_scroll_bars_hook) (f); if (judge_scroll_bars_hook) (*judge_scroll_bars_hook) (f); - + update_face_from_frame_parameter (f, Qscroll_bar_background, value); redraw_frame (f); } @@ -2470,7 +2470,7 @@ x_set_name (f, name, explicit) Lisp_Object name; int explicit; { - /* Make sure that requests from lisp code override requests from + /* Make sure that requests from lisp code override requests from Emacs redisplay code. */ if (explicit) { @@ -2736,7 +2736,7 @@ x_set_vertical_scroll_bars (f, arg, oldval) = (NILP (arg) ? vertical_scroll_bar_none : EQ (Qright, arg) - ? vertical_scroll_bar_right + ? vertical_scroll_bar_right : vertical_scroll_bar_left); /* We set this parameter before creating the X window for the @@ -2767,7 +2767,7 @@ x_set_scroll_bar_width (f, arg, oldval) /* Make the actual width at least 14 pixels and a multiple of a character width. */ FRAME_SCROLL_BAR_COLS (f) = (14 + wid - 1) / wid; - + /* Use all of that space (aside from required margins) for the scroll bar. */ FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = 0; @@ -3096,7 +3096,7 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type) if (!strcmp (SDATA (tem), "on") || !strcmp (SDATA (tem), "true")) return Qt; - else + else return Qnil; case RES_TYPE_STRING: @@ -3215,11 +3215,11 @@ x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass, specified. */ tem = Qnil; } - + #else /* not USE_TOOLKIT_SCROLL_BARS */ - + tem = Qnil; - + #endif /* not USE_TOOLKIT_SCROLL_BARS */ } @@ -3417,7 +3417,7 @@ x_figure_window_size (f, parms) { int left, top; int width, height; - + /* It takes both for some WM:s to place it where we want */ window_prompting = USPosition | PPosition; x_fullscreen_adjust (f, &width, &height, &top, &left); @@ -3428,7 +3428,7 @@ x_figure_window_size (f, parms) f->output_data.x->left_pos = left; f->output_data.x->top_pos = top; } - + return window_prompting; } @@ -3551,13 +3551,13 @@ xic_create_xfontset (f, base_fontname) char **missing_list; int missing_count; char *def_string; - + xfs = XCreateFontSet (FRAME_X_DISPLAY (f), base_fontname, &missing_list, &missing_count, &def_string); if (missing_list) XFreeStringList (missing_list); - + /* No need to free def_string. */ return xfs; } @@ -3597,7 +3597,7 @@ create_frame_xic (f) if (FRAME_XIC (f)) return; - + xim = FRAME_X_XIM (f); if (xim) { @@ -3695,7 +3695,7 @@ create_frame_xic (f) XFree (preedit_attr); XFree (status_attr); } - + FRAME_XIC (f) = xic; FRAME_XIC_STYLE (f) = xic_style; FRAME_XIC_FONTSET (f) = xfs; @@ -3710,7 +3710,7 @@ free_frame_xic (f) { if (FRAME_XIC (f) == NULL) return; - + XDestroyIC (FRAME_XIC (f)); if (FRAME_XIC_FONTSET (f)) XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f)); @@ -3731,7 +3731,7 @@ xic_set_preeditarea (w, x, y) struct frame *f = XFRAME (w->frame); XVaNestedList attr; XPoint spot; - + spot.x = WINDOW_TO_FRAME_PIXEL_X (w, x); spot.y = WINDOW_TO_FRAME_PIXEL_Y (w, y) + FONT_BASE (FRAME_FONT (f)); attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); @@ -3757,7 +3757,7 @@ xic_set_statusarea (f) attr = XVaCreateNestedList (0, XNAreaNeeded, &area, NULL); XSetICValues (xic, XNStatusAttributes, attr, NULL); XFree (attr); - + attr = XVaCreateNestedList (0, XNAreaNeeded, &needed, NULL); XGetICValues (xic, XNStatusAttributes, attr, NULL); XFree (attr); @@ -3803,7 +3803,7 @@ xic_set_xfontset (f, base_fontname) if (FRAME_XIC_STYLE (f) & XIMStatusArea) XSetICValues (FRAME_XIC (f), XNStatusAttributes, attr, NULL); XFree (attr); - + if (FRAME_XIC_FONTSET (f)) XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f)); FRAME_XIC_FONTSET (f) = xfs; @@ -3839,7 +3839,7 @@ x_window (f, window_prompting, minibuffer_only) for the window manager, so GC relocation won't bother it. Elsewhere we specify the window name for the window manager. */ - + { char *str = (char *) SDATA (Vx_resource_name); f->namebuf = (char *) xmalloc (strlen (str) + 1); @@ -3876,7 +3876,7 @@ x_window (f, window_prompting, minibuffer_only) XtSetValues (pane_widget, al, ac); f->output_data.x->column_widget = pane_widget; - /* mappedWhenManaged to false tells to the paned window to not map/unmap + /* mappedWhenManaged to false tells to the paned window to not map/unmap the emacs screen when changing menubar. This reduces flickering. */ ac = 0; @@ -3890,10 +3890,10 @@ x_window (f, window_prompting, minibuffer_only) XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++; frame_widget = XtCreateWidget (f->namebuf, emacsFrameClass, pane_widget, al, ac); - + f->output_data.x->edit_widget = frame_widget; - - XtManageChild (frame_widget); + + XtManageChild (frame_widget); /* Do some needed geometry management. */ { @@ -3902,7 +3902,7 @@ x_window (f, window_prompting, minibuffer_only) Arg al[2]; int ac = 0; int extra_borders = 0; - int menubar_size + int menubar_size = (f->output_data.x->menubar_widget ? (f->output_data.x->menubar_widget->core.height + f->output_data.x->menubar_widget->core.border_width) @@ -3946,13 +3946,13 @@ x_window (f, window_prompting, minibuffer_only) if (window_prompting & USPosition) sprintf (shell_position, "=%dx%d%c%d%c%d", - PIXEL_WIDTH (f) + extra_borders, + PIXEL_WIDTH (f) + extra_borders, PIXEL_HEIGHT (f) + menubar_size + extra_borders, (xneg ? '-' : '+'), left, (yneg ? '-' : '+'), top); else sprintf (shell_position, "=%dx%d", - PIXEL_WIDTH (f) + extra_borders, + PIXEL_WIDTH (f) + extra_borders, PIXEL_HEIGHT (f) + menubar_size + extra_borders); } @@ -3970,7 +3970,7 @@ x_window (f, window_prompting, minibuffer_only) XtManageChild (pane_widget); XtRealizeWidget (shell_widget); - FRAME_X_WINDOW (f) = XtWindow (frame_widget); + FRAME_X_WINDOW (f) = XtWindow (frame_widget); validate_x_resource_name (); @@ -4017,7 +4017,7 @@ x_window (f, window_prompting, minibuffer_only) attributes.event_mask |= fevent; } #endif /* HAVE_X_I18N */ - + attribute_mask = CWEventMask; XChangeWindowAttributes (XtDisplay (shell_widget), XtWindow (shell_widget), attribute_mask, &attributes); @@ -4137,7 +4137,7 @@ x_window (f) } #endif #endif /* HAVE_X_I18N */ - + validate_x_resource_name (); class_hints.res_name = (char *) SDATA (Vx_resource_name); @@ -4302,7 +4302,7 @@ x_make_gc (f) this must be done on a per-frame basis. */ f->output_data.x->border_tile = (XCreatePixmapFromBitmapData - (FRAME_X_DISPLAY (f), FRAME_X_DISPLAY_INFO (f)->root_window, + (FRAME_X_DISPLAY (f), FRAME_X_DISPLAY_INFO (f)->root_window, gray_bits, gray_width, gray_height, f->output_data.x->foreground_pixel, f->output_data.x->background_pixel, @@ -4321,7 +4321,7 @@ x_free_gcs (f) Display *dpy = FRAME_X_DISPLAY (f); BLOCK_INPUT; - + if (f->output_data.x->normal_gc) { XFreeGC (dpy, f->output_data.x->normal_gc); @@ -4333,7 +4333,7 @@ x_free_gcs (f) XFreeGC (dpy, f->output_data.x->reverse_gc); f->output_data.x->reverse_gc = 0; } - + if (f->output_data.x->cursor_gc) { XFreeGC (dpy, f->output_data.x->cursor_gc); @@ -4366,7 +4366,7 @@ unwind_create_frame (frame) #if GLYPH_DEBUG struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); #endif - + x_free_frame_resources (f); /* Check that reference counts are indeed correct. */ @@ -4374,7 +4374,7 @@ unwind_create_frame (frame) xassert (dpyinfo->image_cache->refcount == image_cache_refcount); return Qt; } - + return Qnil; } @@ -4505,7 +4505,7 @@ This function is an internal primitive--use `make-frame' instead. */) f->output_data.x->cursor_foreground_pixel = -1; f->output_data.x->border_pixel = -1; f->output_data.x->mouse_pixel = -1; - + black = build_string ("black"); GCPRO1 (black); f->output_data.x->foreground_pixel @@ -4568,7 +4568,7 @@ This function is an internal primitive--use `make-frame' instead. */) else font = x_new_font (f, SDATA (font)); } - + /* Try out a font which we hope has bold and italic variations. */ if (!STRINGP (font)) font = x_new_font (f, "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"); @@ -4599,7 +4599,7 @@ This function is an internal primitive--use `make-frame' instead. */) x_default_parameter (f, parms, Qborder_width, make_number (2), "borderWidth", "BorderWidth", RES_TYPE_NUMBER); - + /* This defaults to 1 in order to match xterm. We recognize either internalBorderWidth or internalBorder (which is what xterm calls it). */ @@ -4654,7 +4654,7 @@ This function is an internal primitive--use `make-frame' instead. */) end up in init_iterator with a null face cache, which should not happen. */ init_frame_faces (f); - + x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), "menuBar", "MenuBar", RES_TYPE_NUMBER); x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), @@ -4680,7 +4680,7 @@ This function is an internal primitive--use `make-frame' instead. */) if (FRAME_TOOL_BAR_LINES (f)) { int margin, relief, bar_height; - + relief = (tool_bar_button_relief >= 0 ? tool_bar_button_relief : DEFAULT_TOOL_BAR_BUTTON_RELIEF); @@ -4694,7 +4694,7 @@ This function is an internal primitive--use `make-frame' instead. */) margin = XFASTINT (XCDR (Vtool_bar_button_margin)); else margin = 0; - + bar_height = DEFAULT_TOOL_BAR_IMAGE_HEIGHT + 2 * margin + 2 * relief; f->height += (bar_height + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); } @@ -4728,7 +4728,7 @@ This function is an internal primitive--use `make-frame' instead. */) #else x_window (f); #endif - + x_icon (f, parms); x_make_gc (f); @@ -4756,7 +4756,7 @@ This function is an internal primitive--use `make-frame' instead. */) f->height. */ width = f->width; height = f->height; - + f->height = 0; SET_FRAME_WIDTH (f, 0); change_frame_size (f, height, width, 1, 0, 0); @@ -4819,7 +4819,7 @@ This function is an internal primitive--use `make-frame' instead. */) /* Make sure windows on this frame appear in calls to next-window and similar functions. */ Vwindow_list = Qnil; - + return unbind_to (count, frame); } @@ -4867,7 +4867,7 @@ FRAME nil means use the selected frame. */) RevertToParent, CurrentTime); x_uncatch_errors (dpy, count); UNBLOCK_INPUT; - + return Qnil; } @@ -5184,7 +5184,7 @@ If omitted or nil, that stands for the selected frame's display. */) error ("Display has an unknown visual class"); result = Qnil; } - + return result; } @@ -5339,14 +5339,14 @@ select_visual (dpyinfo) || !XMatchVisualInfo (dpy, XScreenNumberOfScreen (screen), dpyinfo->n_planes, class, &vinfo)) fatal ("Invalid visual specification `%s'", SDATA (value)); - + dpyinfo->visual = vinfo.visual; } else { int n_visuals; XVisualInfo *vinfo, vinfo_template; - + dpyinfo->visual = DefaultVisualOfScreen (screen); #ifdef HAVE_X11R4 @@ -5640,7 +5640,7 @@ valid_image_p (object) Lisp_Object object; { int valid_p = 0; - + if (CONSP (object) && EQ (XCAR (object), Qimage)) { Lisp_Object tem; @@ -5656,7 +5656,7 @@ valid_image_p (object) if (type) valid_p = type->valid_p (object); } - + break; } } @@ -5775,7 +5775,7 @@ parse_image_spec (spec, keywords, nkeywords, type) was found more than once, it's an error. */ keywords[i].value = value; ++keywords[i].count; - + if (keywords[i].count > 1) return 0; @@ -5819,7 +5819,7 @@ parse_image_spec (spec, keywords, nkeywords, type) && XINT (value) <= 100) break; return 0; - + case IMAGE_NON_NEGATIVE_INTEGER_VALUE: if (!INTEGERP (value) || XINT (value) < 0) return 0; @@ -5830,7 +5830,7 @@ parse_image_spec (spec, keywords, nkeywords, type) case IMAGE_FUNCTION_VALUE: value = indirect_function (value); - if (SUBRP (value) + if (SUBRP (value) || COMPILEDP (value) || (CONSP (value) && EQ (XCAR (value), Qlambda))) break; @@ -5879,7 +5879,7 @@ image_spec_value (spec, key, found) int *found; { Lisp_Object tail; - + xassert (valid_image_p (spec)); for (tail = XCDR (spec); @@ -5893,12 +5893,12 @@ image_spec_value (spec, key, found) return XCAR (XCDR (tail)); } } - + if (found) *found = 0; return Qnil; } - + DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0, doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT). @@ -5919,7 +5919,7 @@ or omitted means use the selected frame. */) struct image *img = IMAGE_FROM_ID (f, id); int width = img->width + 2 * img->hmargin; int height = img->height + 2 * img->vmargin; - + if (NILP (pixels)) size = Fcons (make_float ((double) width / CANON_X_UNIT (f)), make_float ((double) height / CANON_Y_UNIT (f))); @@ -5976,7 +5976,7 @@ make_image (spec, hash) unsigned hash; { struct image *img = (struct image *) xmalloc (sizeof *img); - + xassert (valid_image_p (spec)); bzero (img, sizeof *img); img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL)); @@ -6037,7 +6037,7 @@ prepare_image_for_display (f, img) if (img->pixmap == None && !img->load_failed_p) img->load_failed_p = img->type->load (f, img) == 0; } - + /* Value is the number of pixels for the ascent of image IMG when drawn in face FACE. */ @@ -6089,7 +6089,7 @@ four_corners_best (ximg, width, height) for (i = best_count = 0; i < 4; ++i) { int j, n; - + for (j = n = 0; j < 4; ++j) if (corners[i] == corners[j]) ++n; @@ -6205,7 +6205,7 @@ x_clear_image_1 (f, img, pixmap_p, mask_p, colors_p) img->mask = None; img->background_transparent_valid = 0; } - + if (colors_p && img->ncolors) { x_free_colors (f, img->colors, img->ncolors); @@ -6280,7 +6280,7 @@ make_image_cache () { struct image_cache *c = (struct image_cache *) xmalloc (sizeof *c); int size; - + bzero (c, sizeof *c); c->size = 50; c->images = (struct image **) xmalloc (c->size * sizeof *c->images); @@ -6305,7 +6305,7 @@ free_image_cache (f) /* Cache should not be referenced by any frame when freed. */ xassert (c->refcount == 0); - + for (i = 0; i < c->used; ++i) free_image (f, c->images[i]); xfree (c->images); @@ -6342,7 +6342,7 @@ clear_image_cache (f, force_p) /* Block input so that we won't be interrupted by a SIGIO while being in an inconsistent state. */ BLOCK_INPUT; - + for (i = nfreed = 0; i < c->used; ++i) { struct image *img = c->images[i]; @@ -6361,7 +6361,7 @@ clear_image_cache (f, force_p) if (nfreed) { Lisp_Object tail, frame; - + FOR_EACH_FRAME (tail, frame) { struct frame *f = XFRAME (frame); @@ -6389,7 +6389,7 @@ FRAME t means clear the image caches of all frames. */) if (EQ (frame, Qt)) { Lisp_Object tail; - + FOR_EACH_FRAME (tail, frame) if (FRAME_X_P (XFRAME (frame))) clear_image_cache (XFRAME (frame), 1); @@ -6416,7 +6416,7 @@ postprocess_image (f, img) Lisp_Object mask; spec = img->spec; - + /* `:heuristic-mask t' `:mask heuristic' means build a mask heuristically. @@ -6426,16 +6426,16 @@ postprocess_image (f, img) image. `:mask nil' means remove a mask, if any. */ - + mask = image_spec_value (spec, QCheuristic_mask, NULL); if (!NILP (mask)) x_build_heuristic_mask (f, img, mask); else { int found_p; - + mask = image_spec_value (spec, QCmask, &found_p); - + if (EQ (mask, Qheuristic)) x_build_heuristic_mask (f, img, Qt); else if (CONSP (mask) @@ -6452,8 +6452,8 @@ postprocess_image (f, img) img->mask = None; } } - - + + /* Should we apply an image transformation algorithm? */ conversion = image_spec_value (spec, QCconversion, NULL); if (EQ (conversion, Qdisabled)) @@ -6495,7 +6495,7 @@ lookup_image (f, spec) specification. */ xassert (FRAME_WINDOW_P (f)); xassert (valid_image_p (spec)); - + GCPRO1 (spec); /* Look up SPEC in the hash table of the image cache. */ @@ -6510,7 +6510,7 @@ lookup_image (f, spec) if (img == NULL) { extern Lisp_Object Qpostscript; - + BLOCK_INPUT; img = make_image (spec, hash); cache_image (f, img); @@ -6542,7 +6542,7 @@ lookup_image (f, spec) img->ascent = XFASTINT (ascent); else if (EQ (ascent, Qcenter)) img->ascent = CENTERED_IMAGE_ASCENT; - + margin = image_spec_value (spec, QCmargin, NULL); if (INTEGERP (margin) && XINT (margin) >= 0) img->vmargin = img->hmargin = XFASTINT (margin); @@ -6554,7 +6554,7 @@ lookup_image (f, spec) if (XINT (XCDR (margin)) > 0) img->vmargin = XFASTINT (XCDR (margin)); } - + relief = image_spec_value (spec, QCrelief, NULL); if (INTEGERP (relief)) { @@ -6588,9 +6588,9 @@ lookup_image (f, spec) /* We're using IMG, so set its timestamp to `now'. */ EMACS_GET_TIME (now); img->timestamp = EMACS_SECS (now); - + UNGCPRO; - + /* Value is the image id. */ return img->id; } @@ -6742,7 +6742,7 @@ x_put_x_image (f, ximg, pixmap, width, height) int width, height; { GC gc; - + xassert (interrupt_input_blocked); gc = XCreateGC (FRAME_X_DISPLAY (f), pixmap, 0, NULL); XPutImage (FRAME_X_DISPLAY (f), pixmap, gc, ximg, 0, 0, 0, 0, width, height); @@ -6777,7 +6777,7 @@ x_find_image_file (file) /* Try to find FILE in data-directory, then x-bitmap-file-path. */ fd = openp (search_path, file, Qnil, &file_found, Qnil); - + if (fd == -1) file_found = Qnil; else @@ -6819,7 +6819,7 @@ slurp_file (file, size) buf = NULL; } } - + return buf; } @@ -6898,7 +6898,7 @@ enum xbm_token XBM_TK_NUMBER }; - + /* Return non-zero if OBJECT is a valid XBM-type image specification. A valid specification is a list starting with the symbol `image' The rest of the list is a property list which must contain an @@ -6933,7 +6933,7 @@ xbm_image_p (object) Lisp_Object object; { struct image_keyword kw[XBM_LAST]; - + bcopy (xbm_format, kw, sizeof kw); if (!parse_image_spec (object, kw, XBM_LAST, Qxbm)) return 0; @@ -6965,13 +6965,13 @@ xbm_image_p (object) data = kw[XBM_DATA].value; width = XFASTINT (kw[XBM_WIDTH].value); height = XFASTINT (kw[XBM_HEIGHT].value); - + /* Check type of data, and width and height against contents of data. */ if (VECTORP (data)) { int i; - + /* Number of elements of the vector must be >= height. */ if (XVECTOR (data)->size < height) return 0; @@ -7031,7 +7031,7 @@ xbm_scan (s, end, sval, ival) int c; loop: - + /* Skip white space. */ while (*s < end && (c = *(*s)++, isspace (c))) ; @@ -7041,7 +7041,7 @@ xbm_scan (s, end, sval, ival) else if (isdigit (c)) { int value = 0, digit; - + if (c == '0' && *s < end) { c = *(*s)++; @@ -7139,7 +7139,7 @@ xbm_read_bitmap_data (contents, end, width, height, data) if (LA1 != (TOKEN)) \ goto failure; \ else \ - match () + match () #define expect_ident(IDENT) \ if (LA1 == XBM_TK_IDENT && strcmp (buffer, (IDENT)) == 0) \ @@ -7182,7 +7182,7 @@ xbm_read_bitmap_data (contents, end, width, height, data) { if (strcmp (buffer, "unsigned") == 0) { - match (); + match (); expect_ident ("char"); } else if (strcmp (buffer, "short") == 0) @@ -7197,7 +7197,7 @@ xbm_read_bitmap_data (contents, end, width, height, data) else goto failure; } - else + else goto failure; expect (XBM_TK_IDENT); @@ -7220,7 +7220,7 @@ xbm_read_bitmap_data (contents, end, width, height, data) *p++ = val; if (!padding_p || ((i + 2) % bytes_per_line)) *p++ = value >> 8; - + if (LA1 == ',' || LA1 == '}') match (); else @@ -7233,9 +7233,9 @@ xbm_read_bitmap_data (contents, end, width, height, data) { int val = value; expect (XBM_TK_NUMBER); - + *p++ = val; - + if (LA1 == ',' || LA1 == '}') match (); else @@ -7247,7 +7247,7 @@ xbm_read_bitmap_data (contents, end, width, height, data) return 1; failure: - + if (data && *data) { xfree (*data); @@ -7274,7 +7274,7 @@ xbm_load_image (f, img, contents, end) int rc; unsigned char *data; int success_p = 0; - + rc = xbm_read_bitmap_data (contents, end, &img->width, &img->height, &data); if (rc) { @@ -7282,7 +7282,7 @@ xbm_load_image (f, img, contents, end) unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); unsigned long background = FRAME_BACKGROUND_PIXEL (f); Lisp_Object value; - + xassert (img->width > 0 && img->height > 0); /* Get foreground and background colors, maybe allocate colors. */ @@ -7335,7 +7335,7 @@ xbm_file_p (data) &w, &h, NULL)); } - + /* Fill image IMG which is used on frame F with pixmap data. Value is non-zero if successful. */ @@ -7357,7 +7357,7 @@ xbm_load (f, img) char *contents; int size; struct gcpro gcpro1; - + file = x_find_image_file (file_name); GCPRO1 (file); if (!STRINGP (file)) @@ -7427,7 +7427,7 @@ xbm_load (f, img) int i; char *p; int nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR; - + p = bits = (char *) alloca (nbytes * img->height); for (i = 0; i < img->height; ++i, p += nbytes) { @@ -7465,14 +7465,14 @@ xbm_load (f, img) return success_p; } - + /*********************************************************************** XPM images ***********************************************************************/ -#if HAVE_XPM +#if HAVE_XPM static int xpm_image_p P_ ((Lisp_Object object)); static int xpm_load P_ ((struct frame *f, struct image *img)); @@ -7589,7 +7589,7 @@ xpm_init_color_cache (f, attrs) { int i; XColor color; - + for (i = 0; i < attrs->numsymbols; ++i) if (XParseColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), attrs->colorsymbols[i].value, &color)) @@ -7632,7 +7632,7 @@ xpm_color_bucket (color_name) { unsigned h = 0; char *s; - + for (s = color_name; *s; ++s) h = (h << 2) ^ *s; return h %= XPM_COLOR_CACHE_BUCKETS; @@ -7652,10 +7652,10 @@ xpm_cache_color (f, color_name, color, bucket) { size_t nbytes; struct xpm_cached_color *p; - + if (bucket < 0) bucket = xpm_color_bucket (color_name); - + nbytes = sizeof *p + strlen (color_name); p = (struct xpm_cached_color *) xmalloc (nbytes); strcpy (p->name, color_name); @@ -7693,7 +7693,7 @@ xpm_lookup_color (f, color_name, color) color->blue); p = xpm_cache_color (f, color_name, color, h); } - + return p != NULL; } @@ -7820,7 +7820,7 @@ xpm_load (f, img) Lisp_Object tail; XpmColorSymbol *xpm_syms; int i, size; - + attrs.valuemask |= XpmColorSymbols; /* Count number of symbols. */ @@ -7853,7 +7853,7 @@ xpm_load (f, img) #ifdef ALLOC_XPM_COLORS xpm_init_color_cache (f, &attrs); #endif - + specified_file = image_spec_value (img->spec, QCfile, NULL); if (STRINGP (specified_file)) { @@ -7863,7 +7863,7 @@ xpm_load (f, img) image_error ("Cannot find image file `%s'", specified_file, Qnil); return 0; } - + rc = XpmReadFileToPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), SDATA (file), &img->pixmap, &img->mask, &attrs); @@ -7910,19 +7910,19 @@ xpm_load (f, img) case XpmOpenFailed: image_error ("Error opening XPM file (%s)", img->spec, Qnil); break; - + case XpmFileInvalid: image_error ("Invalid XPM file (%s)", img->spec, Qnil); break; - + case XpmNoMemory: image_error ("Out of memory (%s)", img->spec, Qnil); break; - + case XpmColorFailed: image_error ("Color allocation error (%s)", img->spec, Qnil); break; - + default: image_error ("Unknown error (%s)", img->spec, Qnil); break; @@ -8028,14 +8028,14 @@ lookup_rgb_color (f, r, g, b) color.red = r; color.green = g; color.blue = b; - + cmap = FRAME_X_COLORMAP (f); rc = x_alloc_nearest_color (f, cmap, &color); if (rc) { ++ct_colors_allocated; - + p = (struct ct_color *) xmalloc (sizeof *p); p->r = r; p->g = g; @@ -8081,7 +8081,7 @@ lookup_pixel_color (f, pixel) if (rc) { ++ct_colors_allocated; - + p = (struct ct_color *) xmalloc (sizeof *p); p->r = color.red; p->g = color.green; @@ -8093,7 +8093,7 @@ lookup_pixel_color (f, pixel) else return FRAME_FOREGROUND_PIXEL (f); } - + return p->pixel; } @@ -8119,7 +8119,7 @@ colors_in_color_table (n) colors = (unsigned long *) xmalloc (ct_colors_allocated * sizeof *colors); *n = ct_colors_allocated; - + for (i = j = 0; i < CT_SIZE; ++i) for (p = ct_table[i]; p; p = p->next) colors[j++] = p->pixel; @@ -8194,7 +8194,7 @@ x_to_xcolors (f, img, rgb_p) for (y = 0; y < img->height; ++y) { XColor *row = p; - + for (x = 0; x < img->width; ++x, ++p) p->pixel = XGetPixel (ximg, x, y); @@ -8221,9 +8221,9 @@ x_from_xcolors (f, img, colors) XImage *oimg; Pixmap pixmap; XColor *p; - + init_color_table (); - + x_create_x_image_and_pixmap (f, img->width, img->height, 0, &oimg, &pixmap); p = colors; @@ -8250,7 +8250,7 @@ x_from_xcolors (f, img, colors) MATRIX is a nine-element array specifying the transformation matrix. See emboss_matrix for an example. - + COLOR_ADJUST is a color adjustment added to each pixel of the outgoing image. */ @@ -8278,7 +8278,7 @@ x_detect_edges (f, img, matrix, color_adjust) p = COLOR (new, img->width - 1, y); p->red = p->green = p->blue = 0xffff/2; } - + for (x = 1; x < img->width - 1; ++x) { p = COLOR (new, x, 0); @@ -8290,7 +8290,7 @@ x_detect_edges (f, img, matrix, color_adjust) for (y = 1; y < img->height - 1; ++y) { p = COLOR (new, 1, y); - + for (x = 1; x < img->width - 1; ++x, ++p) { int r, g, b, y1, x1; @@ -8363,7 +8363,7 @@ x_edge_detection (f, img, matrix, color_adjust) { int i = 0; int trans[9]; - + if (CONSP (matrix)) { for (i = 0; @@ -8483,7 +8483,7 @@ x_build_heuristic_mask (f, img, how) /* Determine the background color of ximg. If HOW is `(R G B)' take that as color. Otherwise, use the image's background color. */ use_img_background = 1; - + if (CONSP (how)) { int rgb[3], i; @@ -8502,7 +8502,7 @@ x_build_heuristic_mask (f, img, how) use_img_background = 0; } } - + if (use_img_background) bg = four_corners_best (ximg, img->width, img->height); @@ -8519,7 +8519,7 @@ x_build_heuristic_mask (f, img, how) x_put_x_image (f, mask_img, img->mask, img->width, img->height); x_destroy_x_image (mask_img); XDestroyImage (ximg); - + return 1; } @@ -8592,9 +8592,9 @@ pbm_image_p (object) Lisp_Object object; { struct image_keyword fmt[PBM_LAST]; - + bcopy (pbm_format, fmt, sizeof fmt); - + if (!parse_image_spec (object, fmt, PBM_LAST, Qpbm)) return 0; @@ -8643,7 +8643,7 @@ pbm_scan_number (s, end) /* Load PBM image IMG for use on frame F. */ -static int +static int pbm_load (f, img) struct frame *f; struct image *img; @@ -8706,7 +8706,7 @@ pbm_load (f, img) case '1': raw_p = 0, type = PBM_MONO; break; - + case '2': raw_p = 0, type = PBM_GRAY; break; @@ -8718,11 +8718,11 @@ pbm_load (f, img) case '4': raw_p = 1, type = PBM_MONO; break; - + case '5': raw_p = 1, type = PBM_GRAY; break; - + case '6': raw_p = 1, type = PBM_COLOR; break; @@ -8743,7 +8743,7 @@ pbm_load (f, img) if (raw_p && max_color_idx > 255) max_color_idx = 255; } - + if (width < 0 || height < 0 || (type != PBM_MONO && max_color_idx < 0)) @@ -8752,7 +8752,7 @@ pbm_load (f, img) if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) goto error; - + /* Initialize the color hash table. */ init_color_table (); @@ -8766,7 +8766,7 @@ pbm_load (f, img) /* Parse the image specification. */ bcopy (pbm_format, fmt, sizeof fmt); parse_image_spec (img->spec, fmt, PBM_LAST, Qpbm); - + /* Get foreground and background colors, maybe allocate colors. */ if (fmt[PBM_FOREGROUND].count && STRINGP (fmt[PBM_FOREGROUND].value)) @@ -8778,7 +8778,7 @@ pbm_load (f, img) img->background = bg; img->background_valid = 1; } - + for (y = 0; y < height; ++y) for (x = 0; x < width; ++x) { @@ -8801,7 +8801,7 @@ pbm_load (f, img) for (x = 0; x < width; ++x) { int r, g, b; - + if (type == PBM_GRAY) r = g = b = raw_p ? *p++ : pbm_scan_number (&p, end); else if (raw_p) @@ -8816,7 +8816,7 @@ pbm_load (f, img) g = pbm_scan_number (&p, end); b = pbm_scan_number (&p, end); } - + if (r < 0 || g < 0 || b < 0) { xfree (ximg->data); @@ -8826,7 +8826,7 @@ pbm_load (f, img) img->spec, Qnil); goto error; } - + /* RGB values are now in the range 0..max_color_idx. Scale this to the range 0..0xffff supported by X. */ r = (double) r * 65535 / max_color_idx; @@ -8835,7 +8835,7 @@ pbm_load (f, img) XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b)); } } - + /* Store in IMG->colors the colors allocated for the image, and free the color table. */ img->colors = colors_in_color_table (&img->ncolors); @@ -8844,11 +8844,11 @@ pbm_load (f, img) /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) IMAGE_BACKGROUND (img, f, ximg); - + /* Put the image into a pixmap. */ x_put_x_image (f, ximg, img->pixmap, width, height); x_destroy_x_image (ximg); - + img->width = width; img->height = height; @@ -8930,7 +8930,7 @@ png_image_p (object) { struct image_keyword fmt[PNG_LAST]; bcopy (png_format, fmt, sizeof fmt); - + if (!parse_image_spec (object, fmt, PNG_LAST, Qpng)) return 0; @@ -8987,7 +8987,7 @@ png_read_from_memory (png_ptr, data, length) if (length > tbr->len - tbr->index) png_error (png_ptr, "Read error"); - + bcopy (tbr->bytes + tbr->index, data, length); tbr->index = tbr->index + length; } @@ -9129,14 +9129,14 @@ png_load (f, img) png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); - /* If image contains simply transparency data, we prefer to + /* If image contains simply transparency data, we prefer to construct a clipping mask. */ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) transparent_p = 1; else transparent_p = 0; - /* This function is easier to write if we only have to handle + /* This function is easier to write if we only have to handle one data format: RGB or RGBA with 8 bits per channel. Let's transform other formats into that format. */ @@ -9149,7 +9149,7 @@ png_load (f, img) png_set_expand (png_ptr); /* Convert grayscale images to RGB. */ - if (color_type == PNG_COLOR_TYPE_GRAY + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) png_set_gray_to_rgb (png_ptr); @@ -9198,14 +9198,14 @@ png_load (f, img) } } else if (png_get_bKGD (png_ptr, info_ptr, &image_bg)) - /* Image contains a background color with which to + /* Image contains a background color with which to combine the image. */ png_set_background (png_ptr, image_bg, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); else { /* Image does not contain a background color with which - to combine the image data via an alpha channel. Use + to combine the image data via an alpha channel. Use the frame's background instead. */ XColor color; Colormap cmap; @@ -9253,12 +9253,12 @@ png_load (f, img) fclose (fp); fp = NULL; } - + /* Create the X image and pixmap. */ if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) goto error; - + /* Create an image and pixmap serving as mask if the PNG image contains an alpha channel. */ if (channels == 4 @@ -9289,16 +9289,16 @@ png_load (f, img) XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b)); /* An alpha channel, aka mask channel, associates variable - transparency with an image. Where other image formats - support binary transparency---fully transparent or fully + transparency with an image. Where other image formats + support binary transparency---fully transparent or fully opaque---PNG allows up to 254 levels of partial transparency. The PNG library implements partial transparency by combining the image with a specified background color. I'm not sure how to handle this here nicely: because the background on which the image is displayed may change, for - real alpha channel support, it would be necessary to create - a new image for each possible background. + real alpha channel support, it would be necessary to create + a new image for each possible background. What I'm doing now is that a mask is created if we have boolean transparency information. Otherwise I'm using @@ -9444,9 +9444,9 @@ jpeg_image_p (object) Lisp_Object object; { struct image_keyword fmt[JPEG_LAST]; - + bcopy (jpeg_format, fmt, sizeof fmt); - + if (!parse_image_spec (object, fmt, JPEG_LAST, Qjpeg)) return 0; @@ -9517,7 +9517,7 @@ our_skip_input_data (cinfo, num_bytes) { if (num_bytes > src->bytes_in_buffer) ERREXIT (cinfo, JERR_INPUT_EOF); - + src->bytes_in_buffer -= num_bytes; src->next_input_byte += num_bytes; } @@ -9555,7 +9555,7 @@ jpeg_memory_src (cinfo, data, len) src = (struct jpeg_source_mgr *) cinfo->src; src->next_input_byte = data; } - + src = (struct jpeg_source_mgr *) cinfo->src; src->init_source = our_init_source; src->fill_input_buffer = our_fill_input_buffer; @@ -9570,7 +9570,7 @@ jpeg_memory_src (cinfo, data, len) /* Load image IMG for use on frame F. Patterned after example.c from the JPEG lib. */ -static int +static int jpeg_load (f, img) struct frame *f; struct image *img; @@ -9603,7 +9603,7 @@ jpeg_load (f, img) UNGCPRO; return 0; } - + fp = fopen (SDATA (file), "r"); if (fp == NULL) { @@ -9617,7 +9617,7 @@ jpeg_load (f, img) error is detected. This function will perform a longjmp. */ cinfo.err = jpeg_std_error (&mgr.pub); mgr.pub.error_exit = my_error_exit; - + if ((rc = setjmp (mgr.setjmp_buffer)) != 0) { if (rc == 1) @@ -9628,7 +9628,7 @@ jpeg_load (f, img) image_error ("Error reading JPEG image `%s': %s", img->spec, build_string (buffer)); } - + /* Close the input file and destroy the JPEG object. */ if (fp) fclose ((FILE *) fp); @@ -9639,7 +9639,7 @@ jpeg_load (f, img) /* Free pixmap and colors. */ x_clear_image (f, img); - + UNGCPRO; return 0; } @@ -9689,7 +9689,7 @@ jpeg_load (f, img) init_color_table (); colors = (unsigned long *) alloca (cinfo.actual_number_of_colors * sizeof *colors); - + for (i = 0; i < cinfo.actual_number_of_colors; ++i) { /* Multiply RGB values with 255 because X expects RGB values @@ -9725,7 +9725,7 @@ jpeg_load (f, img) /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) IMAGE_BACKGROUND (img, f, ximg); - + /* Put the image into the pixmap. */ x_put_x_image (f, ximg, img->pixmap, width, height); x_destroy_x_image (ximg); @@ -9806,10 +9806,10 @@ tiff_image_p (object) { struct image_keyword fmt[TIFF_LAST]; bcopy (tiff_format, fmt, sizeof fmt); - + if (!parse_image_spec (object, fmt, TIFF_LAST, Qtiff)) return 0; - + /* Must specify either the :data or :file keyword. */ return fmt[TIFF_FILE].count + fmt[TIFF_DATA].count == 1; } @@ -9873,22 +9873,22 @@ tiff_seek_in_memory (data, off, whence) case SEEK_SET: /* Go from beginning of source. */ idx = off; break; - + case SEEK_END: /* Go from end of source. */ idx = src->len + off; break; - + case SEEK_CUR: /* Go from current position. */ idx = src->index + off; break; - + default: /* Invalid `whence'. */ return -1; } - + if (idx > src->len || idx < 0) return -1; - + src->index = idx; return src->index; } @@ -9939,7 +9939,7 @@ tiff_error_handler (title, format, ap) { char buf[512]; int len; - + len = sprintf (buf, "TIFF error: %s ", title); vsprintf (buf + len, format, ap); add_to_log (buf, Qnil, Qnil); @@ -9953,7 +9953,7 @@ tiff_warning_handler (title, format, ap) { char buf[512]; int len; - + len = sprintf (buf, "TIFF warning: %s ", title); vsprintf (buf + len, format, ap); add_to_log (buf, Qnil, Qnil); @@ -9996,7 +9996,7 @@ tiff_load (f, img) UNGCPRO; return 0; } - + /* Try to open the image file. */ tiff = TIFFOpen (SDATA (file), "r"); if (tiff == NULL) @@ -10035,7 +10035,7 @@ tiff_load (f, img) TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width); TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height); buf = (uint32 *) xmalloc (width * height * sizeof *buf); - + rc = TIFFReadRGBAImage (tiff, width, height, buf, 0); TIFFClose (tiff); if (!rc) @@ -10061,21 +10061,21 @@ tiff_load (f, img) for (y = 0; y < height; ++y) { uint32 *row = buf + y * width; - + for (x = 0; x < width; ++x) { uint32 abgr = row[x]; int r = TIFFGetR (abgr) << 8; int g = TIFFGetG (abgr) << 8; int b = TIFFGetB (abgr) << 8; - XPutPixel (ximg, x, height - 1 - y, lookup_rgb_color (f, r, g, b)); + XPutPixel (ximg, x, height - 1 - y, lookup_rgb_color (f, r, g, b)); } } /* Remember the colors allocated for the image. Free the color table. */ img->colors = colors_in_color_table (&img->ncolors); free_color_table (); - + img->width = width; img->height = height; @@ -10167,10 +10167,10 @@ gif_image_p (object) { struct image_keyword fmt[GIF_LAST]; bcopy (gif_format, fmt, sizeof fmt); - + if (!parse_image_spec (object, fmt, GIF_LAST, Qgif)) return 0; - + /* Must specify either the :data or :file keyword. */ return fmt[GIF_FILE].count + fmt[GIF_DATA].count == 1; } @@ -10245,7 +10245,7 @@ gif_load (f, img) UNGCPRO; return 0; } - + /* Open the GIF file. */ gif = DGifOpenFileName (SDATA (file)); if (gif == NULL) @@ -10303,14 +10303,14 @@ gif_load (f, img) UNGCPRO; return 0; } - + /* Allocate colors. */ gif_color_map = gif->SavedImages[ino].ImageDesc.ColorMap; if (!gif_color_map) gif_color_map = gif->SColorMap; init_color_table (); bzero (pixel_colors, sizeof pixel_colors); - + for (i = 0; i < gif_color_map->ColorCount; ++i) { int r = gif_color_map->Colors[i].Red << 8; @@ -10323,7 +10323,7 @@ gif_load (f, img) free_color_table (); /* Clear the part of the screen image that are not covered by - the image from the GIF file. Full animated GIF support + the image from the GIF file. Full animated GIF support requires more than can be done here (see the gif89 spec, disposal methods). Let's simply assume that the part not covered by a sub-image is in the frame's background color. */ @@ -10352,7 +10352,7 @@ gif_load (f, img) `raster' here because RasterBits below is a char *, and invites problems with bytes >= 0x80. */ raster = (unsigned char *) gif->SavedImages[ino].RasterBits; - + if (gif->SavedImages[ino].ImageDesc.Interlace) { static int interlace_start[] = {0, 4, 2, 1}; @@ -10370,14 +10370,14 @@ gif_load (f, img) while (row >= image_height) row = interlace_start[++pass]; } - + for (x = 0; x < image_width; x++) { int i = raster[(y * image_width) + x]; XPutPixel (ximg, x + image_left, row + image_top, pixel_colors[i]); } - + row += interlace_increment[pass]; } } @@ -10390,17 +10390,17 @@ gif_load (f, img) XPutPixel (ximg, x + image_left, y + image_top, pixel_colors[i]); } } - + DGifCloseFile (gif); /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) IMAGE_BACKGROUND (img, f, ximg); - + /* Put the image into the pixmap, then free the X image and its buffer. */ x_put_x_image (f, ximg, img->pixmap, width, height); x_destroy_x_image (ximg); - + UNGCPRO; return 1; } @@ -10500,9 +10500,9 @@ gs_image_p (object) struct image_keyword fmt[GS_LAST]; Lisp_Object tem; int i; - + bcopy (gs_format, fmt, sizeof fmt); - + if (!parse_image_spec (object, fmt, GS_LAST, Qpostscript)) return 0; @@ -10568,7 +10568,7 @@ gs_load (f, img) image_error ("Unable to create pixmap for `%s'", img->spec, Qnil); return 0; } - + /* Call the loader to fill the pixmap. It returns a process object if successful. We do not record_unwind_protect here because other places in redisplay like calling window scroll functions @@ -10579,12 +10579,12 @@ gs_load (f, img) (unsigned long) FRAME_X_WINDOW (f), (unsigned long) img->pixmap); window_and_pixmap_id = build_string (buffer); - + sprintf (buffer, "%lu %lu", FRAME_FOREGROUND_PIXEL (f), FRAME_BACKGROUND_PIXEL (f)); pixel_colors = build_string (buffer); - + XSETFRAME (frame, f); loader = image_spec_value (img->spec, QCloader, NULL); if (NILP (loader)) @@ -10622,7 +10622,7 @@ x_kill_gs_process (pixmap, f) instance, give up. */ if (i == c->used) return; - + /* Kill the GS process. We should have found PIXMAP in the image cache and its image should contain a process object. */ img = c->images[i]; @@ -10646,10 +10646,10 @@ x_kill_gs_process (pixmap, f) if (ximg) { int x, y; - + /* Initialize the color table. */ init_color_table (); - + /* For each pixel of the image, look its color up in the color table. After having done so, the color table will contain an entry for each color used by the image. */ @@ -10678,7 +10678,7 @@ x_kill_gs_process (pixmap, f) else image_error ("Cannot get X image of `%s'; colors will not be freed", img->spec, Qnil); - + UNBLOCK_INPUT; } @@ -10781,8 +10781,8 @@ value. */) rc = XGetWindowProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), prop_atom, 0, bytes_remaining, False, XA_STRING, - &actual_type, &actual_format, - &actual_size, &bytes_remaining, + &actual_type, &actual_format, + &actual_size, &bytes_remaining, (unsigned char **) &tmp_data); if (rc == Success && tmp_data) prop_value = make_string (tmp_data, size); @@ -10831,7 +10831,7 @@ start_hourglass () { EMACS_TIME delay; int secs, usecs = 0; - + cancel_hourglass (); if (INTEGERP (Vhourglass_delay) @@ -10847,7 +10847,7 @@ start_hourglass () } else secs = DEFAULT_HOURGLASS_DELAY; - + EMACS_SET_SECS_USECS (delay, secs, usecs); hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay, show_hourglass, NULL); @@ -10865,7 +10865,7 @@ cancel_hourglass () cancel_atimer (hourglass_atimer); hourglass_atimer = NULL; } - + if (hourglass_shown_p) hide_hourglass (); } @@ -10891,17 +10891,17 @@ show_hourglass (timer) if (!hourglass_shown_p) { Lisp_Object rest, frame; - + BLOCK_INPUT; - + FOR_EACH_FRAME (rest, frame) { struct frame *f = XFRAME (frame); - + if (FRAME_LIVE_P (f) && FRAME_X_P (f) && FRAME_X_DISPLAY (f)) { Display *dpy = FRAME_X_DISPLAY (f); - + #ifdef USE_X_TOOLKIT if (f->output_data.x->widget) #else @@ -10909,14 +10909,14 @@ show_hourglass (timer) #endif { f->output_data.x->hourglass_p = 1; - + if (!f->output_data.x->hourglass_window) { unsigned long mask = CWCursor; XSetWindowAttributes attrs; - + attrs.cursor = f->output_data.x->hourglass_cursor; - + f->output_data.x->hourglass_window = XCreateWindow (dpy, FRAME_OUTER_WINDOW (f), 0, 0, 32000, 32000, 0, 0, @@ -10924,7 +10924,7 @@ show_hourglass (timer) CopyFromParent, mask, &attrs); } - + XMapRaised (dpy, f->output_data.x->hourglass_window); XFlush (dpy); } @@ -10951,7 +10951,7 @@ hide_hourglass () FOR_EACH_FRAME (rest, frame) { struct frame *f = XFRAME (frame); - + if (FRAME_X_P (f) /* Watch out for newly created frames. */ && f->output_data.x->hourglass_window) @@ -10980,7 +10980,7 @@ static Lisp_Object x_create_tip_frame P_ ((struct x_display_info *, Lisp_Object, Lisp_Object)); static void compute_tip_xy P_ ((struct frame *, Lisp_Object, Lisp_Object, Lisp_Object, int, int, int *, int *)); - + /* The frame of a currently visible tooltip. */ Lisp_Object tip_frame; @@ -11013,7 +11013,7 @@ unwind_create_tip_frame (frame) tip_window = None; tip_frame = Qnil; } - + return deleted; } @@ -11077,7 +11077,7 @@ x_create_tip_frame (dpyinfo, parms, text) Ferase_buffer (); Finsert (1, &text); set_buffer_internal_1 (old_buffer); - + FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; record_unwind_protect (unwind_create_tip_frame, frame); @@ -11113,7 +11113,7 @@ x_create_tip_frame (dpyinfo, parms, text) { Lisp_Object black; struct gcpro gcpro1; - + black = build_string ("black"); GCPRO1 (black); f->output_data.x->foreground_pixel @@ -11163,7 +11163,7 @@ x_create_tip_frame (dpyinfo, parms, text) else font = x_new_font (f, SDATA (font)); } - + /* Try out a font which we hope has bold and italic variations. */ if (!STRINGP (font)) font = x_new_font (f, "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"); @@ -11188,7 +11188,7 @@ x_create_tip_frame (dpyinfo, parms, text) x_default_parameter (f, parms, Qborder_width, make_number (2), "borderWidth", "BorderWidth", RES_TYPE_NUMBER); - + /* This defaults to 2 in order to match xterm. We recognize either internalBorderWidth or internalBorder (which is what xterm calls it). */ @@ -11226,7 +11226,7 @@ x_create_tip_frame (dpyinfo, parms, text) end up in init_iterator with a null face cache, which should not happen. */ init_frame_faces (f); - + f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; window_prompting = x_figure_window_size (f, parms); @@ -11249,12 +11249,12 @@ x_create_tip_frame (dpyinfo, parms, text) { XSetWindowAttributes attrs; unsigned long mask; - + BLOCK_INPUT; mask = CWBackPixel | CWOverrideRedirect | CWEventMask; if (DoesSaveUnders (dpyinfo->screen)) mask |= CWSaveUnder; - + /* Window managers look at the override-redirect flag to determine whether or net to give windows a decoration (Xlib spec, chapter 3.2.8). */ @@ -11293,12 +11293,12 @@ x_create_tip_frame (dpyinfo, parms, text) f->height = 0; SET_FRAME_WIDTH (f, 0); change_frame_size (f, height, width, 1, 0, 0); - + /* Add `tooltip' frame parameter's default value. */ if (NILP (Fframe_parameter (frame, intern ("tooltip")))) Fmodify_frame_parameters (frame, Fcons (Fcons (intern ("tooltip"), Qt), Qnil)); - + /* Set up faces after all frame parameters are known. This call also merges in face attributes specified for new frames. @@ -11313,12 +11313,12 @@ x_create_tip_frame (dpyinfo, parms, text) /* Set tip_frame here, so that */ tip_frame = frame; call1 (Qface_set_after_frame_default, frame); - + if (!EQ (bg, Fframe_parameter (frame, Qbackground_color))) Fmodify_frame_parameters (frame, Fcons (Fcons (Qbackground_color, bg), Qnil)); } - + f->no_split = 1; UNGCPRO; @@ -11361,11 +11361,11 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y) int win_x, win_y; Window root, child; unsigned pmask; - + /* User-specified position? */ left = Fcdr (Fassq (Qleft, parms)); top = Fcdr (Fassq (Qtop, parms)); - + /* Move the tooltip window where the mouse pointer is. Resize and show it. */ if (!INTEGERP (left) || !INTEGERP (top)) @@ -11434,7 +11434,7 @@ Text larger than the specified size is clipped. */) struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; int old_windows_or_buffers_changed = windows_or_buffers_changed; int count = SPECPDL_INDEX (); - + specbind (Qinhibit_redisplay, Qt); GCPRO4 (string, parms, frame, timeout); @@ -11445,12 +11445,12 @@ Text larger than the specified size is clipped. */) timeout = make_number (5); else CHECK_NATNUM (timeout); - + if (NILP (dx)) dx = make_number (5); else CHECK_NUMBER (dx); - + if (NILP (dy)) dy = make_number (-10); else @@ -11470,7 +11470,7 @@ Text larger than the specified size is clipped. */) && !NILP (Fequal (last_parms, parms))) { struct frame *f = XFRAME (tip_frame); - + /* Only DX and DY have changed. */ if (!NILP (tip_timer)) { @@ -11517,7 +11517,7 @@ Text larger than the specified size is clipped. */) /* Set up the frame's root window. */ w = XWINDOW (FRAME_ROOT_WINDOW (f)); w->left = w->top = make_number (0); - + if (CONSP (Vx_max_tooltip_size) && INTEGERP (XCAR (Vx_max_tooltip_size)) && XINT (XCAR (Vx_max_tooltip_size)) > 0 @@ -11532,7 +11532,7 @@ Text larger than the specified size is clipped. */) w->width = make_number (80); w->height = make_number (40); } - + f->window_width = XINT (w->width); adjust_glyphs (f); w->pseudo_window_p = 1; @@ -11570,7 +11570,7 @@ Text larger than the specified size is clipped. */) } else row_width = row->pixel_width; - + height += row->height; width = max (width, row_width); } @@ -11589,7 +11589,7 @@ Text larger than the specified size is clipped. */) root_x, root_y, width, height); XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); UNBLOCK_INPUT; - + /* Draw into the window. */ w->must_be_updated_p = 1; update_single_window (w, 1); @@ -11620,16 +11620,16 @@ Value is t if tooltip was open, nil otherwise. */) /* Return quickly if nothing to do. */ if (NILP (tip_timer) && NILP (tip_frame)) return Qnil; - + frame = tip_frame; timer = tip_timer; GCPRO2 (frame, timer); tip_frame = tip_timer = deleted = Qnil; - + count = SPECPDL_INDEX (); specbind (Qinhibit_redisplay, Qt); specbind (Qinhibit_quit, Qt); - + if (!NILP (timer)) call1 (Qcancel_timer, timer); @@ -11732,7 +11732,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil. */) dir = Fexpand_file_name (dir, Qnil); dir_xmstring = XmStringCreateLocalized (SDATA (dir)); pattern_xmstring = XmStringCreateLocalized ("*"); - + XtSetArg (al[ac], XmNtitle, SDATA (prompt)); ++ac; XtSetArg (al[ac], XmNdirectory, dir_xmstring); ++ac; XtSetArg (al[ac], XmNpattern, pattern_xmstring); ++ac; @@ -11755,7 +11755,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil. */) help = XmFileSelectionBoxGetChild (dialog, XmDIALOG_HELP_BUTTON); XtSetSensitive (help, False); - /* Mark OK button as default. */ + /* Mark OK button as default. */ XtVaSetValues (XmFileSelectionBoxGetChild (dialog, XmDIALOG_OK_BUTTON), XmNshowAsDefault, True, NULL); @@ -11815,7 +11815,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil. */) { XmString text; String data; - + XtVaGetValues (dialog, XmNtextString, &text, NULL); XmStringGetLtoR (text, XmFONTLIST_DEFAULT_TAG, &data); XmStringFree (text); @@ -11834,7 +11834,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil. */) /* Make "Cancel" equivalent to C-g. */ if (NILP (file)) Fsignal (Qquit, Qnil); - + return unbind_to (count, file); } @@ -11858,7 +11858,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil.") struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; char *cdef_file; char *cprompt; - + GCPRO5 (prompt, dir, default_filename, mustmatch, file); CHECK_STRING (prompt); CHECK_STRING (dir); @@ -11874,7 +11874,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil.") cdef_file = SDATA (dir); fn = xg_get_file_name (f, SDATA (prompt), cdef_file, ! NILP (mustmatch)); - + if (fn) { file = build_string (fn); @@ -11887,7 +11887,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil.") /* Make "Cancel" equivalent to C-g. */ if (NILP (file)) Fsignal (Qquit, Qnil); - + return unbind_to (count, file); } @@ -11938,7 +11938,7 @@ usual X keysyms. */) UNBLOCK_INPUT; return Qnil; } - + have_keys = Qnil; kb = XkbGetMap (dpy, XkbAllMapComponentsMask, XkbUseCoreKbd); if (kb) @@ -11965,7 +11965,7 @@ usual X keysyms. */) } XkbFreeClientMap (kb, 0, True); - + if (delete_keycode && backspace_keycode && XKeysymToKeycode (dpy, XK_Delete) == delete_keycode @@ -12095,7 +12095,7 @@ syms_of_xfns () staticpro (&QCcolor_adjustment); QCmask = intern (":mask"); staticpro (&QCmask); - + Qface_set_after_frame_default = intern ("face-set-after-frame-default"); staticpro (&Qface_set_after_frame_default); @@ -12163,7 +12163,7 @@ or when you set the mouse color. */); DEFVAR_BOOL ("display-hourglass", &display_hourglass_p, doc: /* Non-zero means Emacs displays an hourglass pointer on window systems. */); display_hourglass_p = 1; - + DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay, doc: /* *Seconds to wait before displaying an hourglass pointer. Value must be an integer or float. */); @@ -12199,7 +12199,7 @@ or when you set the mouse color. */); doc: /* Maximum size for tooltips. Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */); Vx_max_tooltip_size = Fcons (make_number (80), make_number (40)); - + DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager, doc: /* Non-nil if no X window manager is in use. Emacs doesn't try to figure this out; this is always nil @@ -12268,7 +12268,7 @@ meaning don't clear the cache. */); defsubr (&Sx_synchronize); defsubr (&Sx_focus_frame); defsubr (&Sx_backspace_delete_keys_p); - + /* Setting callback functions for fontset handler. */ get_font_info_func = x_get_font_info; @@ -12276,7 +12276,7 @@ meaning don't clear the cache. */); And the pointer assigned has the wrong type, anyway. */ list_fonts_func = x_list_fonts; #endif - + load_font_func = x_load_font; find_ccl_program_func = x_find_ccl_program; query_font_func = x_query_font; @@ -12317,16 +12317,16 @@ meaning don't clear the cache. */); Qxpm = intern ("xpm"); staticpro (&Qxpm); #endif - + #if HAVE_JPEG Qjpeg = intern ("jpeg"); staticpro (&Qjpeg); -#endif +#endif #if HAVE_TIFF Qtiff = intern ("tiff"); staticpro (&Qtiff); -#endif +#endif #if HAVE_GIF Qgif = intern ("gif"); @@ -12366,27 +12366,27 @@ init_xfns () { image_types = NULL; Vimage_types = Qnil; - + define_image_type (&xbm_type); define_image_type (&gs_type); define_image_type (&pbm_type); - + #if HAVE_XPM define_image_type (&xpm_type); #endif - + #if HAVE_JPEG define_image_type (&jpeg_type); #endif - + #if HAVE_TIFF define_image_type (&tiff_type); #endif - + #if HAVE_GIF define_image_type (&gif_type); #endif - + #if HAVE_PNG define_image_type (&png_type); #endif diff --git a/src/xmenu.c b/src/xmenu.c index bc3e22e3e16..2709a7641dd 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -487,7 +487,7 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth) /* This is a subroutine of single_keymap_panes that handles one keymap entry. - KEY is a key in a keymap and ITEM is its binding. + KEY is a key in a keymap and ITEM is its binding. PENDING_MAPS_PTR points to a list of keymaps waiting to be made into separate panes. If NOTREAL is nonzero, only check for equivalent key bindings, don't @@ -508,7 +508,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth, Lisp_Object map, item_string, enabled; struct gcpro gcpro1, gcpro2; int res; - + /* Parse the menu item and leave the result in item_properties. */ GCPRO2 (key, item); res = parse_menu_item (item, notreal, 0); @@ -517,7 +517,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth, return; /* Not a menu item. */ map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP]; - + if (notreal) { /* We don't want to make a menu, just traverse the keymaps to @@ -528,7 +528,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth, } enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE]; - item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; + item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; if (!NILP (map) && SREF (item_string, 0) == '@') { @@ -601,7 +601,7 @@ single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth, item_string = concat2 (prefix, item_string); } #endif /* not HAVE_BOXES */ - + #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) if (!NILP(map)) /* Indicate visually that this is a submenu. */ @@ -696,7 +696,7 @@ mouse_position_for_popup(f, x, y) int dummy; BLOCK_INPUT; - + XQueryPointer (FRAME_X_DISPLAY (f), DefaultRootWindow (FRAME_X_DISPLAY (f)), @@ -835,7 +835,7 @@ cached information about equivalent key sequences. */) x = make_number (cur_x); y = make_number (cur_y); } - + #else /* not HAVE_X_WINDOWS */ Lisp_Object bar_window; enum scroll_bar_part part; @@ -957,7 +957,7 @@ cached information about equivalent key sequences. */) keymaps = 0; } - + unbind_to (specpdl_count, Qnil); if (NILP (position)) @@ -1146,7 +1146,7 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers) && dpyinfo->display == event.xbutton.display) { dpyinfo->grabbed &= ~(1 << event.xbutton.button); -#ifdef USE_MOTIF /* Pretending that the event came from a +#ifdef USE_MOTIF /* Pretending that the event came from a Btn1Down seems the only way to convince Motif to activate its callbacks; setting the XmNmenuPost isn't working. --marcus@sysc.pdx.edu. */ @@ -1167,7 +1167,7 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers) if (!IsModifierKey (keysym)) popup_activated_flag = 0; } - + x_dispatch_event (&event, event.xany.display); } } @@ -1203,7 +1203,7 @@ popup_widget_loop () The reason for saving the button event until here, instead of passing it to the toolkit right away, is that we can safely execute Lisp code. */ - + void x_activate_menubar (f) FRAME_PTR f; @@ -1211,11 +1211,11 @@ x_activate_menubar (f) if (!f->output_data.x->saved_menu_event->type) return; -#ifdef USE_GTK +#ifdef USE_GTK if (! xg_win_to_widget (f->output_data.x->saved_menu_event->xany.window)) return; #endif - + set_frame_menubar (f, 0, 1); BLOCK_INPUT; #ifdef USE_GTK @@ -1230,7 +1230,7 @@ x_activate_menubar (f) if (f->output_data.x->saved_menu_event->type == ButtonRelease) pending_menu_activation = 1; #endif - + /* Ignore this if we get it a second time. */ f->output_data.x->saved_menu_event->type = 0; } @@ -1298,7 +1298,7 @@ show_help_event (f, widget, help) } else { - /* WIDGET is the popup menu. It's parent is the frame's + /* WIDGET is the popup menu. It's parent is the frame's widget. See which frame that is. */ xt_or_gtk_widget frame_widget = XtParent (widget); Lisp_Object tail; @@ -1330,7 +1330,7 @@ menu_highlight_callback (widget, call_data) { xg_menu_item_cb_data *cb_data; Lisp_Object help; - + cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (widget), XG_ITEM_DATA); if (! cb_data) return; @@ -1356,7 +1356,7 @@ menu_highlight_callback (widget, id, call_data) widget_value *wv = (widget_value *) call_data; help = wv ? wv->help : Qnil; - + /* Determine the frame for the help event. */ f = menubar_id_to_frame (id); @@ -1620,7 +1620,7 @@ digest_single_submenu (start, end, top_level_items) first_wv = wv; save_wv = 0; prev_wv = 0; - + /* Loop over all panes and items made by the preceding call to parse_single_submenu and construct a tree of widget_value objects. Ignore the panes and items used by previous calls to @@ -1653,10 +1653,10 @@ digest_single_submenu (start, end, top_level_items) /* Create a new pane. */ Lisp_Object pane_name, prefix; char *pane_string; - + pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; - + #ifndef HAVE_MULTILINGUAL_MENU if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) { @@ -1700,7 +1700,7 @@ digest_single_submenu (start, end, top_level_items) /* Create a new item within current pane. */ Lisp_Object item_name, enable, descrip, def, type, selected; Lisp_Object help; - + item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY); @@ -1715,7 +1715,7 @@ digest_single_submenu (start, end, top_level_items) item_name = ENCODE_SYSTEM (item_name); AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name; } - + if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) { descrip = ENCODE_SYSTEM (descrip); @@ -1724,7 +1724,7 @@ digest_single_submenu (start, end, top_level_items) #endif /* not HAVE_MULTILINGUAL_MENU */ wv = xmalloc_widget_value (); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else save_wv->contents = wv; @@ -1737,7 +1737,7 @@ digest_single_submenu (start, end, top_level_items) as long as pointers have enough bits to hold small integers. */ wv->call_data = (!NILP (def) ? (void *) (EMACS_INT) i : 0); wv->enabled = !NILP (enable); - + if (NILP (type)) wv->button_type = BUTTON_TYPE_NONE; else if (EQ (type, QCradio)) @@ -1783,7 +1783,7 @@ update_frame_menubar (f) #else struct x_output *x = f->output_data.x; int columns, rows; - + if (!x->menubar_widget || XtIsManaged (x->menubar_widget)) return 0; @@ -1847,7 +1847,7 @@ set_frame_menubar (f, first_time, deep_p) f->output_data.x->id = next_menubar_widget_id++; id = f->output_data.x->id; #endif - + if (! menubar_widget) deep_p = 1; else if (pending_menu_activation && !deep_p) @@ -1895,7 +1895,7 @@ set_frame_menubar (f, first_time, deep_p) /* Run the Lucid hook. */ safe_run_hooks (Qactivate_menubar_hook); - + /* If it has changed current-menubar from previous value, really recompute the menubar from the value. */ if (! NILP (Vlucid_menu_bar_dirty_flag)) @@ -1960,7 +1960,7 @@ set_frame_menubar (f, first_time, deep_p) menu_items_n_panes = submenu_n_panes[i]; wv = digest_single_submenu (submenu_start[i], submenu_end[i], submenu_top_level_items[i]); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else first_wv->contents = wv; @@ -2039,7 +2039,7 @@ set_frame_menubar (f, first_time, deep_p) This value just has to be different from small integers. */ wv->call_data = (void *) (EMACS_INT) (-1); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; else first_wv->contents = wv; @@ -2073,9 +2073,9 @@ set_frame_menubar (f, first_time, deep_p) else { GtkWidget *wvbox = f->output_data.x->vbox_widget; - + menubar_widget - = xg_create_widget ("menubar", "menubar", f, first_wv, + = xg_create_widget ("menubar", "menubar", f, first_wv, G_CALLBACK (menubar_selection_callback), G_CALLBACK (popup_deactivate_callback), G_CALLBACK (menu_highlight_callback)); @@ -2083,7 +2083,7 @@ set_frame_menubar (f, first_time, deep_p) f->output_data.x->menubar_widget = menubar_widget; } - + #else /* not USE_GTK */ if (menubar_widget) { @@ -2099,7 +2099,7 @@ set_frame_menubar (f, first_time, deep_p) } else { - menubar_widget = lw_create_widget ("menubar", "menubar", id, first_wv, + menubar_widget = lw_create_widget ("menubar", "menubar", id, first_wv, f->output_data.x->column_widget, 0, popup_activate_callback, @@ -2110,7 +2110,7 @@ set_frame_menubar (f, first_time, deep_p) } { - int menubar_size + int menubar_size = (f->output_data.x->menubar_widget ? (f->output_data.x->menubar_widget->core.height + f->output_data.x->menubar_widget->core.border_width) @@ -2132,7 +2132,7 @@ set_frame_menubar (f, first_time, deep_p) f->output_data.x->menubar_height = menubar_size; } #endif /* not USE_GTK */ - + free_menubar_widget_value_tree (first_wv); update_frame_menubar (f); @@ -2173,7 +2173,7 @@ free_frame_menubar (f) menubar_widget = f->output_data.x->menubar_widget; f->output_data.x->menubar_height = 0; - + if (menubar_widget) { #ifdef USE_MOTIF @@ -2187,14 +2187,14 @@ free_frame_menubar (f) is switched off, which fixes the shell position. */ Position x0, y0, x1, y1; #endif - + BLOCK_INPUT; #ifdef USE_MOTIF if (f->output_data.x->widget) XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL); #endif - + lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id); f->output_data.x->menubar_widget = NULL; @@ -2206,7 +2206,7 @@ free_frame_menubar (f) XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL); } #endif - + UNBLOCK_INPUT; } } @@ -2300,7 +2300,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) G_CALLBACK (popup_deactivate_callback), G_CALLBACK (menu_highlight_callback)); xg_crazy_callback_abort = 0; - + for (i = 0; i < 5; i++) if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) break; @@ -2321,7 +2321,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) /* Display the menu. */ gtk_widget_show_all (menu); gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0); - + xg_did_tearoff = 0; /* Set this to one. popup_widget_loop increases it by one, so it becomes two. show_help_echo uses this to detect popup menus. */ @@ -2333,7 +2333,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) xg_keep_popup (menu, xg_did_tearoff); else gtk_widget_destroy (menu); - + /* Must reset this manually because the button release event is not passed to Emacs event loop. */ FRAME_X_DISPLAY_INFO (f)->grabbed = 0; @@ -2425,7 +2425,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) that it is unnecessary--that the menu has already disappeared. Nowadays the menu disappears ok, all right, but we need to delete the widgets or multiple ones will pile up. */ - lw_destroy_all_widgets (menu_id); + lw_destroy_all_widgets (menu_id); } #endif /* not USE_GTK */ @@ -2468,7 +2468,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) wv->help =Qnil; first_wv = wv; first_pane = 1; - + /* Loop over all panes and items, filling in the tree. */ i = 0; while (i < menu_items_used) @@ -2500,10 +2500,10 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) /* Create a new pane. */ Lisp_Object pane_name, prefix; char *pane_string; - + pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX); - + #ifndef HAVE_MULTILINGUAL_MENU if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) { @@ -2564,18 +2564,18 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) item_name = ENCODE_SYSTEM (item_name); AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name; } - + if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) { descrip = ENCODE_SYSTEM (descrip); AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip; } #endif /* not HAVE_MULTILINGUAL_MENU */ - + wv = xmalloc_widget_value (); - if (prev_wv) + if (prev_wv) prev_wv->next = wv; - else + else save_wv->contents = wv; wv->name = (char *) SDATA (item_name); if (!NILP (descrip)) @@ -2629,7 +2629,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) if (STRING_MULTIBYTE (title)) title = ENCODE_SYSTEM (title); #endif - + wv_title->name = (char *) SDATA (title); wv_title->enabled = TRUE; wv_title->button_type = BUTTON_TYPE_NONE; @@ -2741,7 +2741,7 @@ create_and_show_dialog (f, first_wv) /* Process events that apply to the menu. */ popup_widget_loop (); - + gtk_widget_destroy (menu); } } @@ -2807,7 +2807,7 @@ create_and_show_dialog (f, first_wv) { int count = SPECPDL_INDEX (); int fact = 4 * sizeof (LWLIB_ID); - + /* xdialog_show_unwind is responsible for popping the dialog box down. */ record_unwind_protect (xdialog_show_unwind, Fcons (make_number (dialog_id >> (fact)), @@ -2858,7 +2858,7 @@ xdialog_show (f, keymaps, title, error) pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME]; prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX]; pane_string = (NILP (pane_name) - ? "" : (char *) SDATA (pane_name)); + ? "" : (char *) SDATA (pane_name)); prev_wv = xmalloc_widget_value (); prev_wv->value = pane_string; if (keymaps && !NILP (prefix)) @@ -2867,19 +2867,19 @@ xdialog_show (f, keymaps, title, error) prev_wv->name = "message"; prev_wv->help = Qnil; first_wv = prev_wv; - + /* Loop over all panes and items, filling in the tree. */ i = MENU_ITEMS_PANE_LENGTH; while (i < menu_items_used) { - + /* Create a new item within current pane. */ Lisp_Object item_name, enable, descrip; item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; descrip = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; - + if (NILP (item_name)) { free_menubar_widget_value_tree (first_wv); @@ -2950,7 +2950,7 @@ xdialog_show (f, keymaps, title, error) /* Free the widget_value objects we used to specify the contents. */ free_menubar_widget_value_tree (first_wv); - + /* Find the selected item, and its pane, to return the proper value. */ if (menu_item_selection != 0) @@ -3009,7 +3009,7 @@ static struct frame *menu_help_frame; PANE is the pane number, and ITEM is the menu item number in the menu (currently not used). - + This cannot be done with generating a HELP_EVENT because XMenuActivate contains a loop that doesn't let Emacs process keyboard events. */ @@ -3023,7 +3023,7 @@ menu_help_callback (help_string, pane, item) Lisp_Object *first_item; Lisp_Object pane_name; Lisp_Object menu_object; - + first_item = XVECTOR (menu_items)->contents; if (EQ (first_item[0], Qt)) pane_name = first_item[MENU_ITEMS_PANE_NAME]; @@ -3032,7 +3032,7 @@ menu_help_callback (help_string, pane, item) pane_name = empty_string; else pane_name = first_item[MENU_ITEMS_ITEM_NAME]; - + /* (menu-item MENU-NAME PANE-NUMBER) */ menu_object = Fcons (Qmenu_item, Fcons (pane_name, @@ -3040,7 +3040,7 @@ menu_help_callback (help_string, pane, item) show_help_echo (help_string ? build_string (help_string) : Qnil, Qnil, menu_object, make_number (item), 1); } - + static Lisp_Object xmenu_show (f, x, y, for_click, keymaps, title, error) @@ -3051,7 +3051,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) Lisp_Object title; char **error; { - Window root; + Window root; XMenu *menu; int pane, selidx, lpane, status; Lisp_Object entry, pane_prefix; @@ -3118,7 +3118,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) /* Adjust coordinates to be root-window-relative. */ x += f->output_data.x->left_pos; y += f->output_data.x->top_pos; - + /* Create all the necessary panes and their items. */ i = 0; while (i < menu_items_used) @@ -3183,7 +3183,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP]; help_string = STRINGP (help) ? SDATA (help) : NULL; - + if (!NILP (descrip)) { int gap = maxwidth - SBYTES (item_name); @@ -3347,7 +3347,7 @@ The enable predicate for a menu command should check this variable. */); Vmenu_updating_frame = Qnil; #ifdef USE_X_TOOLKIT - widget_id_tick = (1<<16); + widget_id_tick = (1<<16); next_menubar_widget_id = 1; #endif diff --git a/src/xterm.c b/src/xterm.c index 4fa0e8bb49b..43075c9d5b3 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8783,12 +8783,12 @@ xg_scroll_callback (widget, data) gdouble position; gdouble *p; int diff; - + int part = -1, whole = 0, portion = 0; GtkAdjustment *adj = GTK_ADJUSTMENT (widget); - + if (xg_ignore_gtk_scrollbar) return; - + position = gtk_adjustment_get_value (adj); p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA); @@ -8803,7 +8803,7 @@ xg_scroll_callback (widget, data) *p = position; diff = (int) (position - previous); - + if (diff == (int) adj->step_increment) { part = scroll_bar_down_arrow; @@ -8831,7 +8831,7 @@ xg_scroll_callback (widget, data) portion = min (position, whole); bar->dragging = make_number (portion); } - + if (part >= 0) { xg_ignore_next_thumb = 1; @@ -10221,7 +10221,7 @@ enum Returns non-zero if the event was filtered, caller shall not process this event further. Returns zero if event is wasn't filtered. */ - + #ifdef HAVE_X_I18N static int x_filter_event (dpyinfo, event) @@ -10286,7 +10286,7 @@ event_handler_gdk (gxev, ev, data) /* Handles the XEvent EVENT on display DPYINFO. - + *FINISH is X_EVENT_GOTO_OUT if caller should stop reading events. *FINISH is zero if caller should continue reading events. *FINISH is X_EVENT_DROP if event should not be passed to the toolkit. @@ -10294,7 +10294,7 @@ event_handler_gdk (gxev, ev, data) Events representing keys are stored in buffer *BUFP_R, which can hold up to *NUMCHARSP characters. We return the number of characters stored into the buffer. */ - + static int handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish) struct x_display_info *dpyinfo; @@ -10312,7 +10312,7 @@ handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish) XEvent event = *eventp; *finish = X_EVENT_NORMAL; - + switch (event.type) { case ClientMessage: @@ -11541,7 +11541,7 @@ handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish) } goto ret; - + out: *finish = X_EVENT_GOTO_OUT; @@ -11549,7 +11549,7 @@ handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish) *bufp_r = bufp; *numcharsp = numchars; *eventp = event; - + return count; } @@ -11569,11 +11569,11 @@ x_dispatch_event (event, display) struct input_event *bufpp = bufp; int numchars = 10; int finish = X_EVENT_NORMAL; - + for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) if (dpyinfo->display == display) break; - + if (dpyinfo) { int i, events; @@ -11681,7 +11681,7 @@ XTread_socket (sd, bufp, numchars, expected) We use a bunch of globals to communicate with our filter function, that is kind of ugly, but it works. */ current_dpyinfo = dpyinfo; - + while (gtk_events_pending ()) { static int nr = 0; @@ -11703,7 +11703,7 @@ XTread_socket (sd, bufp, numchars, expected) while (XPending (dpyinfo->display)) { int finish; - + XNextEvent (dpyinfo->display, &event); #ifdef HAVE_X_I18N @@ -14105,7 +14105,7 @@ x_free_frame_resources (f) FRAME_GTK_OUTER_WIDGET (f) = 0; } #endif /* USE_GTK */ - + if (FRAME_X_WINDOW (f)) XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); #endif /* !USE_X_TOOLKIT */ @@ -14208,7 +14208,7 @@ x_wm_set_size_hint (f, flags, user_position) int ac = 0; Dimension widget_width, widget_height; #endif - + Window window = FRAME_OUTER_WINDOW (f); /* Setting PMaxSize caused various problems. */ @@ -15198,7 +15198,7 @@ x_term_init (display_name, xrm_option, resource_name) argv[argc++] = "--name"; argv[argc++] = resource_name; - + #ifdef HAVE_X11R5 XSetLocaleModifiers (""); #endif @@ -15210,7 +15210,7 @@ x_term_init (display_name, xrm_option, resource_name) xg_initialize (); dpy = GDK_DISPLAY (); - + /* NULL window -> events for all windows go to our function */ gdk_window_add_filter (NULL, event_handler_gdk, NULL); @@ -15226,10 +15226,10 @@ x_term_init (display_name, xrm_option, resource_name) if (! NILP (abs_file) && Ffile_readable_p (abs_file)) gtk_rc_parse (SDATA (abs_file)); - + UNGCPRO; } - + XSetErrorHandler (x_error_handler); XSetIOErrorHandler (x_io_error_quitter); } diff --git a/src/xterm.h b/src/xterm.h index 129dca32f5c..22b1ee257e5 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */ #include <X11/StringDefs.h> #include <X11/IntrinsicP.h> /* CoreP.h needs this */ #include <X11/CoreP.h> /* foul, but we need this to use our own - window inside a widget instead of one + window inside a widget instead of one that Xt creates... */ #include <X11/StringDefs.h> @@ -77,7 +77,7 @@ typedef GtkWidget *xt_or_gtk_widget; #ifdef PBaseSize /* AIX 3.1's X is somewhere between X11R3 and X11R4. It has PBaseSize, but not XWithdrawWindow, XSetWMName, XSetWMNormalHints, - XSetWMIconName. + XSetWMIconName. AIX 3.2 is at least X11R4. */ #if (!defined AIX) || (defined AIX3_2) #define HAVE_X11R4 @@ -138,51 +138,51 @@ struct x_display_info { /* Chain of all x_display_info structures. */ struct x_display_info *next; - + /* Connection number (normally a file descriptor number). */ int connection; - + /* This says how to access this display in Xlib. */ Display *display; - + /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). The same cons cell also appears in x_display_name_list. */ Lisp_Object name_list_element; - + /* Number of frames that are on this display. */ int reference_count; - + /* The Screen this connection is connected to. */ Screen *screen; /* Dots per inch of the screen. */ double resx, resy; - + /* The Visual being used for this display. */ Visual *visual; /* The colormap being used. */ Colormap cmap; - + /* Number of panes on this screen. */ int n_planes; - + /* Dimensions of this screen. */ int height, width; - + /* Mask of things that cause the mouse to be grabbed. */ int grabbed; - + /* Emacs bitmap-id of the default icon bitmap for this frame. Or -1 if none has been allocated yet. */ int icon_bitmap_id; - + /* The root window of this screen. */ Window root_window; - + /* The cursor to use for vertical scroll bars. */ Cursor vertical_scroll_bar_cursor; - + /* X Resource data base */ XrmDatabase xrdb; @@ -274,19 +274,19 @@ struct x_display_info /* Communication with window managers. */ Atom Xatom_wm_protocols; - + /* Kinds of protocol things we may receive. */ Atom Xatom_wm_take_focus; Atom Xatom_wm_save_yourself; Atom Xatom_wm_delete_window; - + /* Atom for indicating window state to the window manager. */ Atom Xatom_wm_change_state; - + /* Other WM communication */ Atom Xatom_wm_configure_denied; /* When our config request is denied */ Atom Xatom_wm_window_moved; /* When the WM moves us. */ - + /* EditRes protocol */ Atom Xatom_editres; @@ -476,7 +476,7 @@ struct x_output GtkWidget *toolbar_widget; /* The handle box that makes the tool bar detachable. */ GtkWidget *handlebox_widget; - + /* The last size hints set. */ GdkGeometry size_hints; long hint_flags; @@ -508,7 +508,7 @@ struct x_output /* Foreground color for scroll bars. A value of -1 means use the default (black for non-toolkit scroll bars). */ unsigned long scroll_bar_foreground_pixel; - + /* Background color for scroll bars. A value of -1 means use the default (background color of the frame for non-toolkit scroll bars). */ @@ -530,7 +530,7 @@ struct x_output /* Window whose cursor is hourglass_cursor. This window is temporarily mapped to display an hourglass cursor. */ Window hourglass_window; - + /* Non-zero means hourglass cursor is currently displayed. */ unsigned hourglass_p : 1; @@ -629,7 +629,7 @@ struct x_output /* As x_pixels_diff, but to FRAME_OUTER_WINDOW. For some reason the two might differ by a pixel, depending on WM */ int x_pixels_outer_diff; - + /* As y_pixels_diff, but to FRAME_OUTER_WINDOW. In the toolkit version, these may differ because this does not take into account possible menubar. y_pixels_diff is with menubar height included */ @@ -878,7 +878,7 @@ struct scroll_bar /* Return the length of the rectangle within which the top of the handle must stay. This isn't equivalent to the inside height, - because the scroll bar handle has a minimum height. + because the scroll bar handle has a minimum height. This is the real range of motion for the scroll bar, so when we're scaling buffer positions to scroll bar positions, we use this, not @@ -941,7 +941,7 @@ struct scroll_bar + (f)->output_data.x->internal_border_width) -/* Return the row/column (zero-based) of the character cell containing +/* Return the row/column (zero-based) of the character cell containing the pixel on FRAME at ROW/COL. */ #define PIXEL_TO_CHAR_ROW(f, row) \ (((row) - (f)->output_data.x->internal_border_width) \ |