*** empty log message ***

3 files changed, 103 insertions, 114 deletions

diff --git a/ChangeLog b/ChangeLog
index e29f94f6963..3a286305035 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
+2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* Makefile.in (maintainer-clean): Clean in the lisp dir as well.
+	(bootstrap): Use the new boostrap-prepare target in lisp.
+
 2004-02-18  Kim F. Storm  <storm@cua.dk>
 
-	* INSTALL.CVS: Add info about ssh/cvs related problems and
-	work-around.
+	* INSTALL.CVS: Add info about ssh/cvs related problems and work-around.
 
 2004-02-16  Eli Zaretskii  <eliz@elta.co.il>
 
-	* make-dist: Don't link index.*perm and permute-index into
-	tempdir.
+	* make-dist: Don't link index.*perm and permute-index into tempdir.
 
 2004-02-14  Jonathan Yavner  <jyavner@member.fsf.org>
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 13c64e0d929..97ce6765792 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -29,8 +29,7 @@
 	(desktop-clear-preserve-buffers): Remove redundant info in
 	docstring already shown by the obsolescence message.
 	(desktop-truncate, desktop-internal-v2s)
-	(desktop-value-to-string): Change argument name to match
-	docstring.
+	(desktop-value-to-string): Change argument name to match docstring.
 
 	* emulation/tpu-edt.el (tpu-set-mark): Fix typo in docstring.
 
@@ -49,16 +48,14 @@
 	Version 2.0.39 of Tramp released.
 
 	* net/tramp.el (tramp-handle-file-local-copy)
-	(tramp-handle-write-region, tramp-open-connection-rsh): Variable
-	name typo.  Small change.  From Patrick Tullmann
+	(tramp-handle-write-region, tramp-open-connection-rsh):
+	Variable name typo.  Small change.  From Patrick Tullmann
 	<tullmann@flux.utah.edu>.
 	(tramp-process-connection-type): New variable.
 	(tramp-maybe-open-connection): Use it.
-	(tramp-do-copy-or-rename-via-buffer): Handle KEEP-DATE arg, if
-	possible.
+	(tramp-do-copy-or-rename-via-buffer): Handle KEEP-DATE arg if possible.
 	(tramp-touch): Set last-modified time of a remote file.
-	(tramp-handle-write-region): Say which function is used when
-	encoding.
+	(tramp-handle-write-region): Say which function is used when encoding.
 
 2004-02-29  Michael Albinus  <Michael.Albinus@alcatel.de>
 
@@ -74,7 +71,7 @@
 	output.  If it was received chunkwise, there have been problems.
 	Remove the "prompt not found" error message; it is obvious.
 	Simplify algorithm.
-	(tramp-smb-process-running): Removed.  Since we acknowledge the
+	(tramp-smb-process-running): Remove.  Since we acknowledge the
 	virtual prompt for shares, there's no need for distinction of
 	reading shares (process ends afterwards) and interactive mode of
 	smblient.
@@ -84,23 +81,21 @@
 	(tramp-smb-maybe-open-connection): Set `process-connection-type'
 	to 'pty.  Suggested by Piet van Oostrum <piet@cs.uu.nl>.
 	(top-level): Setting default value in `tramp-default-method-alist'
-	corrected.  Order of USER and HOST have been wrong.  Nobody
-	claimed for months ...
-	(tramp-smb-maybe-open-connection): Use
-	`tramp-process-connection-type'.
-	(tramp-smb-open-connection): Clear password cache if login has
-	failed.
-
-	* net/tramp.el (tramp-completion-mode) Don't check for 'xemacs but
+	corrected.  Order of USER and HOST have been wrong.
+	Nobody complaimed for months ...
+	(tramp-smb-maybe-open-connection): Use `tramp-process-connection-type'.
+	(tramp-smb-open-connection): Clear password cache if login has failed.
+
+	* net/tramp.el (tramp-completion-mode) Don't check for 'xemacs' but
 	`tramp-unified-filenames'.
 	(tramp-completion-mode): Make test for XEmacs explicitely.
-	`event-to-character' can exists in Emacs packages too.  Reported
-	by Matt Swift <swift@alum.mit.edu>.
+	`event-to-character' can exists in Emacs packages too.
+	Reported by Matt Swift <swift@alum.mit.edu>.
 	(tramp-buffer-name): Buffer name must contain the user if exists.
 	Reported by Adrian Phillips <a.phillips@met.no>.
-	(tramp-do-copy-or-rename-file): Handle out-of-band methods.  Call
-	`tramp-do-copy-or-rename-file-out-of-band' this case.
-	(tramp-do-copy-or-rename-file-out-of-band): Renamed from
+	(tramp-do-copy-or-rename-file): Handle out-of-band methods.
+	Call `tramp-do-copy-or-rename-file-out-of-band' this case.
+	(tramp-do-copy-or-rename-file-out-of-band): Rename from
 	`tramp-do-copy-or-rename-file-one-local', because it handles also
 	the case both files use the same out-of-band method.
 	Implementation added.
