ChangeLog 491 KB
Newer Older
Kim F. Storm's avatar
Kim F. Storm committed
1 2 3 4
2004-05-19  Kim F. Storm  <storm@cua.dk>

	* .gdbinit (xsymbol): Fix last change.

5 6 7 8
2004-05-18  David Ponce  <david@dponce.com>

	* print.c (print): Reset print_depth before to call print_object.

9 10 11 12 13 14 15 16
2004-05-18  Jason Rumney  <jasonr@gnu.org>

	* w32console.c: Prefix RIF functions with w32con_ to avoid
	namespace clash with functions in term.c and w32term.c.

	* w32menu.c (add_menu_item, w32_menu_display_help)
	[USE_LISP_UNION_TYPE]: Cast from Lisp_Object using i member.

Kim F. Storm's avatar
Kim F. Storm committed
17
	* w32term.h (display_x_get_resource, vga_stdcolor_name): Add prototype.
18

19 20
2004-05-18  Eli Zaretskii  <eliz@gnu.org>

21 22
	* lisp.h (DECL_ALIGN): Remove restriction on MS-DOS systems.

23 24 25 26 27
	* msdos.c (syms_of_msdos): Initialize dos-unsupported-char-glyph
	with make_number.
	(IT_write_glyphs): Extract glyph from dos-unsupported-char-glyph
	with XINT.

28 29
2004-05-18  Kim F. Storm  <storm@cua.dk>

Kim F. Storm's avatar
Kim F. Storm committed
30 31 32 33 34
	* blockinput.h (INPUT_BLOCKED_P): New macros.

	* keyboard.c (Frecursive_edit): Return immediately if input blocked.
	(Ftop_level): Unblock input if blocked.

35 36 37 38 39 40 41 42
	* buffer.h (GET_OVERLAYS_AT): New macro.
	* msdos.c (IT_note_mouse_highlight): Use it.
	* textprop.c (get_char_property_and_overlay): Use it.
	* xdisp.c (next_overlay_change, note_mouse_highlight): Use it.
	* xfaces.c (face_at_buffer_position): Use it.

	* print.c (print_object): Increase buf size.

Jason Rumney's avatar
Jason Rumney committed
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
2004-05-17  Jason Rumney  <jasonr@gnu.org>

	* w32fns.c (Fw32_register_hot_key, Fw32_unregister_hot_key)
	(Fw32_toggle_lock_key) [USE_LISP_UNION_TYPE]: Cast from
	Lisp_Object using i member.
	(w32_quit_key): Rename from Vw32_quit_key, and make an int.
	(syms_of_w32fns, globals_of_w32fns): Use Lisp_Object and int
	consistently.

	* w32proc.c (create_child): Use make_number instead of masking pid.

	* w32fns.c (w32_color_map_lookup): Return a Lisp_Object.
	(x_to_w32_charset, w32_to_x_charset, w32_to_all_x_charsets):
	Use EQ to compare Lisp_Objects.
	(w32_parse_hot_key): Use int for lisp_modifiers consistently.

	* w32term.c (w32_num_mouse_buttons): Rename from
	Vw32_num_mouse_buttons and make it an int.

	* w32.c (init_environment): Use it.

	* w32fns.c (w32_wnd_proc): Likewise.

	* w32proc.c (w32_pipe_read_delay): Rename from
	Vw32_pipe_read_delay and make it an int.

	* w32.c (_sys_read_ahead): Use it.

	* lisp.h (egetenv) [USE_CRT_DLL]: Remove condition.

	* w32proc.c (create_child) [USE_LSB_TAG]: Don't try to mask pid.

	* w32inevt.c (w32_console_mouse_position, do_mouse_event)
	(key_event): Don't mix Lisp_Object and int.

	* w32heap.c (init_heap) [USE_LSB_TAG]: Don't check heap location.

	* keyboard.c (kbd_buffer_get_event): Don't use event->code and
	modifiers in language change event.

Kim F. Storm's avatar
Kim F. Storm committed
83 84 85 86 87
2004-05-17  Kim F. Storm  <storm@cua.dk>

	* alloc.c (mark_object): Ignore Lisp_Misc_Free objects.
	Such objects may be freed markers which still exist on an undo list.

88 89 90 91 92
2004-05-16  Juanma Barranquero  <lektu@terra.es>

	* data.c (Fset_default): Make argument names match their use in
	docstring.

93 94 95 96 97
2004-05-15  Andreas Schwab  <schwab@suse.de>

	* emacs.c (gdb_array_mark_flag): Define.
	* .gdbinit: Mask off gdb_array_mark_flag from vector sizes.

Eli Zaretskii's avatar
Eli Zaretskii committed
98 99 100 101 102 103
2004-05-15  Eli Zaretskii  <eliz@gnu.org>

	* lisp.h (DECL_ALIGN) [MSDOS]: Don't define DECL_ALIGN to use
	__attribute__((__aligned__)), so that USE_LSB_TAG would not become
	defined for the MS-DOS build.

104 105 106 107
2004-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>

	* w32fns.c (Fw32_define_rgb_color): Avoid XSET.

Kenichi Handa's avatar
Kenichi Handa committed
108 109 110 111
2004-05-14  Kenichi Handa  <handa@m17n.org>

	* ccl.c (Fccl_execute_on_string): Fix setting elements of STATUS.

112 113 114 115 116
2004-05-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

	* lisp.h (Vx_resource_name, Vx_resource_class): Move from xfns.c
	section to frame.c section.
	(Fxw_display_color_p, Fx_file_dialog): Declare if
117
	HAVE_WINDOW_SYSTEM defined.
Kim F. Storm's avatar
Kim F. Storm committed
118

119
	* macfns.c (Fx_create_frame): Fix int/Lisp_Object mixup.
Kim F. Storm's avatar
Kim F. Storm committed
120

121
	* macmenu.c (set_frame_menubar): Use NILP to test a lisp value.
Kim F. Storm's avatar
Kim F. Storm committed
122

123 124 125 126
	* macterm.c (mac_get_emulated_btn, mac_event_to_emacs_modifiers)
	(mac_get_mouse_btn): Use NILP and EQ to test/compare lisp values.
	(XTread_socket): Fix int/Lisp_Object mixup.
	(mac_check_for_quit_char): Fix pointer/Lisp_Object mixup.
Kim F. Storm's avatar
Kim F. Storm committed
127

128 129
	* macterm.h (struct frame, struct face, struct image)
	(display_x_get_resource, Fx_display_color_p)
130 131
	(Fx_display_grayscale_p, Fx_display_planes, x_free_gcs):
	Add prototypes.
132

Kim F. Storm's avatar
Kim F. Storm committed
133 134 135 136 137 138
2004-05-14  Kim F. Storm  <storm@cua.dk>

	* process.c (wait_reading_process_input): Make reentrant.
	Make Available and Connecting non-static.  Save and restore value
	of waiting_for_user_input_p.

Kim F. Storm's avatar
Kim F. Storm committed
139 140 141 142 143
2004-05-13  Kim F. Storm  <storm@cua.dk>

	* keyboard.c (mark_kboards): Don't mark x and y members
	that are overloaded in selection request events.

Stefan Monnier's avatar
Stefan Monnier committed
144 145 146 147
2004-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>

	* lisp.h (USE_LSB_TAG): Make it the default when it is known to work.

Glenn Morris's avatar
Glenn Morris committed
148 149 150 151 152
2004-05-13  Glenn Morris  <gmorris@ast.cam.ac.uk>

	* window.c (Fdisplay_buffer, Fsplit_window)
	(split-height-threshold): Doc fix.

153 154 155 156 157 158
2004-05-13  Juanma Barranquero  <lektu@terra.es>

	* xfaces.c (Ftty_supports_face_attributes_p)
	(Finternal_copy_lisp_face): Fix typo in docstring.
	(Finternal_get_lisp_face_attribute): Fix docstring.

159 160 161 162
2004-05-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

	* xfns.c (syms_of_xfns): Provide x-toolkit also for GTK.

163 164 165 166 167 168
2004-05-11  Steven Tamm  <steventamm@mac.com>

	* macfns.c (Fx_create_frame): Default to using tool-bar by
	setting tool-bar-lines to 1 in default-frame-alist.

2004-05-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
169 170 171 172 173 174

	* image.c (xpm_scan, xpm_make_color_table_v, xpm_put_color_table_v)
	(xpm_get_color_table_v, xpm_make_color_table_h)
	(xpm_put_color_table_h, xpm_get_color_table_h)
	(xpm_str_to_color_key, xpm_load_image, xpm_load)
	(syms_of_image): Support XPM on Carbon Emacs.  Does not
Stefan Monnier's avatar
Stefan Monnier committed
175
	depend on libXpm, but only supports XPM version 3 without extensions.
176

177 178
2004-05-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

Stefan Monnier's avatar
Stefan Monnier committed
179
	* macterm.c (x_flush, XTframe_up_to_date): Use FRAME_MAC_P
180 181
	instead of FRAME_X_P

Kim F. Storm's avatar
Kim F. Storm committed
182 183 184 185 186
2004-05-11  Kim F. Storm  <storm@cua.dk>

	* process.c (read_process_output): Grow decoding_buf when needed;
	this could cause a crash in allocate_string and compact_small_strings.

Eli Zaretskii's avatar
Eli Zaretskii committed
187 188 189 190 191
2004-04-29  Jim Blandy  <jimb@redhat.com>

	* regex.c (mutually_exclusive_p): In 'case wordbeg', compare op2
	against proper opcode.

Juanma Barranquero's avatar
Juanma Barranquero committed
192 193 194 195 196 197 198 199 200
2004-05-10  Juanma Barranquero  <lektu@terra.es>

	* process.c (Fstart_process): Fix docstring.

	* charset.c (Fget_unused_iso_final_char): Fix typos in docstring.
	(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction)
	(Fsplit_char, Fchar_charset): Make argument names match their use
	in docstring.

