From: Paul Eggert Date: Sun, 30 Jun 2013 15:14:45 +0000 (-0700) Subject: * intervals.c (get_local_map): Actually clip POSITION X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1978 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6c6c8c7748471aec72f2e98ade5416e19a20e61;p=emacs.git * intervals.c (get_local_map): Actually clip POSITION Fixes: debbugs:14753 --- diff --git a/src/ChangeLog b/src/ChangeLog index 753f0b9826d..ad4b0d72400 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-06-30 Paul Eggert + + * intervals.c (get_local_map): Actually clip POSITION (Bug#14753). + 2013-06-30 Eli Zaretskii * intervals.c (get_local_map): Instead of aborting, clip POSITION diff --git a/src/intervals.c b/src/intervals.c index 0b3bcc6ef4e..f2ddcd01507 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -2199,13 +2199,12 @@ get_property_and_range (ptrdiff_t pos, Lisp_Object prop, Lisp_Object *val, `local-map' use BUFFER's local map. */ Lisp_Object -get_local_map (register ptrdiff_t position, register struct buffer *buffer, - Lisp_Object type) +get_local_map (ptrdiff_t position, struct buffer *buffer, Lisp_Object type) { Lisp_Object prop, lispy_position, lispy_buffer; ptrdiff_t old_begv, old_zv, old_begv_byte, old_zv_byte; - clip_to_bounds (BUF_BEGV (buffer), position, BUF_ZV (buffer)); + position = clip_to_bounds (BUF_BEGV (buffer), position, BUF_ZV (buffer)); /* Ignore narrowing, so that a local map continues to be valid even if the visible region contains no characters and hence no properties. */