From 455316e213b0cadbba0545a095243f90e242d16a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 22 Jan 2004 15:28:25 +0000 Subject: *** empty log message *** --- src/ChangeLog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 4fba5e166b3..3f6f23e1395 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2004-01-21 Stefan Monnier + * keyboard.c (kbd_buffer_gcpro): Remove. + (kbd_buffer_store_event, clear_event, Fdiscard_input) + (stuff_buffered_input, init_keyboard, syms_of_keyboard): + Don't initialize and/or maintain the variable any more. It was made + redundant by my commit of 2003-06-15. + * lisp.h [USE_LSB_TAG && !DECL_ALIGN]: Signal an error. 2004-01-21 Jan Dj,Ad(Brv @@ -630,6 +636,13 @@ 2003-11-17 Stefan Monnier + * alloc.c (make_float, Fcons): Clear the markbit at init time. + (make_float, Fcons, Fmake_symbol, allocate_misc): Move the increment + of block_index outside of the macro call. + (Fgarbage_collect): Remove null code. + + * m/amdx86-64.h: Don't redefine XPNTR. + * keyboard.c (parse_modifiers, apply_modifiers): Use INTMASK instead of VALMASK. -- cgit v1.2.1 From fe905025d02b1bea377447bd1282f7fcd32f918e Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 23 Jan 2004 00:14:48 +0000 Subject: (Fmd5): If OBJECT is a buffer different from the current one, set buffer to OBJECT temporarily. --- src/ChangeLog | 5 +++++ src/fns.c | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 3f6f23e1395..a15f25fbde8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-01-23 Kenichi Handa + + * fns.c (Fmd5): If OBJECT is a buffer different from the current + one, set buffer to OBJECT temporarily. + 2004-01-21 Stefan Monnier * keyboard.c (kbd_buffer_gcpro): Remove. diff --git a/src/fns.c b/src/fns.c index ff40c706edd..6383e09302b 100644 --- a/src/fns.c +++ b/src/fns.c @@ -5454,12 +5454,18 @@ guesswork fails. Normally, an error is signaled in such case. */) } else { + struct buffer *prev = current_buffer; + + record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); + CHECK_BUFFER (object); bp = XBUFFER (object); + if (bp != current_buffer) + set_buffer_internal (bp); if (NILP (start)) - b = BUF_BEGV (bp); + b = BEGV; else { CHECK_NUMBER_COERCE_MARKER (start); @@ -5467,7 +5473,7 @@ guesswork fails. Normally, an error is signaled in such case. */) } if (NILP (end)) - e = BUF_ZV (bp); + e = ZV; else { CHECK_NUMBER_COERCE_MARKER (end); @@ -5477,7 +5483,7 @@ guesswork fails. Normally, an error is signaled in such case. */) if (b > e) temp = b, b = e, e = temp; - if (!(BUF_BEGV (bp) <= b && e <= BUF_ZV (bp))) + if (!(BEGV <= b && e <= ZV)) args_out_of_range (start, end); if (NILP (coding_system)) @@ -5544,6 +5550,11 @@ guesswork fails. Normally, an error is signaled in such case. */) } object = make_buffer_string (b, e, 0); + if (prev != current_buffer) + set_buffer_internal (prev); + /* Discard the unwind protect for recovering the current + buffer. */ + specpdl_ptr--; if (STRING_MULTIBYTE (object)) object = code_convert_string1 (object, coding_system, Qnil, 1); -- cgit v1.2.1