@@ -116,16 +111,16 @@
 	(tramp-completion-function-alist): It's a defvar now, because we
 	want to apply the optimized `tramp-set-completion-function'
 	instead of a static list.
-	(tramp-set-completion-function): Implementation tuned.  Avoid
-	double entries, and entries where the function or the
+	(tramp-set-completion-function): Implementation tuned.
+	Avoid double entries, and entries where the function or the
 	file/directory doesn't exist.
 	(tramp-parse-shostkeys, tramp-parse-sknownhosts): New functions
 	for SSH2.
 	(tramp-file-name-handler-alist): Add `dired-compress-file' entry.
 	(tramp-handle-dired-compress-file): New function.
 	(tramp-async-proc): New variable.
-	(tramp-handle-shell-command): Adding asynchronous processes.  They
-	are far from being perfect, but it works at least for
+	(tramp-handle-shell-command): Adding asynchronous processes.
+	They are far from being perfect, but it works at least for
 	`find-grep-dired' and `find-name-dired' in Emacs 21.4.
 	(top-level): Require password.el if visible.  Should be mandatory
 	once No Gnus has found its way into (X)Emacs.
@@ -133,8 +128,8 @@
 	`read-passwd' otherwise. `ange-ftp-read-passwd' isn't used as
 	fallback any longer.
 	(tramp-clear-passwd): New function.
-	(tramp-process-actions, tramp-process-multi-actions): Clear
-	password cache if login has failed.
+	(tramp-process-actions, tramp-process-multi-actions):
+	Clear password cache if login has failed.
 
 	* net/tramp-ftp.el (Commentary): Remove pointer to EFS.  It has
 	its own module.
@@ -165,8 +160,7 @@
 	relative directory names.
 	(dired-at-point-prompter): Treat directories as a directory, get
 	the directory component from files.
-	(ffap-string-at-point): Return string from region if region is
-	active.
+	(ffap-string-at-point): Return string from region if region is active.
 	(ffap-file-at-point): Remove redundant code.
 
 2004-02-28  Kim F. Storm  <storm@cua.dk>
@@ -186,8 +180,8 @@
 	(gdb-put-breakpoint-icon): New defun which displays a breakpoint
 	icon in fringe (if available), or else as icon or text in display
 	margin.  Creates necessary icons in breakpoint-bitmap,
-	breakpoint-enabled-icon, and/or breakpoint-disabled-icon.  Also
-	make left window margin if required.
+	breakpoint-enabled-icon, and/or breakpoint-disabled-icon.
+	Also make left window margin if required.
 	(gdb-remove-breakpoint-icons): New defun to remove breakpoint
 	icons inserted by gdb-put-breakpoint-icon.  Remove left margin if
 	no longer needed.
@@ -198,7 +192,7 @@
 2004-02-27  Kevin Ryde  <user42@zip.com.au>
 
 	* info-look.el: In scheme-mode symbol regexp, disallow backquote and
-        comma, so that it DTRT in macros.
+	comma, so that it DTRT in macros.
 
 2004-02-27  Markus Rost  <rost@mathematik.uni-bielefeld.de>
 
@@ -216,11 +210,10 @@
 
 	* font-lock.el (font-lock-comment-face, font-lock-string-face)
 	(font-lock-keyword-face, font-lock-function-name-face)
-	(font-lock-variable-name-face, font-lock-constant-face): Use
-	`min-colors'.
+	(font-lock-variable-name-face, font-lock-constant-face):
+	Use `min-colors'.
 
-	* isearch.el (isearch, isearch-lazy-highlight-face): Use
-	`min-colors'.
+	* isearch.el (isearch, isearch-lazy-highlight-face): Use `min-colors'.
 
 2004-02-25  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
@@ -237,8 +230,8 @@
 	* ebnf-abn.el: New file, implements an ABNF parser.
 
 	* ebnf2ps.el: Doc fix.  Accept ABNF (Augmented BNF).  New arrow shapes:
