From 71630f33d0acae88f1e551a8e78edc1c35ce04e1 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 9 Mar 2006 12:20:57 +0000 Subject: (DECODE_EMACS_MULE_COMPOSITION_CHAR): Fix decoding ASCII component of a composition. --- src/coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/coding.c b/src/coding.c index b96ec82fc1..105d4038b1 100644 --- a/src/coding.c +++ b/src/coding.c @@ -735,7 +735,7 @@ detect_coding_emacs_mule (src, src_end, multibytep) c = -1; \ else \ { \ - c -= 0xA0; \ + c -= 0x80; \ *p++ = c; \ } \ } \ -- cgit v1.2.3 From 53a5eba91d68e7465f1f9c9998eeb077b03b67d6 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 9 Mar 2006 12:43:08 +0000 Subject: *** empty log message *** --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index db10f46024..16f5eff11e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-09 Kenichi Handa + + * coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): Fix decoding + ASCII component of a composition. + 2006-03-08 Luc Teirlinck * window.c: Declare preserve_y as a static global variable. -- cgit v1.2.3 From f945af424da538bc7363ac918122ac351b5b664b Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Thu, 9 Mar 2006 15:43:31 +0000 Subject: *** empty log message *** --- src/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 16f5eff11e..6cf09be70f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,7 +8,7 @@ * window.c: Declare preserve_y as a static global variable. (window_scroll_pixel_based): No longer declare preserve_y; it is global now. - (syms_of_window): set preserve_y to -1. + (syms_of_window): Set preserve_y to -1. 2006-03-08 YAMAMOTO Mitsuharu @@ -43,7 +43,7 @@ (mac_handle_command_event, mac_handle_window_event) (mac_handle_mouse_event): Check error code of GetEventParameter. (convert_fn_keycode) [MAC_OSX]: Likewise. - + 2006-03-05 Andreas Schwab * xselect.c (x_catch_errors_unwind): Fix missing return value. -- cgit v1.2.3 From 349a450079672dcf0cb5bffb40feb388fa6879c9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 9 Mar 2006 23:06:58 +0000 Subject: (USE_POSIX_MEMALIGN): New macro. (ABLOCKS_BASE, lisp_align_malloc, lisp_align_free): Use it. --- src/ChangeLog | 22 +++++++++++++--------- src/alloc.c | 10 +++++++--- 2 files changed, 20 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 6cf09be70f..0a9d21b0c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-09 Stefan Monnier + + * alloc.c (USE_POSIX_MEMALIGN): New macro. + (ABLOCKS_BASE, lisp_align_malloc, lisp_align_free): Use it. + 2006-03-09 Kenichi Handa * coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): Fix decoding @@ -28,10 +33,10 @@ (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH): New defines. * macfns.c (x_default_scroll_bar_color_parameter) - (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Remove - unnecessary prototypes. - (x_set_scroll_bar_default_width): Use - MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH. + (x_set_scroll_bar_foreground, x_set_scroll_bar_background): + Remove unnecessary prototypes. + (x_set_scroll_bar_default_width): + Use MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH. (mac_set_scroll_bar_width): New function. (mac_frame_parm_handlers): Set it as handler for scroll-bar-width. @@ -57,9 +62,9 @@ lines, by distributing the rows evenly over the tool-bar screen area. (Vtool_bar_border): New variable. (syms_of_xdisp): DEFVAR_LISP it. - (display_tool_bar_line): Add HEIGHT arg for desired row height. Make - tool-bar row the desired height. Use default face for border below - tool-bar. + (display_tool_bar_line): Add HEIGHT arg for desired row height. + Make tool-bar row the desired height. Use default face for border + below tool-bar. (tool_bar_lines_needed): Add N_ROWS arg. Use it to return number of actual tool-bar rows. (redisplay_tool_bar): Calculate f->n_tool_bar_rows initially. @@ -86,8 +91,7 @@ 2006-02-26 Chong Yidong - * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary - argument. + * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary argument. * xterm.c: (x_load_font, x_term_init, XTmouse_position) (handle_one_xevent, x_connection_closed, x_list_fonts): No arg for diff --git a/src/alloc.c b/src/alloc.c index bb5f550d17..ee84bd2fb2 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -883,6 +883,10 @@ lisp_free (block) /* The entry point is lisp_align_malloc which returns blocks of at most */ /* BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ +/* Use posix_memalloc if the system has it and we're using the system's + malloc (because our gmalloc.c routines don't have posix_memalign although + its memalloc could be used). */ +#define USE_POSIX_MEMALIGN (HAVE_POSIX_MEMALIGN && SYSTEM_MALLOC) /* BLOCK_ALIGN has to be a power of 2. */ #define BLOCK_ALIGN (1 << 10) @@ -948,7 +952,7 @@ struct ablocks #define ABLOCKS_BUSY(abase) ((abase)->blocks[0].abase) /* Pointer to the (not necessarily aligned) malloc block. */ -#ifdef HAVE_POSIX_MEMALIGN +#ifdef USE_POSIX_MEMALIGN #define ABLOCKS_BASE(abase) (abase) #else #define ABLOCKS_BASE(abase) \ @@ -989,7 +993,7 @@ lisp_align_malloc (nbytes, type) mallopt (M_MMAP_MAX, 0); #endif -#ifdef HAVE_POSIX_MEMALIGN +#ifdef USE_POSIX_MEMALIGN { int err = posix_memalign (&base, BLOCK_ALIGN, ABLOCKS_BYTES); if (err) @@ -1105,7 +1109,7 @@ lisp_align_free (block) } eassert ((aligned & 1) == aligned); eassert (i == (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1)); -#ifdef HAVE_POSIX_MEMALIGN +#ifdef USE_POSIX_MEMALIGN eassert ((unsigned long)ABLOCKS_BASE (abase) % BLOCK_ALIGN == 0); #endif free (ABLOCKS_BASE (abase)); -- cgit v1.2.3 From 68f632a816cd33ea82266d8b83ba74bac71a1ea8 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Mar 2006 08:08:55 +0000 Subject: *** empty log message *** --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 0a9d21b0c9..082be6c8cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-03-10 Kim F. Storm + + * alloc.c (USE_POSIX_MEMALIGN): Fix last change. + 2006-03-09 Stefan Monnier * alloc.c (USE_POSIX_MEMALIGN): New macro. -- cgit v1.2.3 From b4181b015a221c98cbd2b973a9db7b04e7242e29 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Mar 2006 08:10:24 +0000 Subject: (USE_POSIX_MEMALIGN): Fix last change. --- src/alloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/alloc.c b/src/alloc.c index ee84bd2fb2..e3b65c1a4f 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -886,7 +886,9 @@ lisp_free (block) /* Use posix_memalloc if the system has it and we're using the system's malloc (because our gmalloc.c routines don't have posix_memalign although its memalloc could be used). */ -#define USE_POSIX_MEMALIGN (HAVE_POSIX_MEMALIGN && SYSTEM_MALLOC) +#if defined (HAVE_POSIX_MEMALIGN) && defined (SYSTEM_MALLOC) +#define USE_POSIX_MEMALIGN 1 +#endif /* BLOCK_ALIGN has to be a power of 2. */ #define BLOCK_ALIGN (1 << 10) -- cgit v1.2.3 From 8cb56728dda0b94f3b93f039414f56b24d188c19 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:02:05 +0000 Subject: (get_phys_cursor_geometry): Don't decrease height by 1. --- src/xdisp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/xdisp.c b/src/xdisp.c index be40d7652a..20e34d9417 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2029,7 +2029,7 @@ get_phys_cursor_geometry (w, row, glyph, heightp) } } - *heightp = h - 1; + *heightp = h; return WINDOW_TO_FRAME_PIXEL_Y (w, y); } -- cgit v1.2.3 From 97b5ae784da87d61fac93904f11aed356d9215f5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:03:12 +0000 Subject: (mac_draw_rectangle): Don't add 1 to width and height. (x_draw_glyph_string_foreground) (x_draw_composite_glyph_string_foreground) (x_draw_image_foreground): Don't subtract 1 from width and height arguments to mac_draw_rectangle. (x_draw_hollow_cursor): Add 1 to w->phys_cursor_width. --- src/ChangeLog | 11 +++++++++++ src/macterm.c | 14 +++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 082be6c8cf..2ed0b9b133 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2006-03-11 Eli Zaretskii + + * xdisp.c (get_phys_cursor_geometry): Don't decrease height by 1. + + * macterm.c (mac_draw_rectangle): Don't add 1 to width and height. + (x_draw_glyph_string_foreground) + (x_draw_composite_glyph_string_foreground) + (x_draw_image_foreground): Don't subtract 1 from width and height + arguments to mac_draw_rectangle. + (x_draw_hollow_cursor): Add 1 to w->phys_cursor_width. + 2006-03-10 Kim F. Storm * alloc.c (USE_POSIX_MEMALIGN): Fix last change. diff --git a/src/macterm.c b/src/macterm.c index 985421b12c..649bfb43ef 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -598,7 +598,7 @@ mac_draw_rectangle (f, gc, x, y, width, height) SetPortWindowPort (FRAME_MAC_WINDOW (f)); RGBForeColor (GC_FORE_COLOR (gc)); - SetRect (&r, x, y, x + width + 1, y + height + 1); + SetRect (&r, x, y, x + width, y + height); mac_begin_clip (gc); FrameRect (&r); /* using foreground color of gc */ @@ -2436,7 +2436,7 @@ x_draw_glyph_string_foreground (s) { struct glyph *g = s->first_glyph + i; mac_draw_rectangle (s->f, s->gc, x, s->y, - g->pixel_width - 1, s->height - 1); + g->pixel_width, s->height); x += g->pixel_width; } } @@ -2515,7 +2515,7 @@ x_draw_composite_glyph_string_foreground (s) { if (s->gidx == 0) mac_draw_rectangle (s->f, s->gc, x, s->y, - s->width - 1, s->height - 1); + s->width, s->height); } else { @@ -3068,15 +3068,15 @@ x_draw_image_foreground (s) int r = s->img->relief; if (r < 0) r = -r; mac_draw_rectangle (s->f, s->gc, x - r, y - r, - s->slice.width + r*2 - 1, - s->slice.height + r*2 - 1); + s->slice.width + r*2, + s->slice.height + r*2); } } } else /* Draw a rectangle if image could not be loaded. */ mac_draw_rectangle (s->f, s->gc, x, y, - s->slice.width - 1, s->slice.height - 1); + s->slice.width, s->slice.height); } @@ -5245,7 +5245,7 @@ x_draw_hollow_cursor (w, row) /* Compute frame-relative coordinates for phys cursor. */ x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); y = get_phys_cursor_geometry (w, row, cursor_glyph, &h); - wd = w->phys_cursor_width; + wd = w->phys_cursor_width + 1; /* The foreground of cursor_gc is typically the same as the normal background color, which can cause the cursor box to be invisible. */ -- cgit v1.2.3 From 005a80de11fb0efe39b4fb5ad636396a3b86d281 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:04:41 +0000 Subject: (x_draw_hollow_cursor): Subtract 1 from the last argument of XDrawRectangle. --- src/xterm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/xterm.c b/src/xterm.c index 7b952e1f45..c0941b7cbd 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7178,7 +7178,7 @@ x_draw_hollow_cursor (w, row) /* Set clipping, draw the rectangle, and reset clipping again. */ x_clip_to_row (w, row, TEXT_AREA, gc); - XDrawRectangle (dpy, FRAME_X_WINDOW (f), gc, x, y, wd, h); + XDrawRectangle (dpy, FRAME_X_WINDOW (f), gc, x, y, wd, h - 1); XSetClipMask (dpy, gc, None); } -- cgit v1.2.3 From 7325e71441117761c91bd75c18d2cda79c330bc8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:05:09 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 9 +++++++++ src/ChangeLog | 3 +++ 2 files changed, 12 insertions(+) (limited to 'src') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96aae2ec1c..d05b8b83d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2006-03-11 Eli Zaretskii + + * international/mule.el (auto-coding-alist): Add .odt + (OpenOffice's open document) files. + + * files.el (auto-mode-alist): Add .odt (OpenOffice's open + document) files. Mention in the doc string the need to sync with + auto-coding-alist. + 2006-03-10 Chong Yidong * files.el (hack-local-variables-confirm): Don't prompt for ! if diff --git a/src/ChangeLog b/src/ChangeLog index 2ed0b9b133..99e8ab7cb4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2006-03-11 Eli Zaretskii + * xterm.c (x_draw_hollow_cursor): Subtract 1 from the last + argument of XDrawRectangle. + * xdisp.c (get_phys_cursor_geometry): Don't decrease height by 1. * macterm.c (mac_draw_rectangle): Don't add 1 to width and height. -- cgit v1.2.3 From 8890220d927ff4c24530dc47c8b3df433e2c9432 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:33:03 +0000 Subject: Remove duplicate prototypes. Make the prototype of getloadavg be conditioned on HAVE_GETLOADAVG being undefined. --- src/lisp.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/lisp.h b/src/lisp.h index 99ed057528..2eaa098705 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2732,7 +2732,6 @@ EXFUN (Fbobp, 0); EXFUN (Fformat, MANY); EXFUN (Fmessage, MANY); extern Lisp_Object format2 P_ ((char *, Lisp_Object, Lisp_Object)); -extern Lisp_Object make_buffer_string P_ ((int, int, int)); EXFUN (Fbuffer_substring, 2); EXFUN (Fbuffer_string, 0); extern Lisp_Object save_excursion_save P_ ((void)); @@ -2751,7 +2750,6 @@ extern Lisp_Object make_buffer_string P_ ((int, int, int)); extern Lisp_Object make_buffer_string_both P_ ((int, int, int, int, int)); extern void init_editfns P_ ((void)); extern void syms_of_editfns P_ ((void)); -EXFUN (Fcurrent_message, 0); extern Lisp_Object Vinhibit_field_text_motion; EXFUN (Fconstrain_to_field, 5); EXFUN (Ffield_string, 1); @@ -2849,7 +2847,6 @@ extern Lisp_Object close_file_unwind P_ ((Lisp_Object)); extern void report_file_error P_ ((const char *, Lisp_Object)); extern int internal_delete_file P_ ((Lisp_Object)); extern void syms_of_fileio P_ ((void)); -EXFUN (Fmake_temp_name, 1); extern void init_fileio_once P_ ((void)); extern Lisp_Object make_temp_name P_ ((Lisp_Object, int)); EXFUN (Fmake_symbolic_link, 3); @@ -3139,7 +3136,6 @@ extern void sys_subshell P_ ((void)); extern void sys_suspend P_ ((void)); extern void discard_tty_input P_ ((void)); extern void init_sys_modes P_ ((void)); -extern void reset_sys_modes P_ ((void)); extern void get_frame_size P_ ((int *, int *)); extern void wait_for_termination P_ ((int)); extern void flush_pending_output P_ ((int)); @@ -3192,8 +3188,10 @@ EXFUN (Fset_fontset_font, 4); /* Defined in xfaces.c */ extern void syms_of_xfaces P_ ((void)); +#ifndef HAVE_GETLOADAVG /* Defined in getloadavg.c */ extern int getloadavg P_ ((double *, int)); +#endif #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ @@ -3214,9 +3212,6 @@ extern void syms_of_xselect P_ ((void)); /* Defined in xterm.c */ extern void syms_of_xterm P_ ((void)); -/* Defined in getloadavg.c */ -extern int getloadavg P_ ((double [], int)); - #ifdef MSDOS /* Defined in msdos.c */ EXFUN (Fmsdos_downcase_filename, 1); -- cgit v1.2.3 From 306cea3aee712f8b2d19b2bfd4011a2ecc9c1c2f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:33:37 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 2 ++ src/ChangeLog | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'src') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d05b8b83d0..aa50978f5e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2006-03-11 Eli Zaretskii + * calendar/holidays.el (list-holidays): Doc fix. + * international/mule.el (auto-coding-alist): Add .odt (OpenOffice's open document) files. diff --git a/src/ChangeLog b/src/ChangeLog index 99e8ab7cb4..b66d8bbf58 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Giorgos Keramidas (tiny change) + + * lisp.h: Remove duplicate prototypes. Make the prototype of + getloadavg be conditioned on HAVE_GETLOADAVG being undefined. + 2006-03-11 Eli Zaretskii * xterm.c (x_draw_hollow_cursor): Subtract 1 from the last -- cgit v1.2.3 From 635a349655891c7c24221d8ca65ad69437c3e03e Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Sat, 11 Mar 2006 14:42:17 +0000 Subject: (Vprocess_adaptive_read_buffering): Doc fix. --- src/ChangeLog | 4 ++++ src/process.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index b66d8bbf58..6d7ef065cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Romain Francoise + + * process.c (Vprocess_adaptive_read_buffering): Doc fix. + 2006-03-11 Giorgos Keramidas (tiny change) * lisp.h: Remove duplicate prototypes. Make the prototype of diff --git a/src/process.c b/src/process.c index 1c0b196b3c..cf0845fd7a 100644 --- a/src/process.c +++ b/src/process.c @@ -6981,7 +6981,7 @@ On some systems, when Emacs reads the output from a subprocess, the output data is read in very small blocks, potentially resulting in very poor performance. This behavior can be remedied to some extent by setting this variable to a non-nil value, as it will automatically delay reading from such processes, to -allowing them to produce more output before Emacs tries to read it. +allow them to produce more output before Emacs tries to read it. If the value is t, the delay is reset after each write to the process; any other non-nil value means that the delay is not reset on write. The variable takes effect when `start-process' is called. */); -- cgit v1.2.3 From 88019a632801faf4b322b997971658a83274f33d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:19:31 +0000 Subject: (unwind_to_catch): Call x_fully_uncatch_errors. (internal_condition_case_1, internal_condition_case_2): Abort if within unclosed x_catch_errors. --- src/eval.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/eval.c b/src/eval.c index a84948981f..435667e4d5 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1259,6 +1259,10 @@ unwind_to_catch (catch, value) } while (! last_time); + /* If x_catch_errors was done, turn it off now. + (First we give unbind_to a chance to do that.) */ + x_fully_uncatch_errors (); + byte_stack_list = catch->byte_stack; gcprolist = catch->gcpro; #ifdef DEBUG_GCPRO @@ -1435,10 +1439,10 @@ internal_condition_case (bfun, handlers, hfun) struct catchtag c; struct handler h; -#if 0 /* We now handle interrupt_input_blocked properly. - What we still do not handle is exiting a signal handler. */ + /* Since Fsignal will close off all calls to x_catch_errors, + we will get the wrong results if some are not closed now. */ + if (x_catching_errors ()) abort (); -#endif c.tag = Qnil; c.val = Qnil; @@ -1481,6 +1485,11 @@ internal_condition_case_1 (bfun, arg, handlers, hfun) struct catchtag c; struct handler h; + /* Since Fsignal will close off all calls to x_catch_errors, + we will get the wrong results if some are not closed now. */ + if (x_catching_errors ()) + abort (); + c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; @@ -1525,6 +1534,11 @@ internal_condition_case_2 (bfun, nargs, args, handlers, hfun) struct catchtag c; struct handler h; + /* Since Fsignal will close off all calls to x_catch_errors, + we will get the wrong results if some are not closed now. */ + if (x_catching_errors ()) + abort (); + c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; -- cgit v1.2.3 From e6feb692fb27773fd062a63e2b30aef4db5d4bac Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:20:09 +0000 Subject: (x_fully_uncatch_errors, x_catching_errors): New functions. --- src/xterm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src') diff --git a/src/xterm.c b/src/xterm.c index c0941b7cbd..92b245f2b3 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7590,6 +7590,23 @@ x_clear_errors (dpy) x_error_message->string[0] = 0; } +/* Close off all unclosed x_catch_errors calls. */ + +void +x_fully_uncatch_errors () +{ + while (x_error_message) + x_uncatch_errors (); +} + +/* Nonzero if x_catch_errors has been done and not yet canceled. */ + +int +x_catching_errors () +{ + return x_error_message != 0; +} + #if 0 static unsigned int x_wire_count; x_trace_wire () -- cgit v1.2.3 From 02b370adb2780a76ef926b7a8f394fe32a72b7ee Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:21:13 +0000 Subject: (get_lim_data, lim_data, data_space_start): Moved to vm-limit.c. --- src/mem-limits.h | 86 -------------------------------------------------------- 1 file changed, 86 deletions(-) (limited to 'src') diff --git a/src/mem-limits.h b/src/mem-limits.h index 292293b2f9..45dabca3ac 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -112,91 +112,5 @@ extern char etext; #endif /* not _LIBC */ -/* start of data space; can be changed by calling malloc_init */ -static POINTER data_space_start; - -/* Number of bytes of writable memory we can expect to be able to get */ -static unsigned long lim_data; - -#ifdef NO_LIM_DATA -static void -get_lim_data () -{ - lim_data = -1; -} -#else /* not NO_LIM_DATA */ - -#ifdef USG - -static void -get_lim_data () -{ - extern long ulimit (); - - lim_data = -1; - - /* Use the ulimit call, if we seem to have it. */ -#if !defined (ULIMIT_BREAK_VALUE) || defined (GNU_LINUX) - lim_data = ulimit (3, 0); -#endif - - /* If that didn't work, just use the macro's value. */ -#ifdef ULIMIT_BREAK_VALUE - if (lim_data == -1) - lim_data = ULIMIT_BREAK_VALUE; -#endif - - lim_data -= (long) data_space_start; -} - -#else /* not USG */ -#ifdef WINDOWSNT - -static void -get_lim_data () -{ - extern unsigned long reserved_heap_size; - lim_data = reserved_heap_size; -} - -#else -#if !defined (BSD4_2) && !defined (__osf__) - -#ifdef MSDOS -void -get_lim_data () -{ - _go32_dpmi_meminfo info; - - _go32_dpmi_get_free_memory_information (&info); - lim_data = info.available_memory; -} -#else /* not MSDOS */ -static void -get_lim_data () -{ - lim_data = vlimit (LIM_DATA, -1); -} -#endif /* not MSDOS */ - -#else /* BSD4_2 */ - -static void -get_lim_data () -{ - struct rlimit XXrlimit; - - getrlimit (RLIMIT_DATA, &XXrlimit); -#ifdef RLIM_INFINITY - lim_data = XXrlimit.rlim_cur & RLIM_INFINITY; /* soft limit */ -#else - lim_data = XXrlimit.rlim_cur; /* soft limit */ -#endif -} -#endif /* BSD4_2 */ -#endif /* not WINDOWSNT */ -#endif /* not USG */ -#endif /* not NO_LIM_DATA */ - /* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5 (do not change this comment) */ -- cgit v1.2.3 From 395d3972b1ffbcbe1a81052163be27345d0ca8fb Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:24:02 +0000 Subject: (get_lim_data, lim_data, data_space_start): Moved from mem-limits.h. (enum warnlevel): New data type. (check_memory_limits): Rewrite the logic about warnings. Use standard `struct rlimit'. Check return values for nonsense. (memory_warnings): Always clear lim_data. --- src/ChangeLog | 18 +++++ src/vm-limit.c | 211 ++++++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 173 insertions(+), 56 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 6d7ef065cf..e83940cecd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2006-03-11 Richard Stallman + + * vm-limit.c (get_lim_data, lim_data, data_space_start): + Moved from mem-limits.h. + (enum warnlevel): New data type. + (check_memory_limits): Rewrite the logic about warnings. + Use standard `struct rlimit'. Check return values for nonsense. + (memory_warnings): Always clear lim_data. + + * mem-limits.h (get_lim_data, lim_data, data_space_start): + Moved to vm-limit.c. + + * xterm.c (x_fully_uncatch_errors, x_catching_errors): New functions. + + * eval.c (unwind_to_catch): Call x_fully_uncatch_errors. + (internal_condition_case_1, internal_condition_case_2): + Abort if within unclosed x_catch_errors. + 2006-03-11 Romain Francoise * process.c (Vprocess_adaptive_read_buffering): Doc fix. diff --git a/src/vm-limit.c b/src/vm-limit.c index 48d13c323a..de31eda0ce 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -32,6 +32,9 @@ typedef void *POINTER; #endif #include "mem-limits.h" +#include + +#define HAVE_GETRLIMIT #ifdef HAVE_GETRLIMIT #include @@ -44,13 +47,102 @@ typedef void *POINTER; 2 -- 85% warning already issued. 3 -- 95% warning issued; keep warning frequently. */ -static int warnlevel; +enum warnlevel { not_warned, warned_75, warned_85, warned_95 }; + +static enum warnlevel warnlevel; /* Function to call to issue a warning; 0 means don't issue them. */ static void (*warn_function) (); -/* Get more memory space, complaining if we're near the end. */ +/* Start of data space; can be changed by calling malloc_init. */ +static POINTER data_space_start; + +/* Number of bytes of writable memory we can expect to be able to get. */ +static unsigned long lim_data; + + +#ifdef NO_LIM_DATA +static void +get_lim_data () +{ + lim_data = -1; +} +#else /* not NO_LIM_DATA */ + +#ifdef USG + +static void +get_lim_data () +{ + extern long ulimit (); + + lim_data = -1; + + /* Use the ulimit call, if we seem to have it. */ +#if !defined (ULIMIT_BREAK_VALUE) || defined (GNU_LINUX) + lim_data = ulimit (3, 0); +#endif + + /* If that didn't work, just use the macro's value. */ +#ifdef ULIMIT_BREAK_VALUE + if (lim_data == -1) + lim_data = ULIMIT_BREAK_VALUE; +#endif + + lim_data -= (long) data_space_start; +} + +#else /* not USG */ +#ifdef WINDOWSNT + +static void +get_lim_data () +{ + extern unsigned long reserved_heap_size; + lim_data = reserved_heap_size; +} + +#else +#if !defined (BSD4_2) && !defined (__osf__) + +#ifdef MSDOS +void +get_lim_data () +{ + _go32_dpmi_meminfo info; + + _go32_dpmi_get_free_memory_information (&info); + lim_data = info.available_memory; +} +#else /* not MSDOS */ +static void +get_lim_data () +{ + lim_data = vlimit (LIM_DATA, -1); +} +#endif /* not MSDOS */ + +#else /* BSD4_2 */ + +static void +get_lim_data () +{ + struct rlimit XXrlimit; + + getrlimit (RLIMIT_DATA, &XXrlimit); +#ifdef RLIM_INFINITY + lim_data = XXrlimit.rlim_cur & RLIM_INFINITY; /* soft limit */ +#else + lim_data = XXrlimit.rlim_cur; /* soft limit */ +#endif +} +#endif /* BSD4_2 */ +#endif /* not WINDOWSNT */ +#endif /* not USG */ +#endif /* not NO_LIM_DATA */ + +/* Verify amount of memory available, complaining if we're near the end. */ static void check_memory_limits () @@ -64,14 +156,19 @@ check_memory_limits () register POINTER cp; unsigned long five_percent; unsigned long data_size; + enum warnlevel new_warnlevel; #ifdef HAVE_GETRLIMIT - struct rlimit { - rlim_t rlim_cur; - rlim_t rlim_max; - } rlimit; + struct rlimit rlimit; + + getrlimit (RLIMIT_AS, &rlimit); + + if (RLIM_INFINITY == rlimit.rlim_max) + return; - getrlimit (RLIMIT_DATA, &rlimit); + /* This is a nonsensical case, but it happens -- rms. */ + if (rlimit.rlim_cur > rlimit.rlim_max) + return; five_percent = rlimit.rlim_max / 20; data_size = rlimit.rlim_cur; @@ -93,57 +190,61 @@ check_memory_limits () #endif /* not HAVE_GETRLIMIT */ - if (warn_function) - switch (warnlevel) - { - case 0: - if (data_size > five_percent * 15) - { - warnlevel++; - (*warn_function) ("Warning: past 75% of memory limit"); - } - break; - - case 1: - if (data_size > five_percent * 17) - { - warnlevel++; - (*warn_function) ("Warning: past 85% of memory limit"); - } - break; - - case 2: - if (data_size > five_percent * 19) - { - warnlevel++; - (*warn_function) ("Warning: past 95% of memory limit"); - } - break; - - default: - (*warn_function) ("Warning: past acceptable memory limits"); - break; - } - - /* If we go down below 70% full, issue another 75% warning - when we go up again. */ - if (data_size < five_percent * 14) - warnlevel = 0; - /* If we go down below 80% full, issue another 85% warning - when we go up again. */ - else if (warnlevel > 1 && data_size < five_percent * 16) - warnlevel = 1; - /* If we go down below 90% full, issue another 95% warning - when we go up again. */ - else if (warnlevel > 2 && data_size < five_percent * 18) - warnlevel = 2; + if (!warn_function) + return; + + /* What level of warning does current memory usage demand? */ + if (data_size > five_percent * 19) + new_warnlevel = warned_95; + else if (data_size > five_percent * 17) + new_warnlevel = warned_85; + else if (data_size > five_percent * 15) + new_warnlevel = warned_75; + else + new_warnlevel = not_warned; + + /* If we have gone up a level, give the appropriate warning. */ + if (new_warnlevel > warnlevel || new_warnlevel == warned_95) + { + warnlevel = new_warnlevel; + switch (warnlevel) + { + case warned_75: + (*warn_function) ("Warning: past 75% of memory limit"); + break; + + case warned_85: + (*warn_function) ("Warning: past 85% of memory limit"); + break; + + case warned_95: + (*warn_function) ("Warning: past 95% of memory limit"); + } + } + /* Handle going down in usage levels, with some hysteresis. */ + else + { + /* If we go down below 70% full, issue another 75% warning + when we go up again. */ + if (data_size < five_percent * 14) + warnlevel = not_warned; + /* If we go down below 80% full, issue another 85% warning + when we go up again. */ + else if (warnlevel > warned_75 && data_size < five_percent * 16) + warnlevel = warned_75; + /* If we go down below 90% full, issue another 95% warning + when we go up again. */ + else if (warnlevel > warned_85 && data_size < five_percent * 18) + warnlevel = warned_85; + } if (EXCEEDS_LISP_PTR (cp)) (*warn_function) ("Warning: memory in use exceeds lisp pointer size"); } - -/* Cause reinitialization based on job parameters; - also declare where the end of pure storage is. */ + +/* Enable memory usage warnings. + START says where the end of pure storage is. + WARNFUN specifies the function to call to issue a warning. */ void memory_warnings (start, warnfun) @@ -160,10 +261,8 @@ memory_warnings (start, warnfun) warn_function = warnfun; __after_morecore_hook = check_memory_limits; -#ifdef WINDOWSNT /* Force data limit to be recalculated on each run. */ lim_data = 0; -#endif } /* arch-tag: eab04eda-1f69-447a-8d9f-95f0a3983ca5 -- cgit v1.2.3 From 7857982c9fdd085806380117936fec0f529894e8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:25:03 +0000 Subject: (describe_map): Shorten string to indicate shadowed binding. --- src/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/keymap.c b/src/keymap.c index 03b36d525b..d25bf150b8 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -3371,7 +3371,7 @@ describe_map (map, prefix, elt_describer, partial, shadow, if (vect[i].shadowed) { SET_PT (PT - 1); - insert_string (" (binding currently shadowed)"); + insert_string (" (shadowed)"); SET_PT (PT + 1); } } -- cgit v1.2.3 From 5a893bff84978977970c442f868d16fa06bf53a2 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:25:13 +0000 Subject: *** empty log message *** --- etc/TODO | 4 ++++ lisp/ChangeLog | 14 ++++++++++++++ src/ChangeLog | 2 ++ 3 files changed, 20 insertions(+) (limited to 'src') diff --git a/etc/TODO b/etc/TODO index 34dec4f1de..2f7951e2b4 100644 --- a/etc/TODO +++ b/etc/TODO @@ -60,6 +60,10 @@ to the FSF. ** M-! M-n should fetch the buffer-file-name as the default. +** Redesign the load-history data structure so it can cope better + with evaluating definitions of the same function from different files, + recording which file the latest definition came from. + * Important features: ** Provide user-friendly ways to list all available font families, diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cf9ecfee24..4d0af22c06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2006-03-11 Richard Stallman + + * mail/rmail.el (rmail-ignored-headers): Discard DomainKey-Signature. + + * eshell/eshell.el (eshell-prefer-to-shell): Variable deleted; + the way it is implemented is too unclean. + + * simple.el (kill-region, yank): Doc fix. + + * battery.el (battery-echo-area-format): Doc fix. + (battery-mode-line-format): Likewise. + (battery-linux-proc-apm, battery-linux-proc-acpi): Likewise. + (battery-linux-proc-acpi): Ignore batteries that say "charged". + 2006-03-11 Kurt Hornik * progmodes/octave-mod.el (octave-indent-for-comment): Behave diff --git a/src/ChangeLog b/src/ChangeLog index e83940cecd..f11202c306 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2006-03-11 Richard Stallman + * keymap.c (describe_map): Shorten string to indicate shadowed binding. + * vm-limit.c (get_lim_data, lim_data, data_space_start): Moved from mem-limits.h. (enum warnlevel): New data type. -- cgit v1.2.3 From d0ade325435264931e8e81bdee9dab83d1aa601e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:45:47 +0000 Subject: [HAVE_GETRLIMIT]: Don't define unconditionally. Don't include sys/resource.h unless HAVE_GETRLIMIT is defined. --- src/vm-limit.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/vm-limit.c b/src/vm-limit.c index de31eda0ce..cadfb4cc95 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -32,9 +32,6 @@ typedef void *POINTER; #endif #include "mem-limits.h" -#include - -#define HAVE_GETRLIMIT #ifdef HAVE_GETRLIMIT #include -- cgit v1.2.3 From 9257b6273afb9f97b64fa331623ffc0afdeb5382 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:46:24 +0000 Subject: *** empty log message *** --- etc/PROBLEMS | 4 ++++ src/ChangeLog | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'src') diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 490c59aa92..de0dc31edf 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1217,6 +1217,10 @@ resources to load all the colors it needs. A solution is to exit the offending X programs before starting Emacs. +"undefined color" messages can also occur if the RgbPath entry in the +X configuration file is incorrect, or the rgb.txt file is not where +X expects to find it. + *** Improving performance with slow X connections. There are several ways to improve this performance, any subset of which can diff --git a/src/ChangeLog b/src/ChangeLog index f11202c306..cfac9120ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Eli Zaretskii + + * vm-limit.c [HAVE_GETRLIMIT]: Don't define unconditionally. + Don't include sys/resource.h unless defined. + 2006-03-11 Richard Stallman * keymap.c (describe_map): Shorten string to indicate shadowed binding. -- cgit v1.2.3 From a2a103bbe128dd10d70607e6e40882781154aade Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:00:50 +0000 Subject: (unwind_to_catch): Call x_fully_uncatch_errors only if HAVE_X_WINDOWS. (internal_condition_case, internal_condition_case_1) (internal_condition_case_2): Call x_catching_errors only if HAVE_X_WINDOWS. --- src/eval.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/eval.c b/src/eval.c index 435667e4d5..86ee384896 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1259,9 +1259,11 @@ unwind_to_catch (catch, value) } while (! last_time); +#if HAVE_X_WINDOWS /* If x_catch_errors was done, turn it off now. (First we give unbind_to a chance to do that.) */ x_fully_uncatch_errors (); +#endif byte_stack_list = catch->byte_stack; gcprolist = catch->gcpro; @@ -1441,8 +1443,10 @@ internal_condition_case (bfun, handlers, hfun) /* Since Fsignal will close off all calls to x_catch_errors, we will get the wrong results if some are not closed now. */ +#if HAVE_X_WINDOWS if (x_catching_errors ()) abort (); +#endif c.tag = Qnil; c.val = Qnil; @@ -1487,8 +1491,10 @@ internal_condition_case_1 (bfun, arg, handlers, hfun) /* Since Fsignal will close off all calls to x_catch_errors, we will get the wrong results if some are not closed now. */ +#if HAVE_X_WINDOWS if (x_catching_errors ()) abort (); +#endif c.tag = Qnil; c.val = Qnil; @@ -1536,8 +1542,10 @@ internal_condition_case_2 (bfun, nargs, args, handlers, hfun) /* Since Fsignal will close off all calls to x_catch_errors, we will get the wrong results if some are not closed now. */ +#if HAVE_X_WINDOWS if (x_catching_errors ()) abort (); +#endif c.tag = Qnil; c.val = Qnil; -- cgit v1.2.3 From 8887e8ecde2627de182150b9f29221db71a9567e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:01:21 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 3 +++ src/ChangeLog | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'src') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d0af22c06..346d947e99 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -19,6 +19,9 @@ 2006-03-11 Agustin Martin + * textmodes/ispell.el (ispell-menu-map-needed) [ispell-message]: + Be visible only if major mode is Mail Mode. + * textmodes/flyspell.el (flyspell-external-point-words) (flyspell-process-localwords): Fix last changes. diff --git a/src/ChangeLog b/src/ChangeLog index cfac9120ce..60137731f8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2006-03-11 Eli Zaretskii + * eval.c (unwind_to_catch): Call x_fully_uncatch_errors only if + HAVE_X_WINDOWS. + (internal_condition_case, internal_condition_case_1) + (internal_condition_case_2): Call x_catching_errors only if + HAVE_X_WINDOWS. + * vm-limit.c [HAVE_GETRLIMIT]: Don't define unconditionally. Don't include sys/resource.h unless defined. -- cgit v1.2.3 From 16ca6226363d54b7b21df93311cc684a563e6a05 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:02:38 +0000 Subject: Add x_fully_uncatch_errors and x_catching_errors to the list of unused display error handling functions. --- src/w32term.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/w32term.c b/src/w32term.c index 37139614e2..3ffe00dd31 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -5236,6 +5236,8 @@ x_error_catcher (display, error) x_catch_errors (dpy) x_catch_errors_unwind (old_val) x_check_errors (dpy, format) +x_fully_uncatch_errors () +x_catching_errors () x_had_errors_p (dpy) x_clear_errors (dpy) x_uncatch_errors (dpy, count) -- cgit v1.2.3 From db3c0e9c358cbea65121d8aef50060537a8c6844 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:03:03 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 7 +++++++ src/ChangeLog | 3 +++ 2 files changed, 10 insertions(+) (limited to 'src') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 346d947e99..51c59046cc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 David Ponce + + * ispell.el (ispell-find-aspell-dictionaries): Add aliases before + merging elements from the standard ispell-dictionary-alist. + (ispell-aspell-add-aliases): Add aliases to the passed dictionary + alist, and return the new alist. + 2006-03-11 Richard Stallman * mail/rmail.el (rmail-ignored-headers): Discard DomainKey-Signature. diff --git a/src/ChangeLog b/src/ChangeLog index 60137731f8..59657be1d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2006-03-11 Eli Zaretskii + * w32term.c: Add x_fully_uncatch_errors and x_catching_errors to + the list of unused display error handling functions. + * eval.c (unwind_to_catch): Call x_fully_uncatch_errors only if HAVE_X_WINDOWS. (internal_condition_case, internal_condition_case_1) -- cgit v1.2.3 From e6a0d3ebc8c2bc59f1d98abbc04090e66c0e8d77 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:25:36 +0000 Subject: (x_create_tip_frame): Preserve received parms by copying them. --- src/xfns.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/xfns.c b/src/xfns.c index ede53262f5..2ab185a3c2 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4637,6 +4637,7 @@ x_create_tip_frame (dpyinfo, parms, text) check_x (); + parms = Fcopy_alist (parms); #ifdef MULTI_KBOARD kb = dpyinfo->kboard; -- cgit v1.2.3 From f161146b7eddd861ef6f0537ee5a851a659b2137 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:26:31 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 4 ++++ src/ChangeLog | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'src') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 51c59046cc..15805e16af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Eli Zaretskii + + * simple.el (yank): Fix last change. + 2006-03-11 David Ponce * ispell.el (ispell-find-aspell-dictionaries): Add aliases before diff --git a/src/ChangeLog b/src/ChangeLog index 59657be1d5..80eb880df7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 David Ponce + + * xfns.c (x_create_tip_frame): Preserve received parms by copying + them. + 2006-03-11 Eli Zaretskii * w32term.c: Add x_fully_uncatch_errors and x_catching_errors to -- cgit v1.2.3 From b48f927687d9ec3dc9e9903a059fb471f4b2d165 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:31:39 +0000 Subject: (w32_wnd_proc): Ignore middle and extra button events if a menu is already active (the menubar_active flag is on). --- src/w32fns.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/w32fns.c b/src/w32fns.c index 34450fd521..c116c51603 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -3250,6 +3250,11 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) BOOL up; int button; + /* Ignore middle and extra buttons as long as the menu is active. */ + f = x_window_to_frame (dpyinfo, hwnd); + if (f && f->output_data.w32->menubar_active) + return 0; + if (parse_button (msg, HIWORD (wParam), &button, &up)) { if (up) ReleaseCapture (); -- cgit v1.2.3 From 2c1bd367aad6bd4229f769ef4a50b2e2888bf958 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:32:09 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 5 +++++ src/ChangeLog | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'src') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15805e16af..db6be0a6e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Ryan Yeske + + * mail/rmailsum.el (rmail-summary-next-msg): Skip deleted + messages, where "D" is the 6th character. + 2006-03-11 Eli Zaretskii * simple.el (yank): Fix last change. diff --git a/src/ChangeLog b/src/ChangeLog index 80eb880df7..bef64046ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Eli Zaretskii + + * w32fns.c (w32_wnd_proc): Ignore middle and extra button events + if a menu is already active (the menubar_active flag is on). + 2006-03-11 David Ponce * xfns.c (x_create_tip_frame): Preserve received parms by copying -- cgit v1.2.3 From 66fe93d1c2e84e08577b6bd8666abff0cfcb50dd Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 16:46:38 +0000 Subject: Rename preserve_y to window_scroll_pixel_based_preserve_y. (window_scroll_pixel_based, syms_of_window): Adapt to above change. --- src/window.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/window.c b/src/window.c index cc45394130..c8067f9035 100644 --- a/src/window.c +++ b/src/window.c @@ -217,7 +217,7 @@ int window_deletion_count; /* Used by the function window_scroll_pixel_based */ -static int preserve_y; +static int window_scroll_pixel_based_preserve_y; #if 0 /* This isn't used anywhere. */ /* Nonzero means we can split a frame even if it is "unsplittable". */ @@ -4795,17 +4795,17 @@ window_scroll_pixel_based (window, n, whole, noerror) calls to scroll-up or scroll-down. This avoids the possibility of point becoming "stuck" on a tall line when scrolling by one line. */ - if (preserve_y < 0 + if (window_scroll_pixel_based_preserve_y < 0 || (current_kboard->Vlast_command != Qscroll_up && current_kboard->Vlast_command != Qscroll_down)) { start_display (&it, w, start); move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); - preserve_y = it.current_y; + window_scroll_pixel_based_preserve_y = it.current_y; } } else - preserve_y = -1; + window_scroll_pixel_based_preserve_y = -1; /* Move iterator it from start the specified distance forward or backward. The result is the new window start. */ @@ -4935,12 +4935,13 @@ window_scroll_pixel_based (window, n, whole, noerror) || EQ (Vscroll_preserve_screen_position, Qt))) /* We found PT at a legitimate height. Leave it alone. */ ; - else if (preserve_y >= 0) + else if (window_scroll_pixel_based_preserve_y >= 0) { /* If we have a header line, take account of it. This is necessary because we set it.current_y to 0, above. */ move_it_to (&it, -1, -1, - preserve_y - (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 ), + window_scroll_pixel_based_preserve_y + - (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 ), -1, MOVE_TO_Y); SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); } @@ -4961,7 +4962,8 @@ window_scroll_pixel_based (window, n, whole, noerror) int charpos, bytepos; int partial_p; - /* Save our position, for the preserve_y case. */ + /* Save our position, for the + window_scroll_pixel_based_preserve_y case. */ charpos = IT_CHARPOS (it); bytepos = IT_BYTEPOS (it); @@ -4991,14 +4993,15 @@ window_scroll_pixel_based (window, n, whole, noerror) || EQ (Vscroll_preserve_screen_position, Qt))) /* We found PT before we found the display margin, so PT is ok. */ ; - else if (preserve_y >= 0) + else if (window_scroll_pixel_based_preserve_y >= 0) { SET_TEXT_POS_FROM_MARKER (start, w->start); start_display (&it, w, start); /* It would be wrong to subtract CURRENT_HEADER_LINE_HEIGHT here because we called start_display again and did not alter it.current_y this time. */ - move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); + move_it_to (&it, -1, -1, window_scroll_pixel_based_preserve_y, -1, + MOVE_TO_Y); SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); } else @@ -7025,7 +7028,7 @@ syms_of_window () minibuf_selected_window = Qnil; staticpro (&minibuf_selected_window); - preserve_y = -1; + window_scroll_pixel_based_preserve_y = -1; DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, doc: /* Non-nil means call as function to display a help buffer. -- cgit v1.2.3 From f372bd5b0faf05a3e82bcd79d9bd215aad58d6cb Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 17:00:13 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 4 ++++ src/ChangeLog | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db6be0a6e9..146398f2de 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Luc Teirlinck + + * simple.el (yank): Fix typo in docstring. + 2006-03-11 Ryan Yeske * mail/rmailsum.el (rmail-summary-next-msg): Skip deleted diff --git a/src/ChangeLog b/src/ChangeLog index bef64046ae..389538b161 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Luc Teirlinck + + * window.c: Rename preserve_y to window_scroll_pixel_based_preserve_y. + (window_scroll_pixel_based, syms_of_window): Adapt to above change. + 2006-03-11 Eli Zaretskii * w32fns.c (w32_wnd_proc): Ignore middle and extra button events @@ -39,7 +44,7 @@ * xterm.c (x_fully_uncatch_errors, x_catching_errors): New functions. * eval.c (unwind_to_catch): Call x_fully_uncatch_errors. - (internal_condition_case_1, internal_condition_case_2): + (internal_condition_case_1, internal_condition_case_2): Abort if within unclosed x_catch_errors. 2006-03-11 Romain Francoise -- cgit v1.2.3