[Emacs-diffs] trunk r113233: * intervals.c (get_local_map): Actually clip POSITION

[Paul Eggert]

------------------------------------------------------------
revno: 113233
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14753
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-30 08:14:45 -0700
message:
  * intervals.c (get_local_map): Actually clip POSITION
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/intervals.c                intervals.c-20091113204419-o5vbwnq5f7feedwu-519

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-30 15:03:31 +0000
+++ b/src/ChangeLog     2013-06-30 15:14:45 +0000
@@ -1,3 +1,7 @@
+2013-06-30  Paul Eggert  <address@hidden>
+
+       * intervals.c (get_local_map): Actually clip POSITION (Bug#14753).
+
 2013-06-30  Eli Zaretskii  <address@hidden>
 
        * intervals.c (get_local_map): Instead of aborting, clip POSITION

=== modified file 'src/intervals.c'
--- a/src/intervals.c   2013-06-30 15:03:31 +0000
+++ b/src/intervals.c   2013-06-30 15:14:45 +0000
@@ -2199,13 +2199,12 @@
    `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.  */