From: Miles Bader Date: Sun, 4 May 2008 19:46:16 +0000 (+0000) Subject: Merge from emacs--rel--22 X-Git-Tag: emacs-pretest-23.0.90~5824 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f67e15be8d94718b2e2ea7da68eb0b2dc94ce016 Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1142 --- f67e15be8d94718b2e2ea7da68eb0b2dc94ce016 diff --cc ChangeLog index d5ab34f625,a146fe9087..f42a3a36bc --- a/ChangeLog +++ b/ChangeLog @@@ -1,16 -1,11 +1,23 @@@ -2008-05-02 YAMAMOTO Mitsuharu ++2008-05-04 YAMAMOTO Mitsuharu + + * configure.in: Check availability of AvailabilityMacros.h + if HAVE_CARBON. + + * configure: Regenerate. + -2008-04-11 Dan Nicolaescu +2008-05-03 Glenn Morris + + * configure.in (x_libraries): Remove standard 64-bit directories - + experimental workaround for minor autoconf bug. + + * configure.in (--without-makeinfo): New option. If set, + absence of suitable makeinfo is not a fatal error. + * Makefile.in (MAKEINFO): New, set by configure. + (install-arch-indep): Without makeinfo, ignore any missing manuals. + (info-real): New target. + (info): Without makeinfo, do nothing, else call `info-real'. + +2008-04-23 Dan Nicolaescu * configure.in: Remove hpux10.20 from the desupported list. diff --cc src/ChangeLog index 1bf4586c26,f5b038846e..48ee2eeca6 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,114 -1,56 +1,163 @@@ + 2008-05-04 YAMAMOTO Mitsuharu + + * image.c [USE_MAC_IMAGE_IO] (image_load_image_io): + Create bitmap context in native byte order. + - * macterm.c (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: - Create bitmap context in native byte order. - -2008-05-03 Eli Zaretskii - - * dired.c (Ffile_attributes): Don't allow the device number become - negative. ++ * macterm.c (XDrawLine) ++ (XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: Create bitmap ++ context in native byte order. + -2008-05-02 YAMAMOTO Mitsuharu ++2008-05-04 YAMAMOTO Mitsuharu + + * config.in: Regenerate. + + * image.c (PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]: + New definitions for Image I/O support. + (XGetImage, XPutPixel, XGetPixel, XDestroyImage) + (mac_create_cg_image_from_image, x_create_x_image_and_pixmap) + [USE_MAC_IMAGE_IO]: Add implementations for Image I/O support. + (mac_data_provider_release_data, image_load_image_io) + [USE_MAC_IMAGE_IO]: New functions. + (CGImageCreateWithPNGDataProviderProcType) [MAC_OSX]: Remove typedef. + (MyCGImageCreateWithPNGDataProvider) [MAC_OSX]: Remove variable. + (init_image_func_pointer) [MAC_OSX]: Remove function. + (image_load_quartz2d) [MAC_OSX]: Check availability of + CGImageCreateWithPNGDataProvider at compile time. + Use lowercase `false' for boolean constant. + (png_load, jpeg_load, tiff_load, gif_load) [USE_MAC_IMAGE_IO]: + Use image_load_image_io. + (png_load) [!USE_MAC_IMAGE_IO && MAC_OSX]: + Don't check MyCGImageCreateWithPNGDataProvider. + (init_image) [MAC_OSX && TARGET_API_MAC_CARBON]: + Don't call init_image_func_pointer. + + * macgui.h (Pixmap) [USE_MAC_IMAGE_IO]: New definition for Image I/O. + + * macterm.c (mac_cg_color_space_rgb) [USE_CG_DRAWING]: + Make variable non-static. + (XDrawLine, XCreatePixmap, XCreatePixmapFromBitmapData, XFreePixmap) + [USE_MAC_IMAGE_IO]: Add implementations for Image I/O support. + + * macterm.h (ARGB_TO_ULONG, ALPHA_FROM_ULONG): New macros. + (RED_FROM_ULONG): Mask off higher bits. + (mac_cg_color_space_rgb) [USE_MAC_IMAGE_IO]: New extern. + + * s/darwin.h [HAVE_CARBON && HAVE_AVAILABILITYMACROS_H]: + Include AvailabilityMacros.h. + (USE_MAC_IMAGE_IO, LIBS_IMAGE) [HAVE_CARBON]: New defines. + (LIBS_CARBON) [HAVE_CARBON]: Use LIBS_IMAGE. + +2008-05-03 Stefan Monnier + + * chartab.c (Fset_char_table_range): If range is t, really set all + chars to that value. + +2008-05-03 Eli Zaretskii + + * dired.c (Ffile_attributes): Don't allow the device number become + negative. + +2008-05-02 Daiki Ueno + + * Makefile.in (lisp, shortlisp): Add epa-file-hook.elc. + +2008-05-02 Juri Linkov + + * minibuf.c (Fread_from_minibuffer, Fread_string, Fread_command) + (Fread_variable, Fread_buffer, Fcompleting_read): Document + the DEFAULT argument as a list of default values in docstrings. + +2008-05-01 Chong Yidong + + * puresize.h (BASE_PURESIZE): Increase to 1210000. + +2008-05-01 Martin Rudalics + + * dispnew.c (change_frame_size_1): Preserve small windows when + shrinking frames by calling set_window_height|width with third + arg 2. + + * window.h (struct window): Replace field too_small_ok by field + resize_proportionally. + + * window.c (make_window): Initialize resize_proportionally. + (enlarge_window): Temporarily set resize_proportionally to make + sure that shrink_windows does scale the window proportionally. + (shrink_windows): When window has resize_proportionally set try + to shrink it proportionally by stealing from other windows. + (struct saved_window, Fset_window_configuration) + (compare_window_configurations): Handle resize_proportionally. + (WINDOW_TOTAL_SIZE): New macro. + (window_min_size, shrink_windows, size_window): Use it. + (check_min_window_sizes): Remove. Invalid values of + window-min-height|width are handled by window_min_size_2 now. + (size_window, Fsplit_window, enlarge_window) + (adjust_window_trailing_edge, grow_mini_window): Don't call + check_min_window_sizes. + (window_min_size_2, window_min_size_1, window_min_size): + New argument safe_p for retrieving "safe" minimum sizes. + (Fdisplay_buffer, Fsplit_window, enlarge_window): + (adjust_window_trailing_edge, grow_mini_window): + Adjust arguments of window_min_size... functions. + (shrink_windows): Argument min_size removed. New argument + safe_p allows shrinking windows to their safe minimum sizes. + Calculate minimum size and decide whether a window shall be + deleted for each window individually. + (size_window): When nodelete_p equals 2, tell shrink_windows to + delete windows only if their new minimum size is no more safe. + (shrink_window_lowest_first): Call window_min_size_1 to make + sure to preserve modeline of bottom-most window when resizing + the minibuffer. + (Fset_window_configuration, Fcurrent_window_configuration) + (compare_window_configurations): Do not handle + window-min-height|width any more. + (syms_of_window): Clarify window-min-height|width doc-strings. + +2008-04-30 Stefan Monnier + + * dired.c (file_name_completion): Fix up the encoding/decoding issue + some more. Copy some of the code from Ftry_completions. + Remove special case code that dates back to initial revision when the + slash was only added when necessary and that can't trigger nowadays. + +2008-04-27 Kenichi Handa + + * font.c (font_prop_validate): Signal `error' instead of `font'. + +2008-04-29 Jason Rumney + + * w32fns.c (Fw32_battery_status): New defun. + (syms_of_w32fns): Defsubr it. + +2008-04-28 Andreas Schwab + + * dired.c (file_name_completion): Fix another mixing of encoded + and decoded names. + +2008-04-28 Juanma Barranquero + + * w32fns.c (Fw32_define_rgb_color): Fix typo in docstring. + +2008-04-27 Juanma Barranquero + + * fringe.c (Fdefine_fringe_bitmap): Doc fix. + +2008-04-27 Andreas Schwab + + * dired.c (file_name_completion): Fix inappropriate mixing of + encoded and decoded names. + + * xterm.c (XTread_socket): Fix use of uninitialized variable. + + * puresize.h (BASE_PURESIZE): Increase to 1200000. + +2008-04-26 Eli Zaretskii + + * dired.c (Ffile_attributes) [WINDOWSNT]: Undo change from + 2008-03-31, it's not needed anymore with `struct stat' definition + on nt/inc/sys/stat.h. Undo changes from 2007-01-12 and 2007-01-13 + for the same reasons. + 2008-04-25 Dennis Gilmore (tiny change) * m/sparc.h: Additional redefinitions for GNU/Linux.