1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 13:11:14 -08:00
Commit graph

12570 commits

Author SHA1 Message Date
Gerd Moellmann
a83fee2c56 (emacs_blocked_free) [GC_MALLOC_CHECK]: Handle freeing
null.
2000-10-23 15:03:55 +00:00
Gerd Moellmann
182334bd08 (x_connection_closed): Reset handling_signal. 2000-10-23 15:01:52 +00:00
Miles Bader
6ffdb53952 (window_scroll_pixel_based, window_scroll_line_based):
Pass nil for FULLY argument to Fpos_visible_in_window_p to
  maintain old behavior.
2000-10-23 13:48:52 +00:00
Miles Bader
7d7c38618c (Fminibuffer_complete): Pass nil for FULLY argument to
Fpos_visible_in_window_p to maintain old behavior.
2000-10-23 13:46:41 +00:00
Miles Bader
7f1c969b3a *** empty log message *** 2000-10-23 03:32:59 +00:00
Miles Bader
0e9becceb1 (VCENTER_BASELINE_OFFSET): Bias the division by two, so that when a font
can't be exactly centered, it errs up rather than down.
2000-10-23 03:14:04 +00:00
ShengHuo ZHU
8ec118cdd6 2000-10-22 15:07:47 ShengHuo ZHU <zsh@cs.rochester.edu>
* fns.c (Fbase64_decode_string): The decoded result should be
	unibyte.
2000-10-22 19:08:26 +00:00
Andrew Choi
1a578e9be2 Initial check-in: changes for building Emacs under Mac OS.
2000-10-23  Andrew Choi  <akochoi@i-cable.com>

	* dispextern.h [macintosh]: Include macgui.h instead of macterm.h.

	* dispnew.c [macintosh]: Include macterm.h.
	(init_display) [macintosh]: initialization for window system.

	* emacs.c (main) [macintosh]: Call syms_of_textprop,
	syms_of_macfns, syms_of_ccl, syms_of_fontset, syms_of_xterm,
	syms_of_search, x_term_init, and init_keyboard before calling
	init_window_once.  Also, call syms_of_xmenu.

	* fontset.c (syms_of_fontset) [macintosh]: Set ASCII font of
	default fontset to Monaco.

	* frame.c [macintosh]: Include macterm.h.  Remove declarations of
	NewMacWindow and DisposeMacWindow.
	(make_terminal_frame) [macintosh]: Call make_mac_terminal_frame
	instead of calling NewMacWindow and setting fields of
	f->output_data.mac directly.  Call init_frame_faces.
	(Fdelete_frame) [macintosh]: Remove unused code.
	(Fmodify_frame_parameters) [macintosh]: Call
	x_set_frame_parameters instead of mac_set_frame_parameters.

	* frame.h [macintosh]: Define menu_bar_lines field in struct
	frame.  Define FRAME_EXTERNAL_MENU_BAR macro.

	* keyboard.c [macintosh]: Include macterm.h.
	(kbd_buffer_get_event) [macintosh]: Generate delete_window_event
	and menu_bar_activate_event type events as for X and NT.
	(make_lispy_event) [macintosh]: Construct lisp events of type
	MENU_BAR_EVENT as for X and NT.

	* sysdep.c [macintosh]: Remove declaration for sys_signal.
	Include stdlib.h.  Remove definition of Vx_bitmap_file_path.
	(sys_subshell) [macintosh]: Remove definition entirely.
	(init_sys_modes) [macintosh]: Do not initialize Vwindow_system and
	Vwindow_system_version here.  Remove initialization of
	Vx_bitmap_file_path.
	(read_input_waiting): Correct the number of parameters passed to
	read_socket_hook.
	Move all Macintosh functions to mac/mac.c.

	* term.c [macintosh]: Include macterm.h.

	* window.c [macintosh]: Include macterm.h.

	* xdisp.c [macintosh]: Include macterm.h.  Declare
	set_frame_menubar and pending_menu_activation.
	(echo_area_display) [macintosh]: Do not return if terminal frame
	is the selected frame.
	(update_menu_bar) [macintosh]: Check FRAME_EXTERNAL_MENU_BAR (f).
	Allow only the selected frame to set menu bar.
	(redisplay_window) [macintosh]: Obtain menu bar to redisplay by
	calling FRAME_EXTERNAL_MENU_BAR (f).
	(display_menu_bar) [macintosh]: Check FRAME_MAC_P (f).

	* xfaces.c [macintosh]: Include macterm.h.  Define x_display_info
	and check_x.  Declare XCreateGC.  Define x_create_gc and
	x_free_gc.  Initialize font_sort_order.
	(x_face_list_fonts) [macintosh]: Use the same code as WINDOWSNT,
	but call x_list_fonts instead of w32_list_fonts.
	(Finternal_face_x_get_resource) [macintosh]: Do not call
	display_x_get_resource.
	(prepare_face_for_display) [macintosh]: Set xgcv.font.
	(realize_x_face) [macintosh]: Load the font if it is specified in
	ATTRS.
	(syms_of_xfaces) [macintosh]: Initialize Vscalable_fonts_allowed
	to Qt.

	* cus-edit.el (custom-button-face): Use 3D look for mac.
	(custom-button-pressed-face): Likewise.

	* faces.el (set-face-attributes-from-resources): Handle mac frames
	in the same way as x and w32 frames.
	(face-valid-attribute-values): Likewise.
	(read-face-attribute): Likewise.
	(defined-colors): Likewise.
	(color-defined-p): Likewise.
	(color-values): Likewise.
	(display-grayscale-p): Likewise.
	(face-set-after-frame-default): Likewise.
	(mode-line): Same default face as for x and w32.
	(tool-bar): Likewise.

	* frame.el: Remove call to frame-notice-user-settings at end of
	the file.

	* info.el (Info-fontify-node): make underlines invisible for mac
	as for x, pc, and w32 frame types.

	* term/mac-win.el: New file.
