diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 38 | ||||
| -rw-r--r-- | src/atimer.c | 2 |
2 files changed, 21 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3ed3b6d627..868e39f0a3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,12 @@ +2005-11-29 Ari Roponen <[email protected]> (tiny change) + + * atimer.c (stop_other_atimers): Fix loop to correctly compute `prev'. + 2005-11-27 Richard M. Stallman <[email protected]> * window.c (adjust_window_trailing_edge): New function. (Fadjust_window_trailing_edge): New function. - (syms_of_window): defsubr it. + (syms_of_window): Defsubr it. (window_deletion_count): New variable. (delete_window): Update window_deletion_count. @@ -13,7 +17,7 @@ 2005-11-26 Henrik Enberg <[email protected]> - * xfaces.c (Finternal_set_lisp_face_attribute_from_resource): + * xfaces.c (Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property as a lisp expression. 2005-11-24 YAMAMOTO Mitsuharu <[email protected]> @@ -52,8 +56,8 @@ 2005-11-20 Chong Yidong <[email protected]> - * xfaces.c (Finternal_set_lisp_face_attribute): Use - :ignore-defface for new frame defaults when `unspecified' is + * xfaces.c (Finternal_set_lisp_face_attribute): + Use :ignore-defface for new frame defaults when `unspecified' is supplied. (Finternal_get_lisp_face_attribute): Hide :ignore-defface. (merge_face_vectors): Don't do :ignore-defface overwriting here. @@ -78,24 +82,22 @@ * macterm.c [USE_CG_TEXT_DRAWING] (cg_text_anti_aliasing_threshold): New variable. - [USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): New - function. + [USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): New fun. (init_font_name_table) [USE_ATSUI && USE_CG_TEXT_DRAWING]: Use it. [USE_CG_TEXT_DRAWING] (mac_draw_string_cg): Don't do antialiasing if font size is smaller than or equal to cg_text_anti_aliasing_threshold. 2005-11-17 Chong Yidong <[email protected]> - * image.c (x_create_bitmap_from_xpm_data): Free attributes on - fail. + * image.c (x_create_bitmap_from_xpm_data): Free attributes on fail. * xfaces.c (Qignore_defface): New variable. (syms_of_xfaces): Provide `:ignore-defface'. (IGNORE_DEFFACE_P): New macro. (check_lface_attrs, lface_fully_specified_p) (Finternal_set_lisp_face_attribute) - (Fface_attribute_relative_p, Fmerge_face_attribute): Handle - Qignore_defface as a possible value. + (Fface_attribute_relative_p, Fmerge_face_attribute): + Handle Qignore_defface as a possible value. (merge_face_vectors): The merged face is `unspecified' if the mergee specifies `:ignore-defface'. @@ -636,8 +638,8 @@ * xdisp.c (remember_mouse_glyph): Use MATRIX_BOTTOM_TEXT_ROW to get end of text rows. Obtain header-line/mode-line rows directly. - * xterm.c, w32term.c, macterm.c (note_mouse_movement): Restore - help_echo_string if mouse is moved inside last_mouse_glyph. + * xterm.c, w32term.c, macterm.c (note_mouse_movement): + Restore help_echo_string if mouse is moved inside last_mouse_glyph. 2005-10-12 Kim F. Storm <[email protected]> @@ -702,8 +704,8 @@ (init_font_name_table) [USE_ATSUI]: Use decode_mac_font_name. Don't use Fdowncase because family name is already lowered by decode_mac_font_name. - (init_font_name_table): Always call decode_mac_font_name. Add - pair of family name and its reference to fm_font_family_alist. + (init_font_name_table): Always call decode_mac_font_name. + Add pair of family name and its reference to fm_font_family_alist. (mac_clear_font_name_table): Clear fm_font_family_alist. (XLoadQueryFont): Move font size parsing part to parse_x_font_name. Lookup fm_font_family_alist to get font family reference. @@ -803,8 +805,8 @@ (x_fix_overlapping_area): Add new OVERLAPS arg. (get_glyph_string_clip_rects): Add extern. - * dispnew.c (redraw_overlapping_rows): Call - rif->fix_overlapping_area with new OVERLAPS arg as redrawn part. + * dispnew.c (redraw_overlapping_rows): + Call rif->fix_overlapping_area with new OVERLAPS arg as redrawn part. * xdisp.c: Rename member for_overlaps_p in struct glyph_string to for_overlaps. @@ -1149,8 +1151,8 @@ * xsmfns.c: (get_current_dir_name): Remove prototype. - * lisp.h: (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]: Add - prototype. + * lisp.h: (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]: + Add prototype. * sysdep.c [WINDOWSNT]: Add prototype for getwd. Don't #undef NULL after including blockinput.h. diff --git a/src/atimer.c b/src/atimer.c index f8ed1b265e..d260f67d24 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -231,7 +231,7 @@ stop_other_atimers (t) struct atimer *p, *prev; /* See if T is active. */ - for (p = atimers, prev = 0; p && p != t; p = p->next) + for (p = atimers, prev = NULL; p && p != t; prev = p, p = p->next) ; if (p == t) |