201 202 203 204 205
2004-05-10  Richard M. Stallman  <rms@gnu.org>

	* print.c (print_preprocess): Use being_printed, loop_count and
	halftail to detect overdeep nesting and cyclic cdr chains.

Andreas Schwab's avatar
Andreas Schwab committed
206 207 208 209 210 211 212
2004-05-10  Andreas Schwab  <schwab@suse.de>

	* lisp.h: Declare Fmake_symbolic_link.

	* fileio.c (Frename_file): Remove extra argument in call to
	Fmake_symbolic_link.

Kim F. Storm's avatar
Kim F. Storm committed
213 214 215 216 217
2004-05-10  Kim F. Storm  <storm@cua.dk>

	* xdisp.c (calc_line_height_property): Use string position when
	object is a string.

Kenichi Handa's avatar
Kenichi Handa committed
218 219
2004-05-10  Kenichi Handa  <handa@m17n.org>

Kenichi Handa's avatar
Kenichi Handa committed
220 221 222 223 224 225 226 227 228 229 230 231
	* print.c (temp_output_buffer_setup): Bind inhibit-read-only and
	inhibit-modification-hooks to t temporarily before calling
	Ferase_buffer.

	* xfns.c (x_create_tip_frame): Bind inhibit-read-only and
	inhibit-modification-hooks to t temporarily before calling
	Ferase_buffer.

	* w32fns.c (x_create_tip_frame): Bind inhibit-read-only and
	inhibit-modification-hooks to t temporarily before calling
	Ferase_buffer.

Kenichi Handa's avatar
Kenichi Handa committed
232 233 234
	* fns.c (count_combining): Delete it.
	(concat): Don't check combining bytes.

Jason Rumney's avatar
Jason Rumney committed
235 236 237 238 239
2004-05-09  Jason Rumney  <jasonr@gnu.org>

	* w32fns.c (Vw32_ansi_code_page): New Lisp variable.
	(globals_of_w32fns): Set it.

Juanma Barranquero's avatar
Juanma Barranquero committed
240 241 242 243
2004-05-09  Piet van Oostrum  <piet@cs.uu.nl>  (tiny change)

	* data.c (Fquo): Simplify.

244 245 246 247 248
2004-05-08  Peter Whaite  <emacs@whaite.ca>  (tiny change)

	* data.c (Fquo): If any argument is float, do the computation in
	floating point.

Juanma Barranquero's avatar
Juanma Barranquero committed
249 250
2004-05-08  Juanma Barranquero  <lektu@terra.es>

Juanma Barranquero's avatar
Juanma Barranquero committed
251 252 253 254 255 256 257 258 259
	* process.c (Fwaiting_for_user_input_p, Fmake_network_process)
	(Fset_process_query_on_exit_flag, Vprocess_adaptive_read_buffering):
	Fix spelling of Emacs on docstring.
	(Fset_process_coding_system, Fprocess_coding_system)
	(Fset_process_filter_multibyte, Fprocess_filter_multibyte_p):
	Make argument names match their use in docstring.
	(Fprocess_id, Fprocess_query_on_exit_flag, Finterrupt_process):
	Fix docstring.

Juanma Barranquero's avatar
Juanma Barranquero committed
260 261 262 263 264
	* editfns.c (Finsert_buffer_substring): Make argument names match their
	use in docstring.

	* syntax.c (Fmodify_syntax_entry): Fix docstring.

265 266 267 268 269 270
2004-05-07  Steven Tamm  <steventamm@mac.com>

	* macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
	around call to ReceiveEvent to avoid certain crashes.

2004-05-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
Kim F. Storm's avatar
Kim F. Storm committed
271

272 273 274 275 276 277 278 279 280
	* macterm.c (mac_draw_line_to_pixmap, XCreatePixmapFromBitmapData)
	(mac_fill_rectangle_to_pixmap, mac_draw_rectangle_to_pixmap)
	(mac_copy_area_to_pixmap, mac_copy_area_with_mask_to_pixmap):
	Save/restore the current graphics port and device handle when
	drawing into an offscreen graphics world.

	* image.c [MAC_OS] (XPutPixel, XGetPixel, image_load_qt_1)
	(gif_load): Likewise.

281 282 283 284
2004-05-07  Juanma Barranquero  <lektu@terra.es>

	* window.c (Fset_window_buffer): Fix docstring.

Thien-Thi Nguyen's avatar
Thien-Thi Nguyen committed
285 286 287 288
2004-05-06  Thien-Thi Nguyen  <ttn@gnu.org>

	* emacs.c (main) [VMS]: Fix var ref.

Juanma Barranquero's avatar
Juanma Barranquero committed
289 290 291 292
2004-05-06  Romain Francoise  <romain@orebokech.com>  (tiny change)

	* data.c (Fsetq_default): Fix docstring.

293 294 295 296 297
2004-05-06  Jason Rumney  <jasonr@gnu.org>

	* image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h
	to avoid name clash.

298 299 300 301
2004-05-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

	* fileio.c (barf_or_query_if_file_exists): Use lstat.
	(Frename_file): Handle renaming of symlinks across file systems.
302
	(Frename_file): Put symlink handling inside #ifdef S_IFLNK.
303

Kim F. Storm's avatar
Kim F. Storm committed
304 305 306 307 308 309 310 311 312
2004-05-04  Kim F. Storm  <storm@cua.dk>

	* xdisp.c (Qtotal): New var.
	(syms_of_xdisp): Intern and staticpro it.
	(calc_line_height_property): New arg total.  Set it if
	line-spacing property has format (total . VALUE).
	(x_produce_glyphs): Ignore line-spacing if line-height is 0.
	Handle total line-spacing property.

313 314 315 316 317
2004-05-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

	* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
	"under" scroll bar when size/position changes.

318 319 320 321
2004-05-03  Jason Rumney  <jasonr@gnu.org>

	* makefile.nt: Remove.

322 323
2004-05-02  Eli Zaretskii  <eliz@gnu.org>

Stefan Monnier's avatar
Stefan Monnier committed
324 325
	* syntax.h (SET_RAW_SYNTAX_ENTRY, SYNTAX_ENTRY_INT):
	Avoid compiler warnings.
Eli Zaretskii's avatar
Eli Zaretskii committed
326

327 328
	* Makefile.in (region-cache.o): Depend on config.h.

329 330 331 332 333
2004-05-02  Romain Francoise  <romain@orebokech.com>  (tiny change)

	* indent.c (compute_motion): Save vpos in prev_vpos when dealing
	with continuation lines, too.

334 335 336 337
2004-05-02  Thien-Thi Nguyen  <ttn@gnu.org>

	* syssignal.h (init_signals): Move decl outside `#ifdef POSIX_SIGNALS'.

338 339 340 341 342
2004-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>

	* xdisp.c (calc_line_height_property): YAILOM (yet another
	int/Lisp_Object mixup).

343 344 345 346 347
2004-05-01  Eli Zaretskii  <eliz@gnu.org>

	* msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to
	undo bad effect of pack(4) in some versions of system headers.

348 349 350 351
2004-05-01  Jason Rumney  <jasonr@gnu.org>

	* w32term.c (x_draw_hollow_cursor): Sync with xterm.c

Kim F. Storm's avatar
Kim F. Storm committed
352 353 354
2004-04-30  Kim F. Storm  <storm@cua.dk>

	* buffer.c (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm's avatar
Kim F. Storm committed
355
	(syms_of_buffer) <cursor-type>: Doc fix.
Kim F. Storm's avatar
Kim F. Storm committed
356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375

	* dispextern.h (struct it): Remove member use_default_face.
	Add members override_ascent, override_descent, override_boff.

	* xdisp.c (init_iterator): Handle line-spacing float value.
	Initialize override_ascent member.
	(append_space_for_newline): Reset override_ascent.
	Remove use_default_face.
	(calc_line_height_property): New function to calculate value of
	line-height and line-spacing properties.  Look at overlays, too.
	Set override_ascent, override_descent, override_boff members when
	using another face than the current face.  Float values are now
	relative to the frame default font, by default; accept a cons
	of ratio and face name to specify value relative to a specific face.
	(x_produce_glyphs): Use calc_line_height_property.
	Use override_ascent etc. when set to handle different face heights.
	A negative line-spacing property value is interpreted as a total
	line height, rather than inter-line spacing.
	(note_mouse_highlight): Allocate room for 40 overlays initially.

Stefan Monnier's avatar
Stefan Monnier committed
376 377 378 379 380
2004-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>

	* data.c (Fsubr_name): New fun.
	(syms_of_data): Defsubr it.

Kim F. Storm's avatar
Kim F. Storm committed
381 382 383 384 385 386
2004-04-29  Kim F. Storm  <storm@cua.dk>

	* xdisp.c (null_glyph_slice): New var.
	(append_glyph, append_composite_glyph, append_stretch_glyph):
	Use it to initialize glyph slice.

Stefan Monnier's avatar
Stefan Monnier committed
387 388 389 390 391 392 393
2004-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>

	* xdisp.c (x_produce_glyphs): Fix the proverbial int/Lisp_Object mixup.
	(on_hot_spot_p): Make sure we always return a value.
	(Flookup_image_map): Remove unused var ix and iy.
	(note_mode_line_or_margin_highlight): Remove unused var `image'.

Eli Zaretskii's avatar
Eli Zaretskii committed
394 395 396 397 398 399
2004-04-27  Eli Zaretskii  <eliz@gnu.org>

	* msdos.c (init_environment): If one of the TMP... environment
	variables is set to a drive letter without a trailing slash,
	append a slash.

Eli Zaretskii's avatar
Eli Zaretskii committed
400 401 402 403 404 405 406
2004-04-27  Matthew Mundell  <matt@mundell.ukfsn.org>

	* editfns.c (lisp_time_argument): Provide externally.

	* fileio.c (Fset_file_times): New function.
	(syms_of_fileio): Intern and staticpro it.

