From 8b9ae6b046cff3c30a469e06c07085a603560e2c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 10 Jan 2007 03:44:49 +0000 Subject: [PATCH] (Ffile_attributes): Use floats for large uids/gids. --- src/ChangeLog | 24 ++++++++++++++---------- src/dired.c | 12 +++++++----- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8b9243b2329..5c4a9aeae1f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-01-10 Stefan Monnier + + * dired.c (Ffile_attributes): Use floats for large uids/gids. + 2007-01-09 Eli Zaretskii * emacs.c (syms_of_emacs) : Doc fix. @@ -17,8 +21,8 @@ * macmenu.c (mac_dialog_modal_filter) [MAC_OSX]: New function. (Fx_popup_dialog) [MAC_OSX]: Use standard alert if called from Fmessage_box, Fyes_or_no_p, or Fy_or_n_p. - [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030] (menu_quit_handler): Use - mac_quit_char_key_p. + [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030] (menu_quit_handler): + Use mac_quit_char_key_p. * macterm.c (XDrawLine): Rename from mac_draw_line_to_pixmap. (XCreateGC): Change type of 2nd argument to void *. @@ -30,8 +34,8 @@ (XTread_socket): Use it. [USE_TSM] (mac_handle_text_input_event): Likewise. (do_window_update) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw. - (mac_quit_char_modifiers, mac_quit_char_keycode) [MAC_OSX]: Remove - variables. + (mac_quit_char_modifiers, mac_quit_char_keycode) [MAC_OSX]: + Remove variables. (mac_determine_quit_char_modifiers, init_quit_char_handler) [MAC_OSX]: Remove functions. (make_ctrl_char) [MAC_OSX]: Add extern. @@ -209,8 +213,8 @@ 2006-12-22 YAMAMOTO Mitsuharu - * macfns.c (mac_update_title_bar) [TARGET_API_MAC_CARBON]: Call - mac_update_proxy_icon also when buffer modification flag changed. + * macfns.c (mac_update_title_bar) [TARGET_API_MAC_CARBON]: + Call mac_update_proxy_icon also when buffer modification flag changed. [TARGET_API_MAC_CARBON] (mac_update_proxy_icon): Don't update alias, but compare FSRef/FSSpec of resolved alias. @@ -303,8 +307,8 @@ (Fmac_atsu_font_face_attributes) [USE_ATSUI]: New function. (syms_of_macfns) [USE_ATSUI]: Defsubr it. - * macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Use - mac_wakeup_from_rne instead of mac_post_mouse_moved_event. + * macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): + Use mac_wakeup_from_rne instead of mac_post_mouse_moved_event. * macterm.c (mac_query_char_extents) [USE_ATSUI]: Don't call ATSUGetGlyphBounds if not necessary. @@ -317,8 +321,8 @@ (mac_load_query_font) [USE_ATSUI]: Use atsu_find_font_from_family_name. Don't get metrics for Latin-1 right half characters. (mac_load_query_font): Don't load font if space width is not positive. - [TARGET_API_MAC_CARBON] (mac_store_event_ref_as_apple_event): Use - mac_wakeup_from_rne instead of mac_post_mouse_moved_event. + [TARGET_API_MAC_CARBON] (mac_store_event_ref_as_apple_event): + Use mac_wakeup_from_rne instead of mac_post_mouse_moved_event. (XTread_socket): Call SelectWindow when unfocused frame is clicked. * macterm.h (mac_wakeup_from_rne) [TARGET_API_MAC_CARBON]: Add extern. diff --git a/src/dired.c b/src/dired.c index ffaeb5adee4..7b8f978b20c 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1,6 +1,6 @@ /* Lisp functions for making directory listings. Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -966,16 +966,18 @@ Elements of the attribute list are: values[1] = make_number (s.st_nlink); if (NILP (id_format) || EQ (id_format, Qinteger)) { - values[2] = make_number (s.st_uid); - values[3] = make_number (s.st_gid); + values[2] = make_fixnum_or_float (s.st_uid); + values[3] = make_fixnum_or_float (s.st_gid); } else { BLOCK_INPUT; pw = (struct passwd *) getpwuid (s.st_uid); - values[2] = (pw ? build_string (pw->pw_name) : make_number (s.st_uid)); + values[2] = (pw ? build_string (pw->pw_name) + : make_fixnum_or_float (s.st_uid)); gr = (struct group *) getgrgid (s.st_gid); - values[3] = (gr ? build_string (gr->gr_name) : make_number (s.st_gid)); + values[3] = (gr ? build_string (gr->gr_name) + : make_fixnum_or_float (s.st_gid)); UNBLOCK_INPUT; } values[4] = make_time (s.st_atime); -- 2.39.2