* intervals.c (get_local_map): Actually clip POSITION

Fixes: debbugs:14753

diff --git a/src/ChangeLog b/src/ChangeLog
index 753f0b9826d652902ec0f2333628a844d68ce166..ad4b0d72400e29e774004a9d311222085b29a4a2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * intervals.c (get_local_map): Actually clip POSITION (Bug#14753).
+
 2013-06-30  Eli Zaretskii  <eliz@gnu.org>
 
        * intervals.c (get_local_map): Instead of aborting, clip POSITION

diff --git a/src/intervals.c b/src/intervals.c
index 0b3bcc6ef4ebfb8c0555a8a829deb71e38ec65f4..f2ddcd01507727f2ee90bc9f84cad2991ecfe456 100644 (file)
--- 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.  */