Kim F. Storm's avatar
Kim F. Storm committed
407 408
2004-04-27  Kim F. Storm  <storm@cua.dk>

Kim F. Storm's avatar
Kim F. Storm committed
409 410 411
	* xdisp.c (x_produce_glyphs): Fix last change; handle newline in
	header line strings.

Kim F. Storm's avatar
Kim F. Storm committed
412 413
	* dispextern.h (struct it): New member use_default_face.

Kim F. Storm's avatar
Kim F. Storm committed
414 415 416 417 418 419 420 421 422
	* xdisp.c (Qline_height): New variable.
	(syms_of_xdisp): Intern and staticpro it.
	(append_space_for_newline): Partially undo 2004-04-25 change;
	add default_face_p arg, and restore callers.
	Clear it->use_default_face after use.
	(x_produce_glyphs): Set default font for ascii char if
	it->use_default_font is set.  Change line-spacing property to set
	just extra line spacing.  Handle new line-height property.

Andreas Schwab's avatar
.  
Andreas Schwab committed
423 424 425 426 427 428 429 430 431 432 433 434 435
2004-04-26  Andreas Schwab  <schwab@suse.de>

	* print.c (print_object): Print non-ascii characters in bool
	vector representation as octal escapes.

	* lisp.h (BOOL_VECTOR_BITS_PER_CHAR): Define.
	* print.c (print_object): Use it instead of BITS_PER_CHAR for
	bool vectors.
	* lread.c (read1): Likewise.
	* alloc.c (Fmake_bool_vector): Likewise.
	* data.c (Faref, Faset): Likewise.
	* fns.c (Fcopy_sequence, concat, internal_equal, Ffillarray)
	(mapcar1): Likewise.
Kim F. Storm's avatar
Kim F. Storm committed
436

437 438 439 440
2004-04-26  Steven Tamm  <tamm@Steven-Tamms-Computer.local>

	* lread.c (init_lread): Fixing typo HAVE_CARBON test logic

441 442 443 444
2004-04-26  Miles Bader  <miles@gnu.org>

	* lisp.h (CYCLE_CHECK): Macro moved from xfaces.c.

445 446 447 448
2004-04-26  Juanma Barranquero  <lektu@terra.es>

	* buffer.c (Fpop_to_buffer): Fix docstring.

449
2004-04-26  Steven Tamm  <steventamm@mac.com>
450

451 452
	* lread.c (init_lread): Don't display missing lisp directory
	warnings with Carbon Emacs because self-contained bundled Emacs
453
	may be built without correct installation path.
454

455 456
2004-04-25  Kim F. Storm  <storm@cua.dk>

Kim F. Storm's avatar
Kim F. Storm committed
457 458 459 460
	* macterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines.

	* xterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines.

461 462 463 464 465 466 467
	* xdisp.c (append_space_for_newline): Rename from append_space.
	Remove DEFAULT_FACE_P arg; always use current face.  Callers changed.
	(x_produce_glyphs): Handle line-spacing property on newline char.
	If value is t, adjust ascent and descent to fit current row height.
	If value is an integer or float, set extra_line_spacing to integer
	value, or to float value x current line height.

Kenichi Handa's avatar
Kenichi Handa committed
468 469 470 471 472
2004-04-23  Kenichi Handa  <handa@m17n.org>

	* fontset.c (Finternal_char_font): If POSITION is nil, return
	font for displaying CH with the default face.

Juanma Barranquero's avatar
Juanma Barranquero committed
473 474 475 476
2004-04-23  Juanma Barranquero  <lektu@terra.es>

	* makefile.w32-in: Add "-*- makefile -*-" mode tag.

Stefan Monnier's avatar
Stefan Monnier committed
477 478 479 480 481 482
2004-04-21  Stefan Monnier  <monnier@iro.umontreal.ca>

	* lisp.h (XINT) [EXPLICIT_SIGN_EXTEND && !NO_UNION_TYPE]:
	Don't make assumptions about the relative place of i and val.
	(EQ) [!NO_UNION_TYPE]: Don't forget to check the type match as well.

Kim F. Storm's avatar
Kim F. Storm committed
483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506
2004-04-21  Kim F. Storm  <storm@cua.dk>

	* dispextern.h (struct glyph_slice): New struct.
	(struct glyph): New member slice.
	(GLYPH_SLICE_EQUAL_P): New macro.
	(GLYPH_EQUAL_P): Use it.
	(struct glyph_string): New member slice.
	(struct it_slice): New struct.
	(struct it): New member slice, add member to stack too.
	New member constrain_row_ascent_descent_p.
	(image_ascent): Add prototype.

	* dispnew.c (buffer_posn_from_coords): Return full image width
	and height even for image slices (posn is relative to full image).
	(marginal_area_string): Adjust x0,y0 for image slice.

	* image.c (image_ascent): Add slice arg; calculate ascent for
	image slice (or full image).

	* keyboard.c (Fposn_at_x_y, Fposn_at_point): New defuns.
	(syms_of_keyboard): Defsubr them.

	* lisp.h (pos_visible_p): Fix prototype.

Juanma Barranquero's avatar
Juanma Barranquero committed
507
	* macterm.c (x_draw_relief_rect): Add top_p and bot_p args.