2000-10-22 16:50:16 +00:00
Eli Zaretskii
d9aef30f82 Fix a typo in a comment. 2000-10-22 14:00:19 +00:00
Stefan Monnier
1ffbabe3b1 *** empty log message *** 2000-10-22 08:22:51 +00:00
Stefan Monnier
9d0ffdd99f (fix_submap_inheritance): Don't do anything if parent_entry
is nil: since we go to the end of submap anyway, we'd end up
setting nil to nil.
(access_keymap): Don't use KEYMAPP on meta_map since KEYMAPP
doesn't obey autoload.
2000-10-22 04:48:48 +00:00
Eli Zaretskii
bed43f1d71 (dos_set_window_size): Update screen dimension variables. 2000-10-21 18:14:15 +00:00
Jason Rumney
f1eed8ff5b (w32_cache_char_metrics): Double check that font is
really fixed pitch before trusting tmPitchAndFamily.
2000-10-21 17:14:43 +00:00
Jason Rumney
ea4233a741 *** empty log message *** 2000-10-21 17:12:26 +00:00
Andrew Innes
f3d3c491d0 *** empty log message *** 2000-10-21 13:33:35 +00:00
Andrew Innes
78229cf17b (w32_char_font_type): Move enum from w32term.c 2000-10-21 13:31:55 +00:00
Andrew Innes
eeddd5a0bc Extern decl for w32_cache_char_metrics. 2000-10-21 13:31:20 +00:00
Andrew Innes
0042231086 (w32_load_bdf_font): Call w32_cache_char_metrics. 2000-10-21 13:30:33 +00:00
Andrew Innes
c6be386021 (w32_load_system_font): Call w32_cache_char_metrics.
(w32_unload_font): Free per_char array if present.
2000-10-21 13:29:45 +00:00
Andrew Innes
82f9d56522 (w32_per_char_metric): Remove HDC argument. Use
cached information in emulated XFontStruct to handle common cases
quickly.  Do not allocate XCharStruct for return.
(w32_native_per_char_metric): New function.
(w32_bdf_per_char_metric): Fill in supplied XCharStruct instead of
allocating one.
(x_produce_glyphs): Don't get an HDC.  Change calls to
w32_per_char_metric to match arg change above.  Remove calls to
free results.
(w32_get_glyph_overhangs): Ditto.
(w32_cache_char_metrics): New function.
2000-10-21 13:26:41 +00:00
Andrew Innes
aa2ee344e3 Change .obj to .$(O) in all dependencies.
($(BLD)/casefiddle.$(O)): Remove compile command.
($(BLD)/gmalloc.$(O)): Remove compile command.
($(BLD)/dispnew.obj):
($(BLD)/keyboard.obj):
($(BLD)/w32inevt.obj):
($(BLD)/w32bdf.obj):
($(BLD)/alloc.obj):
($(BLD)/buffer.obj):
($(BLD)/editfns.obj):
($(BLD)/emacs.obj):
($(BLD)/fileio.obj):
($(BLD)/fns.obj):
($(BLD)/indent.obj):
($(BLD)/insdel.obj):
($(BLD)/intervals.obj):
($(BLD)/minibuf.obj):
($(BLD)/print.obj):
($(BLD)/scroll.obj):
($(BLD)/sysdep.obj):
($(BLD)/textprop.obj):
($(BLD)/widget.obj):
($(BLD)/xdisp.obj): Add dependency on w32gui.h.
($(BLD)/term.obj): Add dependency on dispextern.h.
2000-10-21 13:24:14 +00:00
Andrew Innes
c7d49f531c ($(BLD)\dispnew.obj):
($(BLD)\keyboard.obj):
($(BLD)\w32inevt.obj):
($(BLD)\w32bdf.obj):
($(BLD)\alloc.obj):
($(BLD)\buffer.obj):
($(BLD)\editfns.obj):
($(BLD)\emacs.obj):
($(BLD)\fileio.obj):
($(BLD)\fns.obj):
($(BLD)\indent.obj):
($(BLD)\insdel.obj):
($(BLD)\intervals.obj):
($(BLD)\minibuf.obj):
($(BLD)\print.obj):
($(BLD)\scroll.obj):
($(BLD)\sysdep.obj):
($(BLD)\textprop.obj):
($(BLD)\widget.obj):
($(BLD)\xdisp.obj): Add dependency on w32gui.h.
($(BLD)\term.obj): Add dependency on dispextern.h
2000-10-21 13:23:23 +00:00
Eli Zaretskii
18ad482131 (Fminibuffer_complete): Call Fpos_visible_in_window_p
with an additional argument of Qt.
2000-10-21 08:57:18 +00:00
Miles Bader
de54681ae5 (Fpos_visible_in_window_p): Update prototype 2000-10-21 08:02:17 +00:00
Miles Bader
81e4d4652c (pos_fully_visible_in_window_p):
New function.
(Fpos_visible_in_window_p):
  Add FULLY argument.
  Use pos_fully_visible_in_window_p.
