From dc7e2b301d8a9348c72faaacced7d1d08100ff88 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Thu, 20 Apr 1995 21:15:39 +0000 Subject: [PATCH] (Fexpand_abbrev): Add some error checking. --- src/abbrev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/abbrev.c b/src/abbrev.c index 244d530c464..e4a33941247 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -229,7 +229,9 @@ Returns t if expansion took place.") expansion". */ value = (MODIFF != oldmodiff ? Qt : Qnil); - if (XBUFFER (Vabbrev_start_location_buffer) != current_buffer) + wordstart = 0; + if (!(BUFFERP (Vabbrev_start_location_buffer) && + XBUFFER (Vabbrev_start_location_buffer) == current_buffer)) Vabbrev_start_location = Qnil; if (!NILP (Vabbrev_start_location)) { @@ -237,10 +239,12 @@ Returns t if expansion took place.") CHECK_NUMBER_COERCE_MARKER (tem, 0); wordstart = XINT (tem); Vabbrev_start_location = Qnil; - if (FETCH_CHAR (wordstart) == '-') + if (wordstart < BEGV || wordstart > ZV) + wordstart = 0; + if (wordstart && wordstart != ZV && FETCH_CHAR (wordstart) == '-') del_range (wordstart, wordstart + 1); } - else + if (!wordstart) wordstart = scan_words (point, -1); if (!wordstart) -- 2.39.5