Kim F. Storm's avatar
Kim F. Storm committed
508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559
	(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
	(x_draw_image_foreground, x_draw_image_relief)
	(x_draw_image_foreground_1, x_draw_image_glyph_string):
	Draw sliced images.

	* w32term.c (w32_draw_relief_rect): Add top_p and bot_p args.
	(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
	(x_draw_image_foreground, x_draw_image_relief)
	(w32_draw_image_foreground_1, x_draw_image_glyph_string):
	Draw sliced images.

	* w32term.h (image_ascent): Remove prototype.

	* window.c (Fpos_visible_in_window_p): Return pixel position if
	PARTIALLY arg is non-nil.  Simplify.  Doc fix.
	(Fwindow_vscroll, Fset_window_vscroll): Add optional PIXEL_P arg
	to return/set vscroll in pixels.

	* window.h (Fwindow_vscroll, Fset_window_vscroll): Fix EXFUN.

	* xdisp.c (Qslice): New variable.
	(syms_of_xdisp): Intern and staticpro it.
	(pos_visible_p): Return pixel position in new x and y args.
	(init_iterator): Reset it->slice info.
	(handle_display_prop): Parse (slice ...) property.
	(push_it, pop_it): Save/restore slice info.
	(make_cursor_line_fully_visible): Fix 2004-04-14 change.  Do not
	force repositioning of tall row if window is vscrolled, as that
	would reset vscroll.
	(append_space): Set it->constrain_row_ascent_descent_p to avoid
	increasing row height if row is non-empty.
	(fill_image_glyph_string): Copy slice info.
	(take_vertical_position_into_account): Simplify.
	(produce_image_glyph): Handle iterator slice info, setup glyph
	slice info.  Do not force minimum line height.
	(x_produce_glyphs): If it->constrain_row_ascent_descent_p is set,
	do not increase height (ascent/descent) of non-empty row when
	adding normal character glyph; instead reduce glyph ascent/descent
	appropriately; if row is higher than current glyph, adjust glyph
	descent/ascent to reposition glyph within the existing row.
	Likewise, when char is newline, only set ascent/descent if row is
	currently empty.
	(note_mouse_highlight): Handle hotspots with sliced image.

	* xterm.c (x_draw_relief_rect): Add top_p and bot_p args.
	(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
	(x_draw_image_foreground, x_draw_image_relief)
	(x_draw_image_foreground_1, x_draw_image_glyph_string):
	Draw sliced images.

	* xterm.h (image_ascent): Remove prototype.

Stefan Monnier's avatar
Stefan Monnier committed
560 561 562 563
2004-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>

	* keymap.c (Fkey_description): Fix the usual int/Lisp_Object mixup.

564 565 566 567
2004-04-20  John Paul Wallington  <jpw@gnu.org>

	* fns.c (Fassoc, Feql): Fix indentation.

Stefan Monnier's avatar
Stefan Monnier committed
568
	* fontset.c (regularize_fontname): Rename from regulalize_fontname.
569

John Paul Wallington's avatar
John Paul Wallington committed
570 571 572
2004-04-19  John Paul Wallington  <jpw@gnu.org>

	* fns.c (Feql): New function.
Stefan Monnier's avatar
Stefan Monnier committed
573
	(syms_of_fns): Defsubr it.
John Paul Wallington's avatar
John Paul Wallington committed
574

Jason Rumney's avatar
Jason Rumney committed
575 576 577 578 579
2004-04-18  Jason Rumney  <jasonr@gnu.org>

	* w32select.c (Fw32_set_clipboard_data): Get sequence number
	after closing the clipboard.

580 581 582 583
2004-04-16  Luc Teirlinck  <teirllm@auburn.edu>

	* buffer.c (Fbuffer_base_buffer): Doc fix.

Kim F. Storm's avatar
Kim F. Storm committed
584 585
2004-04-17  Kim F. Storm  <storm@cua.dk>

Kim F. Storm's avatar
Kim F. Storm committed
586 587 588 589 590 591 592 593 594 595 596 597 598 599 600
	* keymap.c (Fkey_description): Add optional PREFIX arg.
	Combine prefix with KEYS to make up the full key sequence to describe.
	Correlate meta_prefix_char and following (simple) key to describe
	as meta modifier.  All callers changed.
	(describe_map): Rename arg `keys' to `prefix'.  Remove local
	`elt_prefix' var.  Use Fkey_description with prefix instead of
	elt_prefix combined with Fsingle_key_description.
	(describe_vector): Declare static.  Replace arg `elt_prefix' with
	`prefix'.  Add KEYMAP_P arg.  Add local var `elt_prefix'; use it
	if !KEYMAP_P. Use Fkey_description with prefix instead of
	Fsingle_key_description.

	* keymap.h (Fkey_description): Fix prototype.
	(describe_vector): Remove prototype.

601 602
	* xdisp.c (update_overlay_arrows): Fix handling of up_to_date < 0.

Kim F. Storm's avatar
Kim F. Storm committed
603 604 605 606
	* image.c (PNG_BG_COLOR_SHIFT): Remove.
	(png_load): Fix calculation of transparent background color on X
	and W32 platforms.

607 608 609 610 611
2004-04-16  Juanma Barranquero  <lektu@terra.es>

	* xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
	not too large before computing how much to scroll.

Stefan Monnier's avatar
Stefan Monnier committed
612 613 614 615
2004-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>

	* dired.c (Ffile_attributes): Don't pass extra nil arg to file-handler.

616 617 618 619 620
2004-04-14  Luc Teirlinck  <teirllm@auburn.edu>

	* fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):
	Add hyperlink to Elisp manual to the docstring.

Stefan Monnier's avatar
Stefan Monnier committed
621 622 623 624
2004-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>

	* callint.c (fix_command): Use XDCR.

Nick Roberts's avatar
Nick Roberts committed
625 626 627 628
2004-04-14  Nick Roberts  <nick@nick.uklinux.net>

	* window.c (Fget_lru_window): Doc fix.

Kim F. Storm's avatar
Kim F. Storm committed
629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647
2004-04-14  Kim F. Storm  <storm@cua.dk>

	* editfns.c (Fformat): Fix allocation size of precision array.

	* dispnew.c (update_window): Only set changed_p if
	scrolling_window actually did scroll.
	(scrolling_window): Only return 1 if we actually did scroll.

	* xdisp.c (get_glyph_string_clip_rect): Fix reduction of cursor
	height to glyph height when cursor row is not fully visible.
	(make_cursor_line_fully_visible): Add FORCE_P arg to return
	failure in case row is higher than window.  Callers changed.
	(try_scrolling): Fix loop in scrolling if last_line_misfit (from Gerd).
	Try to scroll partially visible, higher-than-window cursor row.
	(redisplay_window): Always try to scroll partially visible,
	higher-than-window cursor row - both initially and again with
	centering_position = 0.
	Clear desired matrix before retrying with centering_position = 0.

Stefan Monnier's avatar
Stefan Monnier committed
648 649 650 651 652
2004-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>

	* syntax.c (scan_lists): Simplify backward string scan.
	Fix off-by-one boundary check for string and comment fences.

Stefan Monnier's avatar
Stefan Monnier committed
653 654 655 656
2004-04-13  Joe Buehler  <jbuehler@hekimian.com>

	* sheap.c, unexcw.c: New files.

657 658 659 660 661 662
2004-04-12  Luc Teirlinck  <teirllm@auburn.edu>

	* buffer.c (Fmake_indirect_buffer): Throw an error if the intended
	base buffer has been killed.  Correct the error message if the
	base buffer does not exist.

Stefan Monnier's avatar
Stefan Monnier committed
663 664 665 666 667 668 669 670 671 672 673 674 675 676
2004-04-12  Joe Buehler  <jbuehler@hekimian.com>

	* s/cygwin.h: Changes for Cygwin unexec() support, changes in
	Cygwin itself.  Add support for Xaw3d scrollbars.

	* puresize.h: Set up PURE_P() for Cygwin unexec() support.

	* lastfile.c: Define my_endbss[] for Cygwin unexec() support.

	* gmalloc.c (__default_morecore): Use bss_sbrk(), not __sbrk(),
	before Cygwin unexec.

	* Makefile.in: Link changes for Cygwin unexec() support.

Andreas Schwab's avatar
.  
Andreas Schwab committed
677 678 679 680
2004-04-12  Andreas Schwab  <schwab@suse.de>

	* buffer.c (Fmake_indirect_buffer): Check that NAME is a string.

681 682 683 684 685
2004-04-11  Luc Teirlinck  <teirllm@auburn.edu>

	* buffer.c (Fgenerate_new_buffer_name): Return NAME argument if
	IGNORE argument equals NAME.  Doc fix.

686 687
2004-04-11  Masatake YAMATO  <jet@gyve.org>

Stefan Monnier's avatar
Stefan Monnier committed
688
	* buffer.c (fix_start_end_in_overlays): Make overlays
689 690
	empty if they are backwards.

Stefan Monnier's avatar
Stefan Monnier committed
691 692 693 694
2004-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>

	* xfaces.c (face_color_supported_p): Fix compilation without X11.

Stefan Monnier's avatar
Stefan Monnier committed
695 696 697 698
2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>

	* doc.c (Fsnarf_documentation): Ignore new file name entries.

Kim F. Storm's avatar
Kim F. Storm committed
699 700
2004-04-06  Kim F. Storm  <storm@cua.dk>

Kim F. Storm's avatar
Kim F. Storm committed
701 702 703 704 705 706 707 708 709 710 711
	* msdos.c (clear_mouse_face): Only clear mouse highlight if not	hidden.
	(dos_rawgetc): Set mouse_face_hidden after clearing highlight.

	* w32term.c (w32_read_socket): Set mouse_face_hidden after
	clearing highlight.

	* xdisp.c (clear_mouse_face): Only clear mouse highlight if not hidden.

	* xterm.c (handle_one_xevent): Set mouse_face_hidden after
	clearing highlight.

Kim F. Storm's avatar
Kim F. Storm committed
712 713 714
	* indent.c (vmotion): Do not reserve one column for continuation
	marks on window frames.

Eli Zaretskii's avatar
Eli Zaretskii committed
715 716 717 718 719
2004-04-04  Eli Zaretskii  <eliz@gnu.org>

	* charset.h (SINGLE_BYTE_CHAR_P): Fix macro to avoid warnings
	from GCC.

720 721 722 723 724 725 726 727 728 729 730 731
2004-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>

	* .gdbinit-union: Remove.

	* .gdbinit: Make it work for USE_LSB_TAG and !NO_LISP_UNION.
	(xgetptr, xgetint, xgettype): New funs.  Use them everywhere.
	($nonvalbits): Remove.
	($valmask): Set it by calling xreload to avoid redundancy.

	* emacs.c (gdb_use_union, gdb_use_lsb): New vars.
	(gdb_emacs_intbits): Remove.

732 733
2004-03-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

734
	* data.c (Fbyteorder): Make test work even if unsigned is not 4 bytes.
735

736 737 738 739
2004-03-30  Kenichi Handa  <handa@m17n.org>

	* editfns.c (Fformat): Fix initialization of the array info.

Kim F. Storm's avatar
Kim F. Storm committed
740 741 742 743 744 745 746 747
2004-03-30  Kim F. Storm  <storm@cua.dk>

	* xterm.c (x_mouse_click_focus_ignore_position): New var.
	(syms_of_xterm): DEFVAR_BOOL it.
	(ignore_next_mouse_click_timeout): New var.
	(handle_one_xevent): Clear it on KeyPress, set it on EnterNotify.
	Use it to filter mouse clicks following focus event.

Kim F. Storm's avatar
Kim F. Storm committed
748 749 750 751
2004-03-29  David Ponce  <david@dponce.com>

	* callint.c (Fcall_interactively): Fix last change.

Stefan Monnier's avatar
Stefan Monnier committed
752 753 754 755 756 757 758 759 760 761 762
2004-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>

	* eval.c (Fcommandp): Simplify.

	* data.c (Finteractive_form): Rename from Fsubr_interactive_form.
	Extend to handle all kinds of functions.

	* lisp.h (Finteractive_form): Declare.

	* callint.c (Fcall_interactively): Use it.

Kim F. Storm's avatar
Kim F. Storm committed
763 764 765 766 767
2004-03-26  Kim F. Storm  <storm@cua.dk>

	* xdisp.c (syms_of_xdisp): Include `void-variable' in list_of_error
	to catch errors in calc_pixel_width_or_height during redisplay.

768 769
2004-03-26  Masatake YAMATO  <jet@gyve.org>

Kim F. Storm's avatar
Kim F. Storm committed
770
	* buffer.c (fix_start_end_in_overlays): Rename fix_overlays_in_range.
771

Kim F. Storm's avatar
Kim F. Storm committed
772
	* lisp.h (fix_start_end_in_overlays): Likewise.
773

Kim F. Storm's avatar
Kim F. Storm committed
774
	* insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
775

Kim F. Storm's avatar
Kim F. Storm committed
776
	* editfns.c (Ftranspose_regions): Likewise.
777

778 779
2004-03-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

Kim F. Storm's avatar
Kim F. Storm committed
780
	* xterm.c (handle_one_xevent): Do not pass key press events to GTK.
781

782 783 784 785
2004-03-19  Richard M. Stallman  <rms@gnu.org>

	* s/sol2-6.h: Delete previous change.

Kim F. Storm's avatar
Kim F. Storm committed
786 787 788 789 790 791
2004-03-19  Kim F. Storm  <storm@cua.dk>

	* xdisp.c (move_it_in_display_line_to): Fix MOVE_TO_POS case when
	to_charpos corresponds to newline in right fringe.  Use local
	BUFFER_POS_REACHED_P macro.

792 793 794 795 796
2004-03-19  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

	* xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
	to compile on non-window system.

Kim F. Storm's avatar
Kim F. Storm committed
797 798 799 800 801 802 803
2004-03-19  Kim F. Storm  <storm@cua.dk>

	* dispextern.h (calc_pixel_width_or_height): Add prototype.

	* image.c (Qcenter): Move to xdisp.c.

	* xdisp.c (Qcenter): Declare here.
Stefan Monnier's avatar
Stefan Monnier committed
804
	(syms_of_xdisp): Intern and staticpro it.
Kim F. Storm's avatar
Kim F. Storm committed
805 806 807 808 809 810 811 812 813 814 815 816 817 818 819
	(handle_single_display_prop): Allow space display property on all
	platforms.
	(display_mode_line): Set mode_line_p before displaying line.
	(calc_pixel_width_or_height): Declare extern.  Add separate :align-to
	handling.  Remove complex cases for fringes and scroll-bars.
	Add left, right, and center alignment positions. Add text (area)
	width/height.  Return width or height for image specs.
	(produce_stretch_glyph): Improve handling of :align-to.  Is now
	relative to left of text area by default, but other base offsets
	can be specified -- also for text lines.

	* term.c (produce_glyphs): Handle IT_STRETCH.
	(produce_stretch_glyph): New function to handle space width and
	align-to display properties on non-window systems.

Stefan Monnier's avatar
Stefan Monnier committed
820 821 822 823 824
2004-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>

	* fileio.c (Fread_file_name): Set completion-ignore-case for
	case-insensitive systems.

825 826 827 828 829
2004-03-14  Masatake YAMATO  <jet@gyve.org>

	* xdisp.c (note_mode_line_or_margin_highlight): Accept HEADER_LINE
	when keymap and cursor are setup.

830 831
2004-03-14  Steven Tamm <steventamm@mac.com>

Kim F. Storm's avatar
Kim F. Storm committed
832
	* Makefile.in (XMENU_OBJ) [HAVE_CARBON]: Do not include xmenu.o.
833

Kim F. Storm's avatar
Kim F. Storm committed
834 835 836 837 838 839 840 841
2004-03-14  Kim F. Storm  <storm@cua.dk>

	* dispextern.h (x_find_image_file): Add prototype.

	* image.c (x_find_image_file): Make extern.

	* xfns.c (x_find_image_file): Remove prototype.

Eli Zaretskii's avatar
Eli Zaretskii committed
842
2004-03-13  Eli Zaretskii  <eliz@gnu.org>
Eli Zaretskii's avatar
Eli Zaretskii committed
843

Stefan Monnier's avatar
Stefan Monnier committed
844
	* Makefile.in (XMENU_OBJ): Include xmenu.o if HAVE_MENUS is defined.
Eli Zaretskii's avatar
Eli Zaretskii committed
845

Stefan Monnier's avatar
Stefan Monnier committed
846
	* emacs.c (main): Call syms_of_xmenu only if HAVE_MENUS is defined.
Eli Zaretskii's avatar
Eli Zaretskii committed
847

848 849 850 851 852 853 854
2004-03-12  Richard M. Stallman  <rms@gnu.org>

	* fns.c (internal_equal): New arg PROPS controls comparing
	text properties.  All callers changed.
	(Fequal_including_properties): New function.
	(syms_of_fns): defsubr it.

Kim F. Storm's avatar
Kim F. Storm committed
855 856 857
2004-03-12  Kim F. Storm  <storm@cua.dk>

	Fix image support on MAC.  From YAMAMOTO Mitsuharu.
Stefan Monnier's avatar
Stefan Monnier committed
858

Kim F. Storm's avatar
Kim F. Storm committed
859 860 861
	* dispextern.h (XImagePtr, XImagePtr_or_DC): Add typedefs.
	(image_background, image_background_transparent): Fix prototypes.

Stefan Monnier's avatar
Stefan Monnier committed
862
	* image.c (XImagePtr, XImagePtr_or_DC): Move typedefs to dispextern.h.
Kim F. Storm's avatar
Kim F. Storm committed
863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879

	* macfns.c (x_list_fonts, x_get_font_info, x_load_font)
	(x_query_font, x_find_ccl_program, x_set_window_size)
	(x_make_frame_visible, mac_initialize, XCreatePixmap)
	(XCreatePixmapFromBitmapData, XFreePixmap, XSetForeground)
	(mac_draw_line_to_pixmap): Move prototypes to macterm.h.

	* macterm.h (x_list_fonts, x_get_font_info, x_load_font)
	(x_query_font, x_find_ccl_program, x_set_window_size)
	(x_make_frame_visible, mac_initialize, XCreatePixmap)
	(XCreatePixmapFromBitmapData, XFreePixmap, XSetForeground)
	(mac_draw_line_to_pixmap): Add prototypes.

2004-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

	* macterm.c (XTread_socket): Fix mouse click on tool bar.

880 881
2004-03-11  Kim F. Storm  <storm@cua.dk>

Kim F. Storm's avatar
Kim F. Storm committed
882 883 884
	* dispextern.h: Move image related prototypes from xfns.c section
	to image.c.  Condition them by HAVE_WINDOW_SYSTEM rather than
	HAVE_X_WINDOWS.
Stefan Monnier's avatar
Stefan Monnier committed
885

Kim F. Storm's avatar
Typo  
Kim F. Storm committed
886
	* Makefile.in (XOBJ): Consolidate into one list.  Add image.o.
Stefan Monnier's avatar
Stefan Monnier committed
887
	Move gtkutil.o to new GTK_OBJ list.
888 889 890 891
	(XMENU_OBJ) [HAVE_MENUS]: Move declaration to proper place.
	(GTK_OBJ) [USE_GTK]: New declaration.
	(obj): Add $(GTK_OBJ) to list.

892
2004-03-11  Steven Tamm <steventamm@mac.com>
Eli Zaretskii's avatar
Eli Zaretskii committed
893

894 895 896 897 898
	* image.c [MAC_OSX]: Include sys/stat.h

	* macfns.c (syms_of_macfns): Remove definitions of things now
	defined in image.c

Kim F. Storm's avatar
Kim F. Storm committed
899 900 901 902 903 904 905 906 907 908 909
2004-03-11  Kim F. Storm  <storm@cua.dk>

	The following changes consolidates the identical/similar image
	support code previously found in xfns.c, w32fns.c, and macfns.c
	into a new file image.c.

	* makefile.w32-in (OBJ1): Add image.o.
	($(BLD)/image.$(O)): Add dependencies.

	* Makefile.in (XOBJ, MAC_OBJ): Add image.o.
	(image.o): Add dependencies.
Stefan Monnier's avatar
Stefan Monnier committed
910

Kim F. Storm's avatar
Kim F. Storm committed
911 912 913 914 915 916 917 918 919 920 921 922 923
	* image.c: New file with consolidated image support code.
	(COLOR_TABLE_SUPPORT): New define to control whether
	color table support is available (X only).
	(Bitmap_Record): Common name for x_bitmap_record,
	w32_bitmap_record, and mac_bitmap_record.
	(XImagePtr): Common name for pointer to XImage or equivalent.
	(XImagePtr_or_DC): New type to simplify code sharing; equivalent
	to XImagePtr on X+MAC, and to HDC on W32.
	(GET_PIXEL): Wrapper for XGetPixel or equivalent.
	(NO_PIXMAP): Common name for "None" or equivalent.
	(PNG_BG_COLOR_SHIFT): Bits to shift PNG background colors.
	(RGB_PIXEL_COLOR): Common type for an integer "pixel color" value.
	(PIX_MASK_RETAIN, PIX_MASK_DRAW): Portability macros (from macfns.c).
Stefan Monnier's avatar
Stefan Monnier committed
924 925
	(FRAME_X_VISUAL, x_defined_color, DefaultDepthOfScreen):
	Define with suitable equivalents on W32 and MAC for code sharing.
Kim F. Storm's avatar
Kim F. Storm committed
926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959
	(XDrawLine): Define on MAC for code sharing.
	(Destroy_Image, Free_Pixmap): Wrappers for code sharing.
	(IF_LIB_AVAILABLE): Macro to simplify code sharing.
	(Vx_bitmap_file_path, Vimage_cache_eviction_delay)
	(x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
	(x_reference_bitmap, x_create_bitmap_from_data)
	(x_create_bitmap_from_file, x_destroy_bitmap)
	(x_destroy_all_bitmaps, x_create_bitmap_mask)
	(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
	(QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
	(QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
	(Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
	(define_image_type, lookup_image_type, valid_image_p)
	(image_error, enum image_value_type, struct image_keyword)
	(parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
	(make_image, free_image, prepare_image_for_display, image_ascent)
	(four_corners_best, image_background, image_background_transparent)
	(x_clear_image_1,  x_clear_image, x_alloc_image_color)
	(make_image_cache, free_image_cache, clear_image_cache)
	(Fclear_image_cache, postprocess_image, lookup_image, cache_image)
	(forall_images_in_image_cache, x_create_x_image_and_pixmap)
	(x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
	(find_image_fsspec, image_load_qt_1, image_load_quicktime)
	(init_image_func_pointer, image_load_quartz2d)
	(struct ct_color, init_color_table, free_color_table)
	(lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
	(cross_disabled_images, x_to_xcolors, x_from_xcolors)
	(x_detect_edges, x_emboss, x_laplace, x_edge_detection)
	(x_disable_image, x_build_heuristic_mask)
	(XBM support, XPM support, PBM support, PNG support, JPEG support)
	(TIFF support, GIF support, Ghostscript support): Consolidate image
	code from xfns.c, w32fns.c, and macfns.c.
	(syms_of_image): Consolidate image related symbol setup here.
	(init_image): Consolidate image related initializations here.
Stefan Monnier's avatar
Stefan Monnier committed
960

Kim F. Storm's avatar
Kim F. Storm committed
961 962 963
	* emacs.c (main) [HAVE_WINDOW_SYSTEM]: Add calls to syms_of_image
	and init_image.  Remove call to init_xfns.

Stefan Monnier's avatar
Stefan Monnier committed
964 965
	* macterm.h (struct mac_bitmap_record): Add file member.
	Not currently used, but simplifies code sharing.
Kim F. Storm's avatar
Kim F. Storm committed
966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072

	* macfns.c (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
	(x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
	(x_reference_bitmap, x_create_bitmap_from_data)
	(x_create_bitmap_from_file, x_destroy_bitmap)
	(x_destroy_all_bitmaps, x_create_bitmap_mask)
	(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
	(QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
	(QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
	(Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
	(define_image_type, lookup_image_type, valid_image_p)
	(image_error, enum image_value_type, struct image_keyword)
	(parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
	(make_image, free_image, prepare_image_for_display, image_ascent)
	(four_corners_best, image_background, image_background_transparent)
	(x_clear_image_1,  x_clear_image, x_alloc_image_color)
	(make_image_cache, free_image_cache, clear_image_cache)
	(Fclear_image_cache, postprocess_image, lookup_image, cache_image)
	(forall_images_in_image_cache, x_create_x_image_and_pixmap)
	(x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
	(find_image_fsspec, image_load_qt_1, image_load_quicktime)
	(init_image_func_pointer, image_load_quartz2d)
	(struct ct_color, init_color_table, free_color_table)
	(lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
	(cross_disabled_images, x_to_xcolors, x_from_xcolors)
	(x_detect_edges, x_emboss, x_laplace, x_edge_detection)
	(x_disable_image, x_build_heuristic_mask)
	(XBM support, XPM support, PBM support, PNG support, JPEG support)
	(TIFF support, GIF support, Ghostscript support): Merge with image
	code from xfns.c and macfns.c into image.c.
	(syms_of_xfns): Move image related symbols to image.c.
	(init_external_image_libraries, init_xfns): Remove; initialization
	moved to init_image in image.c.

	* w32fns.c (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
	(x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
	(x_reference_bitmap, x_create_bitmap_from_data)
	(x_create_bitmap_from_file, x_destroy_bitmap)
	(x_destroy_all_bitmaps, x_create_bitmap_mask)
	(QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
	(QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
	(Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
	(define_image_type, lookup_image_type, valid_image_p)
	(image_error, enum image_value_type, struct image_keyword)
	(parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
	(make_image, free_image, prepare_image_for_display, image_ascent)
	(four_corners_best, image_background, image_background_transparent)
	(x_clear_image_1,  x_clear_image, x_alloc_image_color)
	(make_image_cache, free_image_cache, clear_image_cache)
	(Fclear_image_cache, postprocess_image, lookup_image, cache_image)
	(forall_images_in_image_cache, x_create_x_image_and_pixmap)
	(x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
	(struct ct_color, init_color_table, free_color_table)
	(lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
	(cross_disabled_images, x_to_xcolors, x_from_xcolors)
	(x_detect_edges, x_emboss, x_laplace, x_edge_detection)
	(x_disable_image, x_build_heuristic_mask)
	(XBM support, XPM support, PBM support, PNG support, JPEG support)
	(TIFF support, GIF support, Ghostscript support): Merge with image
	code from xfns.c and macfns.c into image.c.
	(syms_of_xfns): Move image related symbols to image.c.
	(init_external_image_libraries, init_xfns): Remove; initialization
	moved to init_image in image.c.

	* xfns.c (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
	(x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
	(x_reference_bitmap, x_create_bitmap_from_data)
	(x_create_bitmap_from_file, x_destroy_bitmap)
	(x_destroy_all_bitmaps, x_create_bitmap_mask)
	(QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
	(QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
	(Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
	(define_image_type, lookup_image_type, valid_image_p)
	(image_error, enum image_value_type, struct image_keyword)
	(parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
	(make_image, free_image, prepare_image_for_display, image_ascent)
	(four_corners_best, image_background, image_background_transparent)
	(x_clear_image_1,  x_clear_image, x_alloc_image_color)
	(make_image_cache, free_image_cache, clear_image_cache)
	(Fclear_image_cache, postprocess_image, lookup_image, cache_image)
	(forall_images_in_image_cache, x_create_x_image_and_pixmap)
	(x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
	(struct ct_color, init_color_table, free_color_table)
	(lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
	(cross_disabled_images, x_to_xcolors, x_from_xcolors)
	(x_detect_edges, x_emboss, x_laplace, x_edge_detection)
	(x_disable_image, x_build_heuristic_mask)
	(XBM support, XPM support, PBM support, PNG support, JPEG support)
	(TIFF support, GIF support, Ghostscript support): Merge with
	w32fns.c and macfns.c image code into image.c.
	(syms_of_xfns): Move image related symbols to image.c.
	(init_xfns): Remove; initialization moved to init_image in image.c.

	* lisp.h (syms_of_image, init_image): Add protoypes.
	(init_xfns): Remove prototype.

	* dispextern.h (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
	(x_reference_bitmap, x_create_bitmap_from_data)
	(x_create_bitmap_from_file, x_destroy_bitmap)
	(x_create_bitmap_mask): Move prototypes from dispextern.h.
	(gamma_correct) [MAC_OS]: Add prototype.

	* xterm.h (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
	(x_reference_bitmap, x_create_bitmap_from_data)
	(x_create_bitmap_from_file, x_destroy_bitmap)
	(x_create_bitmap_mask): Move prototypes to dispextern.h.

1073 1074 1075 1076 1077
2004-03-09  Kenichi Handa  <handa@etlken2>

	* coding.c (decode_coding_emacs_mule): Handle insufficent source
	correctly.

1078 1079
2004-03-04  Richard M. Stallman  <rms@gnu.org>

1080 1081
	* s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS): New definition.

1082 1083 1084 1085
	* window.c (Fdisplay_buffer): Doc fix.

	* buffer.c (Fpop_to_buffer): Doc fix.

Kim F. Storm's avatar
Kim F. Storm committed
1086 1087 1088 1089
2004-03-03  Kim F. Storm  <storm@cua.dk>

	* xdisp.c (display_line): Fix call to get_overlay_arrow_glyph_row.

Stefan Monnier's avatar
Stefan Monnier committed
1090 1091 1092 1093
2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>

	* editfns.c (Ftranslate_region): Lisp_Object/int mixup.

1094 1095 1096 1097
2004-03-02  Richard M. Stallman  <rms@gnu.org>

	* indent.c (compute_motion): Save vpos in prev_vpos, like hpos etc.

1098 1099 1100 1101
2004-03-02  Kenichi Handa  <handa@m17n.org>

	* doc.c (Fsubstitute_command_keys): Fix counding bytes.

Kim F. Storm's avatar
Kim F. Storm committed
1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125
2004-03-02  Kim F. Storm  <storm@cua.dk>

	* window.h (struct window): New member overlay_arrow_bitmap.

	* window.c (make_window): Initialize overlay_arrow_bitmap.

	* xdisp.c (Voverlay_arrow_variable_list): New variable to properly
	implement and integrate multiple overlay arrows with redisplay.
	(syms_of_xdisp): DEFVAR_LISP and initialize it.
	(last_arrow_position, last_arrow_string): Replace by properties.
	(Qlast_arrow_position, Qlast_arrow_string)
	(Qoverlay_arrow_string, Qoverlay_arrow_bitmap): New variables.
	(syms_of_xdisp): Intern and staticpro them.
	(overlay_arrow_string_or_property, update_overlay_arrows)
	(overlay_arrow_in_current_buffer_p, overlay_arrows_changed_p)
	(overlay_arrow_at_row): New functions for multiple overlay arrows.
	(redisplay_internal): Use them instead of directly accessing
	Voverlay_arrow_position etc. for multiple overlay arrows.
	(mark_window_display_accurate): Use update_overlay_arrows.
	(try_cursor_movement): Use overlay_arrow_in_current_buffer_p.
	(try_window_id): Use overlay_arrows_changed_p.
	(get_overlay_arrow_glyph_row): Add overlay_arrow_string arg.
	(display_line): Use overlay_arrow_at_row to check multiple
	overlay arrows, and get relevant overlay-arrow-string and
Stefan Monnier's avatar
Stefan Monnier committed
1126
	overlay-arrow-bitmap.  Set w->overlay_arrow_bitmap accordingly.
Kim F. Storm's avatar
Kim F. Storm committed
1127 1128 1129 1130 1131 1132
	(produce_image_glyph): Set pixel_width = 0 for fringe bitmap.
	(syms_of_xdisp): Remove last_arrow_position and last_arrow_string.

	* fringe.c (draw_fringe_bitmap): Use w->overlay_arrow_bitmap if set.
	(update_window_fringes): Remove unused code.

1133 1134 1135 1136
2004-03-01  Jason Rumney  <jasonr@gnu.org>

	* w32term.c (w32_read_socket): Fix last change to ButtonPress handling.

Juanma Barranquero's avatar
Juanma Barranquero committed
1137 1138 1139 1140 1141 1142
2004-03-01  Juanma Barranquero  <lektu@terra.es>

	* fringe.c (Fdefine_fringe_bitmap): Fix typo in docstring.

	* makefile.w32-in ($(BLD)/fringe.$(O)): Add dependencies.

1143 1144 1145 1146 1147
2004-03-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

	* xfns.c (Fx_display_color_cells): Use number of planes to calculate
	how many colors can be displayed.

Kenichi Handa's avatar
Kenichi Handa committed
1148 1149 1150 1151 1152
2004-03-01  Kenichi Handa  <handa@m17n.org>

	* editfns.c (Ftranslate_region): Handle multibyte chars in TABLE
	correctly.

Kim F. Storm's avatar
Kim F. Storm committed
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163
2004-02-28  Kim F. Storm  <storm@cua.dk>

	* dispnew.c (update_window): Update header line also if there are
	no other changes in window (move code after set_cursor label).

	* lisp.h (mark_window_display_accurate): Remove prototype.

	* window.c (window_loop, Fforce_window_update): Force mode line
	updates by setting prevent_redisplay_optimizations_p and
	update_mode_lines.

1164 1165
2004-02-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

Stefan Monnier's avatar
Stefan Monnier committed
1166
	* xfns.c (x_window): Fix indentation.
1167 1168 1169

	* xterm.c (x_calc_absolute_position): Call x_real_positions
	to get WM window sizes and use those to calculate position.
Stefan Monnier's avatar
Stefan Monnier committed
1170
	(x_set_offset): Remove code commented out.
1171

1172 1173 1174 1175
2004-02-28  Miles Bader  <miles@gnu.org>

	* keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert.

Kim F. Storm's avatar
Kim F. Storm committed
1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193
2004-02-28  Kim F. Storm  <storm@cua.dk>

	* keyboard.c (kbd_buffer_store_event_hold): New function to store
	an event into kbd fifo, but with special handling of quit event;
	a quit event is saved for later, and further events are discarded
	until the saved quit event has been processed.
	(kbd_buffer_store_event): Use kbd_buffer_store_event_hold.
	(gen_help_event): Store help event in kbd fifo.
	(NREAD_INPUT_EVENTS): Remove.
	(read_avail_input): Adapt to new read_socket_hook interface.
	Remove allocation and initialization of local input_event buffer,
	as read_socket_hook stores events directly in fifo.  Allocate and
	initialize local hold_quit event to handle postponed quit event
	(and store it if set by kbd_buffer_store_event_hold).

	* keyboard.h (kbd_buffer_store_event_hold): Add prototype.
	(gen_help_event): Fix prototype.

Juanma Barranquero's avatar
Juanma Barranquero committed
1194
	* macterm.c (XTread_socket): Remove bufp_r and
Kim F. Storm's avatar
Kim F. Storm committed
1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205
	numcharsp args.  Add hold_quit arg.
	Rework to use just one, local, inev input_event. Store inev
	directly in fifo using kbd_buffer_store_event_hold.

	* sysdep.c (BUFFER_SIZE_FACTOR): Remove.
	(read_input_waiting): Adapt to new read_socket_hook interface.
	Remove allocation and initialization of local input_event buffer,
	as read_socket_hook stores events directly in fifo.  Allocate and
	initialize local hold_quit event to handle postponed quit event
	(and store it if set by kbd_buffer_store_event_hold).

Juanma Barranquero's avatar
Juanma Barranquero committed
1206
	* term.c (read_socket_hook): Fix arg list.
Kim F. Storm's avatar
Kim F. Storm committed
1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227

	* termhooks.h (read_socket_hook): Fix prototype.

	* w32inevt.c (w32_console_read_socket): Remove bufp_r and
	numcharsp args.  Add hold_quit arg.
	Rework to use just one, local, inev input_event. Store inev
	directly in fifo using kbd_buffer_store_event_hold.

	* w32inevt.h (w32_console_mouse_position): Fix prototype.

	* w32term.c (w32_read_socket): Remove bufp_r and numcharsp args.
	Add hold_quit arg. Rework to use just one, local, inev
	input_event. Store inev directly in fifo using
	kbd_buffer_store_event_hold.  Update count in one place.
	Postpone call to gen_help_event until inev is stored; use new
	local do_help for this.
	Remove local emacs_event in handing of ButtonPress event; just use
	inev instead (so no reason to copy it later).

	* xsmfns.c (x_session_check_input): Remove numchars arg.

Stefan Monnier's avatar
Stefan Monnier committed
1228 1229 1230
	* xterm.c (x_focus_changed, x_detect_focus_change):
	Remove numchars arg.  Always store event into bufp arg.
	Return nothing.  Callers changed accordingly.
Kim F. Storm's avatar
Kim F. Storm committed
1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259
	(glyph_rect): Simplify.
	(STORE_KEYSYM_FOR_DEBUG): New macro.
	(SET_SAVED_MENU_EVENT): Use inev instead of bufp, etc.
	(current_bufp, current_numcharsp) [USE_GTK]: Remove.
	(current_hold_quit) [USE_GTK]: Add.
	(event_handler_gdk): Adapt to new handle_one_xevent.
	(handle_one_xevent): Remove bufp_r and numcharsp args.
	Add hold_quit arg. Rework to use just one, local, inev
	input_event. Store inev directly in fifo using
	kbd_buffer_store_event_hold.  Update count in one place.
	Postpone call to gen_help_event until inev is stored; use new
	local do_help for this.
	Simplify handling of keysyms (consolidate common code).  Fix bug
	where count was updated with nchars instead of nbytes.
	Remove local emacs_event in handing of ButtonPress event; just use
	inev instead (so no reason to copy it later).
	Remove `out' label.  Rename label `ret' to `done'; add various
	`goto done' to clarify code flow in deeply nested blocks.
	(x_dispatch_event): Simplify as handle_one_xevent now calls
	kbd_buffer_store_event itself.
	(XTread_socket): Remove bufp_r and numcharsp args. Add hold_quit
	arg.  Call handle_one_xevent with new arglist.  Store event from
	x_session_check_input in fifo.
	[USE_GTK]: Setup current_hold_quit.
	Decrement handling_signal before unblocking input.
	(x_initialize) [USE_GTK]: Initialize current_count.

	* xterm.h (x_session_check_input): Fix prototype.

1260
2004-02-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
Juanma Barranquero's avatar
Juanma Barranquero committed
1261

Stefan Monnier's avatar
Stefan Monnier committed
1262
	* s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add `-framework QuickTime'.
Juanma Barranquero's avatar
Juanma Barranquero committed
1263

1264 1265
	* dispextern.h [MAC_OSX]: Do not include Carbon/Carbon.h (now in
	macgui.h).
Juanma Barranquero's avatar
Juanma Barranquero committed
1266

1267
	* emacs.c (main) [HAVE_CARBON]: Call init_xfns.
Juanma Barranquero's avatar
Juanma Barranquero committed
1268

1269 1270 1271 1272 1273 1274 1275 1276
	* macgui.h [MAC_OSX]: Include Carbon/Carbon.h.
	(mktime, DEBUG, Z, free, malloc, realloc, max, min)
	(init_process) [MAC_OSX] : Avoid conflicts with Carbon/Carbon.h.
	[!MAC_OSX]: Include QDOffscreen.h and Controls.h.
	(INFINITY) [MAC_OSX]: Avoid conflict with definition in math.h.
	(Bitmap): Remove typedef.
	(Pixmap): Change int to GWorldPtr.

Stefan Monnier's avatar
Stefan Monnier committed
1277
	* macmenu.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
Juanma Barranquero's avatar
Juanma Barranquero committed
1278

Stefan Monnier's avatar
Stefan Monnier committed
1279 1280 1281
	* macterm.h [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
	(RED16_FROM_ULONG, GREEN16_FROM_ULONG, BLUE16_FROM_ULONG):
	New #define to extract 16-bit depth color components from unsigned
1282 1283 1284 1285
	long representation.
	(PIX_MASK_DRAW, PIX_MASK_RETAIN): New #define to represent pixel
	colors used for masks.
	(struct mac_display_info): Add color_p.  Remove n_cbits.
Juanma Barranquero's avatar
Juanma Barranquero committed
1286

1287 1288 1289 1290 1291 1292 1293 1294 1295 1296
	* macfns.c: Include sys/types.h and sys/stat.h.
	[MAC_OSX]: Do not include Carbon/Carbon.h (now in macgui.h).
	Include QuickTime/QuickTime.h.
	(XCreatePixmap, XCreatePixmapFromBitmapData, XFreePixmap)
	(XSetForeground, mac_draw_line_to_pixmap): Add externs for
	functions defined in macterm.c.
	(XImagePtr): New typedef.  Corresponds to XImage * in xfns.c.
	(ZPixmap): New #define for compatibility with xfns.c.
	(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
	(x_create_x_image_and_pixmap, x_destroy_x_image, x_put_x_image)
Stefan Monnier's avatar
Stefan Monnier committed
1297 1298
	(find_image_fsspec, image_load_qt_1, image_load_quicktime):
	New functions.
1299
	(four_corners_best, x_create_x_image_and_pixmap)
Stefan Monnier's avatar
Stefan Monnier committed
1300 1301
	(x_destroy_x_image, unwind_create_frame, x_disable_image)
	(x_edge_detection, init_color_table, colors_in_color_table)
1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319
	(lookup_rgb_color, lookup_pixel_color, postprocess_image)
	(x_put_x_image, slurp_file, xbm_scan, xbm_load, xbm_load_image)
	(xbm_image_p, xbm_read_bitmap_data, xbm_file_p, x_to_xcolors)
	(x_from_xcolors, x_detect_edges): New declarations (from xfns.c).
	(mac_color_map_lookup, x_to_mac_color): Fix Lisp_Object/unsigned
	long mixup.
	(mac_defined_color, x_to_x_colors): Use RED16_FROM_ULONG etc.
	(x_decode_color): Don't use n_cbits (in struct mac_display_info).
	(x_set_foreground_color, x_set_cursor_color): Sync with w32fns.c.
	(x_set_cursor_type, Fxw_color_values, valid_image_p)
	(image_value_type, parse_image_spec, image_ascent, x_clear_image)
	(x_alloc_image_color, clear_image_cache, lookup_image)
	(x_find_image_file, xbm_read_bitmap_file_data)
	(enum xbm_keyword_index, xbm_format, xbm_image_p, xbm_scan)
	(xbm_read_bitmap_data, xbm_load, pbm_image_p, pbm_scan_number)
	(enum pbm_keyword_index, pbm_format, enum png_keyword_index)
	(png_format, png_image_p, enum jpeg_keyword_index, jpeg_format)
	(jpeg_image_p, enum tiff_keyword_index, tiff_format, tiff_image_p)
Stefan Monnier's avatar
Stefan Monnier committed
1320
	(enum gif_keyword_index, gif_format, gif_image_p): Sync with xfns.c.
1321 1322 1323 1324
	(x_make_gc): Sync with xfns.c.  Enclose unused `border_tile' with
	#if 0.
	(x_free_gcs): Sync with xfns.c.  Enclose unused `border_tile' with
	#if 0.  Free white_relief.gc and black_relief.gc.
Stefan Monnier's avatar
Stefan Monnier committed
1325 1326
	(unwind_create_frame, x_emboss, x_laplace, x_edge_detection):
	New functions (from xfns.c).
1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337
	(Fx_create_frame): Record unwind_create_frame.
	(Fxw_display_color_p): Use dpyinfo->color_p.
	(Fx_display_grayscale_p, Fx_display_planes): Don't use
	dpyinfo->n_cbits.
	(Fx_display_color_cells): Use dpyinfo->n_planes;
	(QCmatrix, QCcolor_adjustment, QCmask, Qemboss, Qedge_detection)
	(Qheuristic, cross_disabled_images, emboss_matrix)
	(laplace_matrix): New variables (from xfns.c).
	(Fimage_size, Fimage_mask_p, four_corners_best, image_background)
	(x_clear_image_1, postprocess_image, slurp_file, xbm_load_image)
	(xbm_file_p, x_to_xcolors, x_from_xcolors, x_detect_edges)
Stefan Monnier's avatar
Stefan Monnier committed
1338 1339
	(image_background_transparent): New function (from xfns.c).
	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
1340 1341 1342 1343
	(image_load_quicktime): Add declaration.
	[MAC_OSX] (image_load_quartz2d): Likewise.
	[MAC_OSX] (CGImageCreateWithPNGDataProviderProcType): New typedef.
	[MAC_OSX] (MyCGImageCreateWithPNGDataProvider): New variable.
Stefan Monnier's avatar
Stefan Monnier committed
1344
	[MAC_OSX] (init_image_func_pointer, image_load_quartz2d): New funs.
1345 1346 1347 1348 1349 1350 1351 1352
	(xbm_load_image_from_file, x_laplace_read_row)
	(x_laplace_write_row, pbm_read_file): Remove functions.
	[HAVE_XPM] (enum xpm_keyword_index, xpm_format, xpm_image_p)
	(xpm_load): Sync with xfns.c (although XPM is not supported yet).
	(colors_in_color_table): Sync with xfns.c (although not used).
	(lookup_rgb_color): Don't lookup color table.  Just do gamma
	correction.
	(COLOR_INTENSITY): New #define (from xfns.c).
Stefan Monnier's avatar
Stefan Monnier committed
1353 1354 1355 1356
	(x_disable_image): New function (from xfns.c).
	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
	(x_build_heuristic_mask): Sync with xfns.c.
	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
1357 1358 1359
	(HAVE_PBM): Remove #ifdef.
	(pbm_load): Sync with xfns.c.  Set img->width and img->height
	before IMAGE_BACKGROUND.
Stefan Monnier's avatar
Stefan Monnier committed
1360
	(png_image_p, png_load): Don't enclose declarations with #if HAVE_PNG.
1361 1362 1363
	(Qpng, enum png_keyword_index, png_format, png_type, png_image_p):
	Don't enclose with #if HAVE_PNG.
	[!HAVE_PNG] (png_load) [MAC_OSX]: Use image_load_quartz2d if a
Stefan Monnier's avatar
Stefan Monnier committed
1364 1365
	symbol _CGImageCreateWithPNGDataProvider is defined.
	Otherwise use image_load_quicktime.
1366
	[!HAVE_PNG] (png_load) [!MAC_OSX]: Use image_load_quicktime.
Stefan Monnier's avatar
Stefan Monnier committed
1367 1368
	[HAVE_PNG] (png_load): Sync with xfns.c.
	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380
	(jpeg_image_p, jpeg_load): Don't enclose declarations with #if
	HAVE_JPEG.
	(Qjpeg, enum jpeg_keyword_index, jpeg_format, jpeg_type)
	(jpeg_image_p): Don't enclose with #if HAVE_JPEG.
	[!HAVE_JPEG] (jpeg_load) [MAC_OSX]: Use image_load_quartz2d.
	[!HAVE_JPEG] (jpeg_load) [!MAC_OSX]: Use image_load_quicktime.
	[HAVE_JPEG] (jpeg_load): Sync with xfns.c.
	(tiff_image_p, tiff_load): Don't enclose declarations with #if
	HAVE_TIFF.
	(Qtiff, enum tiff_keyword_index, tiff_format, tiff_type)
	(tiff_image_p): Don't enclose with #if HAVE_TIFF.
	[!HAVE_TIFF] (tiff_load): Use image_load_quicktime.
Stefan Monnier's avatar
Stefan Monnier committed
1381 1382
	[HAVE_TIFF] (tiff_error_handler, tiff_warning_handler):
	New functions (from xfns.c).
1383
	[HAVE_TIFF] (tiff_load): Sync with xfns.c.
Stefan Monnier's avatar
Stefan Monnier committed
1384
	(gif_image_p, gif_load): Don't enclose declarations with #if HAVE_GIF.
1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400
	(Qgif, enum gif_keyword_index, gif_format, gif_type, gif_image_p):
	Don't enclose with #if HAVE_GIF.
	[!HAVE_GIF] (gif_load): Use Quicktime Movie Toolbox if it is
	animated gif.  Otherwise use image_load_quicktime.
	[HAVE_GIF] (gif_lib.h): Temporarily define DrawText as
	gif_DrawText to avoid conflict with QuickdrawText.h.
	[HAVE_GIF] (gif_load): Sync with xfns.c.
	(enum gs_keyword_index, gs_format, gs_image_p, gs_load)
	[HAVE_GHOSTSCRIPT] (x_kill_gs_process): Sync with xfns.c (although
	Ghostscript is not supported yet).
	(syms_of_macfns): Initialize Qemboss, Qedge_detection, Qheuristic,
	QCmatrix, QCcolor_adjustment, and QCmask.  Add DEFVAR_BOOL
	cross_disabled_images (from xfns.c).  Remove #if 0 for supported
	image types.  Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
	HAVE_PNG.  Add defsubr for Simage_size and Simage_mask_p.
	(init_xfns): Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
Stefan Monnier's avatar
Stefan Monnier committed
1401 1402
	HAVE_PNG.  Call EnterMovies to support animated gifs.
	Call init_image_func_pointer to bind a symbol
1403
	_CGImageCreateWithPNGDataProvider if it is defined.
Juanma Barranquero's avatar
Juanma Barranquero committed
1404

Stefan Monnier's avatar
Stefan Monnier committed
1405
	* macterm.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
1406 1407 1408 1409 1410 1411 1412
	(x_draw_bar_cursor): Sync declaration with xterm.c.
	(XFreePixmap, mac_draw_rectangle_to_pixmap, mac_copy_area)
	(mac_copy_area_to_pixmap): Implementation with GWorld (offscreen
	graphics).
	(mac_set_forecolor, mac_set_backcolor): Use RED16_FROM_ULONG etc.
	(mac_draw_line_to_pixmap, XCreatePixmap)
	(XCreatePixmapFromBitmapData, mac_fill_rectangle_to_pixmap)
Stefan Monnier's avatar
Stefan Monnier committed
1413 1414 1415 1416 1417
	(mac_copy_area_with_mask, mac_copy_area_with_mask_to_pixmap):
	New functions.
	(mac_draw_bitmap) [TARGET_API_MAC_CARBON]:
	Use GetPortBitMapForCopyBits instead of the cast to Bitmap *.
	Cast bits to char *.
1418 1419 1420
	(reflect_byte): New function (from w32fns.c).
	(mac_create_bitmap_from_bitmap_data): Use it and don't stuff bits
	due to byte alignment.
Stefan Monnier's avatar
Stefan Monnier committed
1421 1422
	(mac_scroll_area) [TARGET_API_MAC_CARBON]:
	Use GetPortBitMapForCopyBits instead of the cast to Bitmap *.
1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439
	(XSetForeground): Remove static (now used in macfns.c).
	(HIGHLIGHT_COLOR_DARK_BOOST_LIMIT): New #define (from w32term.c).
	(mac_alloc_lighter_color, x_destroy_window): Sync with w32term.c.
	(x_setup_relief_color, x_setup_relief_colors, x_draw_box_rect)
	(x_draw_glyph_string_box, x_draw_image_foreground)
	(x_draw_image_foreground_1, x_draw_image_glyph_string)
	(x_draw_stretch_glyph_string, x_draw_glyph_string)
	(x_draw_hollow_cursor, x_draw_bar_cursor, mac_draw_window_cursor):
	Sync with xterm.c.
	(x_draw_relief_rect): Sync with xterm.c.  Make 1 pixel shorter
	than the xterm.c version when a strictly horizontal or vertical
	line is drawn.
	(XTset_terminal_window): Add static.
	(x_make_frame_visible): Add UNBLOCK_INPUT.
	(x_free_frame_resources): New funcion (from xterm.c).
	(XTread_socket): Call handle_tool_bar_click if mouse up/down event
	occurs in tool bar area.
Stefan Monnier's avatar
Stefan Monnier committed
1440 1441
	(mac_initialize_display_info): Remove dpyinfo->n_cbits.
	Set dpyinfo->color_p.  Determine dpyinfo->n_planes using HasDepth.
1442 1443 1444 1445 1446
	Initialize image cache.
	(stricmp, wildstrieq, mac_font_pattern_match, mac_font_match):
	Enclose unused functions with #if 0.
	(Qbig5, Qcn_gb, Qsjis, Qeuc_kr): New variables.
	(decode_mac_font_name): New function to apply code conversions
Stefan Monnier's avatar
Stefan Monnier committed
1447
	from a mac font name to an XLFD font name according to its script code.
1448
	(x_font_name_to_mac_font_name): Apply code conversion from an XLFD
Stefan Monnier's avatar
Stefan Monnier committed
1449
	font name to a mac font name according to REGISTRY and ENCODING fields.
1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461
	(init_font_name_table) [TARGET_API_MAC_CARBON]: Don't use a font
	whose name starts with `.'.
	(init_font_name_table): Use decode_mac_font_name.  Add both
	jisx0208.1983-sjis and jisx0201.1976-0 entries if the script code
	of a font is smJapanese.
	(mac_do_list_fonts): New function to list fonts that match a given
	pattern.
	(x_list_fonts, XLoadQueryFont): Use it.
	(XLoadQueryFont): Set rbearing field for each variable width
	character to avoid needless redraw.
	(syms_of_macterm): Initialize Qbig5, Qcn_gb, Qsjis, and Qeuc_kr.

Kim F. Storm's avatar
Kim F. Storm committed
1462