-	semi-up-hollow, semi-up-full, semi-down-hollow and semi-down-full.  Fix
-	a bug on productions like test = {"test"}* | ( "tt" ["test"] ).
+	semi-up-hollow, semi-up-full, semi-down-hollow and semi-down-full.
+	Fix a bug on productions like test = {"test"}* | ( "tt" ["test"] ).
 	Reported by Markus Dreyer <mdreyer@ix.urz.uni-heidelberg.de>.
 	(ebnf-version): New version number (4.0).
 	(ebnf-print-directory, ebnf-print-file, ebnf-spool-directory)
@@ -284,10 +277,9 @@
 	(gdb-var-delete): Make interactive (really).
 	(gdb-edit-value): Make non-interactive.
 
-	* progmodes/gud.el (gud-install-speedbar-variables): Bind
-	gdb-var-delete to "D".
-	(gud-speedbar-menu-items): Add gdb-var-delete and, indirectly,
-	gdb-edit-value.
+	* progmodes/gud.el (gud-speedbar-menu-items):
+	Add gdb-var-delete and, indirectly, gdb-edit-value.
+	(gud-install-speedbar-variables): Bind gdb-var-delete to "D".
 	(gud-speedbar-buttons): Remove gdb-var-delete from tag-line.
 	(gud-gdb-marker-filter): Add comment for annotations.
 
@@ -306,8 +298,7 @@
 2004-02-21  Stephen Compall  <s11@member.fsf.org>
 
 	* saveplace.el (save-place-forget-unreadable-files)
-	(save-place-save-skipped, save-place-skip-check-regexp): New
-	defcustoms.
+	(save-place-save-skipped, save-place-skip-check-regexp): New vars.
 	(save-place-forget-unreadable-files): New function.
 	(save-place-alist-to-file): Use it to filter out files that are
 	no longer readable.
@@ -339,7 +330,7 @@
 
 2004-02-20  John Wiegley  <johnw@newartisans.com>
 
-	* eshell/em-pred.el (eshell-modifier-alist): Changed the "eval
+	* eshell/em-pred.el (eshell-modifier-alist): Change the "eval
 	again" modifier from 'e' to 'E', since 'e' is also used by the
 	"file extension" modifier.
 
@@ -358,8 +349,8 @@
 
 	* gdb-ui.el (gdb-use-colon-colon-notation): Set default to nil for
 	case of variables defined in compound statements.
-	(gdb-setup-windows, gdb-source-info, gdb-source-info): Simplify
-	constructions using switch-to-buffer.
+	(gdb-setup-windows, gdb-source-info, gdb-source-info):
+	Simplify constructions using switch-to-buffer.
 
 2004-02-19  Simon Josefsson  <jas@extundo.com>
 
@@ -447,7 +438,7 @@
 	* rmail-spam-filter.el: (vm-use-spam-filter)
 	(rsf-min-region-length-added-to-spam-list): New	variables.
 	(rsf-bbdb-auto-delete-spam-bbdb-entries): Rename from
-	rmail-bbdb-auto-delete-spam-entries.  Added cc: to recipients for
+	rmail-bbdb-auto-delete-spam-entries.  Add cc: to recipients for
 	spam testing.  Don't delete spam message if automatic deletion
 	after output via variable rmail-delete-after-output is turned on.
 	(rsf-bbdb-dont-create-entries-for-deleted-messages): Rename from
@@ -617,6 +608,7 @@
 	(diff, diff-backup): Use it.
 	(diff): Clean up the args construction.  Use backquote.
 	Use listp instead of consp to avoid putting a nil arg.
+	(diff): Add a revert-buffer function.
 
 2004-02-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 48fc3e13114..557856da811 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* editfns.c (Ftranslate_region): Lisp_Object/int mixup.
+
 2004-03-02  Richard M. Stallman  <rms@gnu.org>
 
 	* indent.c (compute_motion): Save vpos in prev_vpos, like hpos etc.