(window_scroll_pixel_based, window_scroll_line_based):
  Update calls to Fpos_visible_in_window_p.
2000-10-21 07:57:20 +00:00
Gerd Moellmann
13c844fb71 (toplevel): Conditionalize compilation of mem_*
functions differently.
2000-10-20 19:14:07 +00:00
Jason Rumney
8b30ba1a4d Move #ifdef GC_MARK_STACK back above mem_init where it used to be. mem_z etc not defined
otherwise.
2000-10-20 18:45:17 +00:00
Jason Rumney
d9506268c7 *** empty log message *** 2000-10-20 18:44:10 +00:00
Gerd Moellmann
8094989ba2 (_malloc_internal) [GC_MALLOC_CHECK]: Use
_malloc_internal instead of malloc.
(_free_internal) [GC_MALLOC_CHECK]: Use _free_internal instead
of free.
2000-10-20 15:57:00 +00:00
Gerd Moellmann
877935b1f5 (toplevel) [SYSTEM_MALLOC || DOUG_LEA_MALLOC]: Undef
GC_MALLOC_CHECK.
(toplevel) [GC_MARK_STACK || GC_MALLOC_CHECK]: Move mem_node
structure definition and related variabled to the top of the file.
Include this code when GC_MALLOC_CHECK is defined.
(lisp_malloc, lisp_free) [GC_MALLOC_CHECK]: Don't
register/unregister allocated region.
(emacs_blocked_free) [GC_MALLOC_CHECK]: Check if freeing something
which isn't allocated.
(emacs_blocked_malloc) [GC_MALLOC_CHECK]: Check if returning
something which is already in use.
(emacs_blocked_realloc) [GC_MALLOC_CHECK]: Likewise.
(mem_insert) [GC_MALLOC_CHECK]: Use _malloc_internal.
(mem_delete) [GC_MALLOC_CHECK]: Use _free_internal.
(init_alloc_once) [GC_MALLOC_CHECK]: Call mem_init.
2000-10-20 15:55:14 +00:00
Andrew Innes
ea456eb4e4 [!WINDOWSNT]: Don't apply Solaris 2.5 work-around on
Windows.
(my_strftime) <macro>: Don't use macro arg list when redefining as
_strftime_copytm.
(my_strftime) <function>: Supply 0 as ut argument.
2000-10-20 14:49:19 +00:00
Jason Rumney
e64c3a754a *** empty log message *** 2000-10-19 19:54:58 +00:00
Jason Rumney
0b6bb67088 (add_menu_item): Do not use MF_OWNERDRAW for titles, as it has stopped working.
(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar position like menu-bar.
2000-10-19 19:25:53 +00:00
Jason Rumney
2d0c0bd755 (x_produce_glyphs): Handle unibyte_display_via_language_environment correctly.
(w32_draw_box_rect): Fix the calculation of width and height.
2000-10-19 19:21:07 +00:00
Jason Rumney
1660f34ae4 (Fx_create_frame): Don't bother calling
face-set-after-frame-default since the caller does it for us
anyway. Clean up calls to x_get_arg to be consistent with X.
2000-10-19 19:12:51 +00:00
Jason Rumney
b93b26cbb0 Do not undef HAVE_WINDOW_SYSTEM before
including dispextern.h, as it stops faces from working.
2000-10-19 19:06:38 +00:00
Gerd Moellmann
17401c97e6 (skip_debugger): Prevent a compiler warning.
(Fcondition_case): Likewise.
(Fbacktrace_frame): Use a null interactive spec.
2000-10-19 12:03:08 +00:00
Kenichi Handa
773272d836 *** empty log message *** 2000-10-19 06:58:33 +00:00
Kenichi Handa
9f2feff636 (x_find_ccl_program): Check also fontp->full_name. 2000-10-19 06:55:02 +00:00
Gerd Moellmann
e50517d90e Sync with glibc, file version 1.78.
(my_strftime) [HAVE_TZNAME]: Use `UTC' instead of `GMT' which
should no longer be used according to ISO 8601.
2000-10-18 19:12:39 +00:00
Gerd Moellmann
9035a35ae6 *** empty log message *** 2000-10-18 15:20:26 +00:00
Gerd Moellmann
7396a36c10 (access_keymap): If IDX has a meta prefix, and there's
no map for meta_prefix_char, don't try to use it as a keymap.
Instead, if T_OK is non-zero, look up a default binding, if any,
otherwise, if T_OK is zero, return nil.
2000-10-18 14:20:53 +00:00
Gerd Moellmann
a42943e93e (allocate_string) [GC_CHECK_STRING_BYTES]: Call
check_string_bytes only if not noninteractive, increase count to 50.
2000-10-18 11:59:20 +00:00
Gerd Moellmann
70772ed1ac (struct x_display_info): Add color_cells and ncolor_cells.
(x_query_color, x_query_colors): Add prototype.
2000-10-18 11:58:27 +00:00
Gerd Moellmann
f04e1297ec (x_color_cells, x_query_colors, x_query_color): New
functions.
(x_alloc_nearest_color): Use it to reduce calls to XQueryColors
which can be slow.
(x_copy_color, x_alloc_lighter_color): Likewise.
2000-10-18 11:58:07 +00:00
Gerd Moellmann
a31fedb766 (x_to_xcolors, x_set_mouse_color, lookup_pixel_color)
(x_to_xcolors, png_load): Use x_query_color.
2000-10-18 11:57:35 +00:00
Miles Bader
00de298745 (adjust_markers_for_delete): Handle before-insertion markers correctly. 2000-10-18 06:20:27 +00:00
Gerd Moellmann
1f0b3fd207 (pure_bytes_used): Renamed from pureptr.
(ALIGN): New macro.
(pure_alloc): New function.
(make_pure_string, pure_cons, make_pure_float, make_pure_vector):
Use it.
(Fpurecopy): Use PURE_POINTER_P.
2000-10-17 19:39:17 +00:00
Gerd Moellmann
68c5d1db4a (try_cursor_movement): Use cursor_row_p also when
PT has moved backward.
2000-10-17 19:32:44 +00:00
Gerd Moellmann
9a03888161 (cursor_row_p): Take continued lines into account. 2000-10-17 16:08:57 +00:00