@@ -30,7 +34,7 @@
 	(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
-	overlay-arrow-bitmap.  Set w->overlay_arrow_bitmap accordingly. 
+	overlay-arrow-bitmap.  Set w->overlay_arrow_bitmap accordingly.
 	(produce_image_glyph): Set pixel_width = 0 for fringe bitmap.
 	(syms_of_xdisp): Remove last_arrow_position and last_arrow_string.
 
@@ -70,11 +74,11 @@
 
 2004-02-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-	* xfns.c (x_window): Fixed indentation.
+	* xfns.c (x_window): Fix indentation.
 
 	* xterm.c (x_calc_absolute_position): Call x_real_positions
 	to get WM window sizes and use those to calculate position.
-	(x_set_offset): Removed code commented out.
+	(x_set_offset): Remove code commented out.
 
 2004-02-28  Miles Bader  <miles@gnu.org>
 
@@ -132,9 +136,9 @@
 
 	* xsmfns.c (x_session_check_input): Remove numchars arg.
 
-	* xterm.c (x_focus_changed, x_detect_focus_change): Remove
-	numchars arg.  Always store event into bufp arg.  Return nothing.
-	Callers changed accordingly.
+	* xterm.c (x_focus_changed, x_detect_focus_change):
+	Remove numchars arg.  Always store event into bufp arg.
+	Return nothing.  Callers changed accordingly.
 	(glyph_rect): Simplify.
 	(STORE_KEYSYM_FOR_DEBUG): New macro.
 	(SET_SAVED_MENU_EVENT): Use inev instead of bufp, etc.
@@ -166,8 +170,7 @@
 
 2004-02-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-	* s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add `-framework
-	QuickTime'.
+	* s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add `-framework QuickTime'.
 
 	* dispextern.h [MAC_OSX]: Do not include Carbon/Carbon.h (now in
 	macgui.h).
@@ -182,13 +185,11 @@
 	(Bitmap): Remove typedef.
 	(Pixmap): Change int to GWorldPtr.
 
-	* macmenu.c [MAC_OSX]: Do not include Carbon/Carbon.h (now in
-	macgui.h).
+	* macmenu.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
 
-	* macterm.h [MAC_OSX]: Do not 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
+	* 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
 	long representation.
 	(PIX_MASK_DRAW, PIX_MASK_RETAIN): New #define to represent pixel
 	colors used for masks.
@@ -204,11 +205,11 @@
 	(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)
-	(find_image_fsspec, image_load_qt_1, image_load_quicktime): New
-	functions.
+	(find_image_fsspec, image_load_qt_1, image_load_quicktime):
+	New functions.
 	(four_corners_best, x_create_x_image_and_pixmap)
-	(x_destroy_x_image, unwind_create_frame, x_disable_image,
-	(x_edge_detection, init_color_table, colors_in_color_table,
+	(x_destroy_x_image, unwind_create_frame, x_disable_image)
+	(x_edge_detection, init_color_table, colors_in_color_table)
 	(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)
@@ -227,14 +228,13 @@
 	(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)
-	(enum gif_keyword_index, gif_format, gif_image_p): Sync with
-	xfns.c.
+	(enum gif_keyword_index, gif_format, gif_image_p): Sync with xfns.c.
 	(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.
-	(unwind_create_frame, x_emboss, x_laplace, x_edge_detection): New
-	functions (from xfns.c).
+	(unwind_create_frame, x_emboss, x_laplace, x_edge_detection):
+	New functions (from xfns.c).
 	(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
@@ -246,14 +246,13 @@
 	(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)
-	(image_background_transparent): New function (from xfns.c).  Use
-	PIX_MASK_DRAW/PIX_MASK_RETAIN.
+	(image_background_transparent): New function (from xfns.c).
+	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
 	(image_load_quicktime): Add declaration.
 	[MAC_OSX] (image_load_quartz2d): Likewise.
 	[MAC_OSX] (CGImageCreateWithPNGDataProviderProcType): New typedef.
 	[MAC_OSX] (MyCGImageCreateWithPNGDataProvider): New variable.
-	[MAC_OSX] (init_image_func_pointer, image_load_quartz2d): New
-	functions.
+	[MAC_OSX] (init_image_func_pointer, image_load_quartz2d): New funs.
 	(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)
@@ -262,23 +261,22 @@
 	(lookup_rgb_color): Don't lookup color table.  Just do gamma
 	correction.
 	(COLOR_INTENSITY): New #define (from xfns.c).
-	(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.
+	(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.
 	(HAVE_PBM): Remove #ifdef.
 	(pbm_load): Sync with xfns.c.  Set img->width and img->height
 	before IMAGE_BACKGROUND.
-	(png_image_p, png_load): Don't enclose declarations with #if
-	HAVE_PNG.
+	(png_image_p, png_load): Don't enclose declarations with #if HAVE_PNG.
 	(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
-	symbol _CGImageCreateWithPNGDataProvider is defined.  Otherwise
-	use image_load_quicktime.
+	symbol _CGImageCreateWithPNGDataProvider is defined.
+	Otherwise use image_load_quicktime.
 	[!HAVE_PNG] (png_load) [!MAC_OSX]: Use image_load_quicktime.
-	[HAVE_PNG] (png_load): Sync with xfns.c.  Use
-	PIX_MASK_DRAW/PIX_MASK_RETAIN.
+	[HAVE_PNG] (png_load): Sync with xfns.c.
+	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
 	(jpeg_image_p, jpeg_load): Don't enclose declarations with #if
 	HAVE_JPEG.
 	(Qjpeg, enum jpeg_keyword_index, jpeg_format, jpeg_type)
@@ -291,11 +289,10 @@
 	(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.
-	[HAVE_TIFF] (tiff_error_handler, tiff_warning_handler): New
-	functions (from xfns.c).
+	[HAVE_TIFF] (tiff_error_handler, tiff_warning_handler):
+	New functions (from xfns.c).
 	[HAVE_TIFF] (tiff_load): Sync with xfns.c.
-	(gif_image_p, gif_load): Don't enclose declarations with #if
-	HAVE_GIF.
+	(gif_image_p, gif_load): Don't enclose declarations with #if HAVE_GIF.
 	(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
@@ -312,12 +309,11 @@
 	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
-	HAVE_PNG.  Call EnterMovies to support animated gifs.  Call
-	init_image_func_pointer to bind a symbol
+	HAVE_PNG.  Call EnterMovies to support animated gifs.
+	Call init_image_func_pointer to bind a symbol
 	_CGImageCreateWithPNGDataProvider if it is defined.
 
-	* macterm.c [MAC_OSX]: Do not include Carbon/Carbon.h (now in
-	macgui.h).
+	* macterm.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
 	(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
@@ -325,16 +321,16 @@
 	(mac_set_forecolor, mac_set_backcolor): Use RED16_FROM_ULONG etc.
 	(mac_draw_line_to_pixmap, XCreatePixmap)
 	(XCreatePixmapFromBitmapData, mac_fill_rectangle_to_pixmap)
-	(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 *.
+	(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 *.
 	(reflect_byte): New function (from w32fns.c).
 	(mac_create_bitmap_from_bitmap_data): Use it and don't stuff bits
 	due to byte alignment.
-	(mac_scroll_area) [TARGET_API_MAC_CARBON]: Use
-	GetPortBitMapForCopyBits instead of the cast to Bitmap *.
+	(mac_scroll_area) [TARGET_API_MAC_CARBON]:
+	Use GetPortBitMapForCopyBits instead of the cast to Bitmap *.
 	(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.
@@ -352,18 +348,16 @@
 	(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.
-	(mac_initialize_display_info): Remove dpyinfo->n_cbits.  Set
-	dpyinfo->color_p.  Determine dpyinfo->n_planes using HasDepth.
+	(mac_initialize_display_info): Remove dpyinfo->n_cbits.
+	Set dpyinfo->color_p.  Determine dpyinfo->n_planes using HasDepth.
 	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
-	from a mac font name to an XLFD font name according to its script
-	code.
+	from a mac font name to an XLFD font name according to its script code.
 	(x_font_name_to_mac_font_name): Apply code conversion from an XLFD
-	font name to a mac font name according to REGISTRY and ENCODING
-	fields.
+	font name to a mac font name according to REGISTRY and ENCODING fields.
 	(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
@@ -422,8 +416,8 @@
 
 	* emacs.c (USAGE1): Split into two halves.
 	(USAGE2): Second half of the old USAGE1.
-	(USAGE3): Renamed from USAGE2.
-	(USAGE4): Renamed from USAGE3.
+	(USAGE3): Rename from USAGE2.
+	(USAGE4): Rename from USAGE3.
 
 2004-02-21  Juri Linkov  <juri@jurta.org>
 
@@ -446,8 +440,8 @@
 	in one call to read_socket_hook.  Value is 8.
 	(read_avail_input): Separate and rework handling of read_socket_hook
 	and non-read_socket_hook cases.  Use smaller input_event buffer
-	in read_socket_hook case, and repeat if full buffer is read.  Use
-	new local variable 'discard' to skip input after C-g.
+	in read_socket_hook case, and repeat if full buffer is read.
+	Use new local variable 'discard' to skip input after C-g.
 	In non-read_socket_hook case, just use a single input_event, and
 	call kbd_buffer_store_event on the fly for each character.