upstream

9 files changed, 243 insertions, 112 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6ef11faea19..4fbfa52df3a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,30 @@
+2012-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Handle the case where the
+        highlight ends on a newline.  (Bug#10464)
+        (mouse_face_from_buffer_pos): Fix off-by-one error in calculating
+        he end column for display of highlight that ends on a newline
+        before a R2L line.
+
+2012-01-11  Glenn Morris  <rgm@gnu.org>
+
+        * lread.c (init_lread): If no-site-lisp, remove site-lisp dirs
+        from load-path also when installation-directory is nil.  (Bug#10208)
+
+2012-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.c (syms_of_emacs) <installation-directory>: Doc fix.
+
+        * epaths.in (PATH_LOADSEARCH, PATH_EXEC, PATH_DATA, PATH_DOC):
+        Update template values to be closer to their typical values these days.
+
+2012-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Accept additional argument
+        DISP_STRING, and accept any glyph in a row whose object is that
+        string as eligible for mouse highlight.  Fixes mouse highlight of
+        display strings from overlays.  (Bug#10464)
+
 2012-01-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         emacs: fix an auto-save permissions race condition (Bug#10400)
@@ -106,7 +133,7 @@
         (trackingNotification): Surround with ifdef NS_IMPL_COCOA.
         (syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA.
 
-2011-12-18 David Reitter <reitter@cmu.edu>
+2011-12-18  David Reitter  <reitter@cmu.edu>
 
         * nsterm.m (ns_term_init): Subscribe for notifications
         NSMenuDidBeginTrackingNotification and NSMenuDidEndTrackingNotification
@@ -5755,7 +5782,7 @@
         where the include path doesn't have X11/X.h by default.  See
         <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
 
-2011-05-20 Kenichi Handa  <handa@m17n.org>
+2011-05-20  Kenichi Handa  <handa@m17n.org>
 
         * composite.c (find_automatic_composition): Fix previous change.
 
@@ -6097,7 +6124,7 @@
         * lread.c (lisp_file_lexically_bound_p): Stop scanning at end
         marker.  (Bug#8610)
 
-2011-05-05 Eli Zaretskii  <eliz@gnu.org>
+2011-05-05  Eli Zaretskii  <eliz@gnu.org>
 
         * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
         New version that can reserve upto 2GB of heap space.
@@ -8301,7 +8328,7 @@
         are now in src/globals.h.
         (syms_of_minibuf): Remove spurious & from previous change.
 
-2011-03-20  Leo  <sdl.web@gmail.com>
+2011-03-20  Leo Liu  <sdl.web@gmail.com>
 
         * minibuf.c (completing-read-function): New variable.
         (completing-read-default): Rename from completing-read.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 6c361399535..e8bfd964312 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -3538,7 +3538,6 @@
         * nsmenu.m (syms_of_nsmenu):
         * nsfns.m (syms_of_nsfns):
         * msdos.c (syms_of_msdos):
-
         * image.c (syms_of_image):
         * charset.c (syms_of_charset): Use intern_c_string instead of intern.
 
@@ -4388,7 +4387,7 @@
         * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last change.
         Don't make first argument optional.  Doc fix.
 
-2010-09-14  Leo  <sdl.web@gmail.com>  (tiny change)
+2010-09-14  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
         parameters for the doc string.
@@ -29523,7 +29522,7 @@
         (Fdisplay_buffer): Use it.
         (syms_of_window): Export, and initialize it.
 
-2007-09-06  Pixel  <pixel@mandriva.com>  (tiny change)
+2007-09-06  Pascal Rigaux  <pixel@mandriva.com>  (tiny change)
 
         * image.c (gif_load): Fix bug: Handle nonexistent colormap.
 
diff --git a/src/bidi.c b/src/bidi.c
index b59b838d671..107c817abba 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -572,7 +572,7 @@ bidi_cache_find (EMACS_INT charpos, int level, struct bidi_it *bidi_it)
 
       bidi_copy_it (bidi_it, &bidi_cache[i]);
       bidi_cache_last_idx = i;
-      /* Don't let scan direction from from the cached state override
+      /* Don't let scan direction from the cached state override
          the current scan direction.  */
       bidi_it->scan_dir = current_scan_dir;
       return bidi_it->type;
diff --git a/src/dispnew.c b/src/dispnew.c
index 1e33fa60557..88de7361735 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -67,7 +67,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <errno.h>
 
 /* Get number of chars of output now in the buffer of a stdio stream.
-   This ought to be built in in stdio, but it isn't.  Some s- files
+   This ought to be built in stdio, but it isn't.  Some s- files
    override this because their stdio internals differ.  */
 
 #ifdef __GNU_LIBRARY__
diff --git a/src/emacs.c b/src/emacs.c
index 9b5640b6975..3a6620a3777 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2486,9 +2486,11 @@ The value is nil if that directory's name is not known.  */);
 
   DEFVAR_LISP ("installation-directory", Vinstallation_directory,
                doc: /* A directory within which to look for the `lib-src' and `etc' directories.
-This is non-nil when we can't find those directories in their standard
-installed locations, but we can find them near where the Emacs executable
-was found.  */);
+In an installed Emacs, this is normally nil.  It is non-nil if
+both `lib-src' (on MS-DOS, `info') and `etc' directories are found
+within the variable `invocation-directory' or its parent.  For example,
+this is the case when running an uninstalled Emacs executable from its
+build directory.  */);
   Vinstallation_directory = Qnil;
 
   DEFVAR_LISP ("system-messages-locale", Vsystem_messages_locale,
diff --git a/src/epaths.in b/src/epaths.in
index 9ce1cefd211..17cb65a3234 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -19,14 +19,21 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* The default search path for Lisp function "load".
-   This sets load-path.  */
-#define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp"
-
-/* Like PATH_LOADSEARCH, but used only when Emacs is dumping.  This
-   path is usually identical to PATH_LOADSEARCH except that the entry
-   for the directory containing the installed lisp files has been
-   replaced with ../lisp.  */
+/* The default value of load-path, which is the search path for
+   the Lisp function "load".  Configure (using "make epaths-force")
+   sets this to $lisppath, which typically has a value like:
+   <datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp:
+   <datadir>/emacs/VERSION/lisp:<datadir>/emacs/VERSION/leim
+   where datadir is eg /usr/local/share.
+   Configure prepends any $locallisppath, as set by the
+   --enable-locallisppath argument.
+*/
+#define PATH_LOADSEARCH "/usr/local/share/emacs/lisp"
+
+/* Like PATH_LOADSEARCH, but used only during the build process
+   when Emacs is dumping.  Configure (using "make epaths-force") sets
+   this to $buildlisppath, which normally has the value: <srcdir>/lisp.
+*/
 #define PATH_DUMPLOADSEARCH "../lisp"
 
 /* The extra search path for programs to invoke.  This is appended to
@@ -34,12 +41,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    variable exec-path and the first file name in it sets the Lisp
    variable exec-directory.  exec-directory is used for finding
    executables and other architecture-dependent files.  */
-#define PATH_EXEC "/usr/local/lib/emacs/etc"
+#define PATH_EXEC "/usr/local/libexec/emacs"
 
 /* Where Emacs should look for its architecture-independent data
    files, like the NEWS file.  The lisp variable data-directory
    is set to this value.  */
-#define PATH_DATA "/usr/local/lib/emacs/data"
+#define PATH_DATA "/usr/local/share/emacs/etc"
 
 /* Where Emacs should look for X bitmap files.
    The lisp variable x-bitmap-file-path is set based on this value.  */
@@ -47,7 +54,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Where Emacs should look for its docstring file.  The lisp variable
    doc-directory is set to this value.  */
-#define PATH_DOC "/usr/local/lib/emacs/data"
+#define PATH_DOC "/usr/local/share/emacs/etc"
 
 /* Where the configuration process believes the info tree lives.  The
    lisp variable configure-info-directory gets its value from this
diff --git a/src/keyboard.c b/src/keyboard.c
index 394f95bd07c..12eb162df9a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2242,8 +2242,8 @@ do { if (polling_stopped_here) start_polling ();	\
        polling_stopped_here = 0; } while (0)
 
 /* read a character from the keyboard; call the redisplay if needed */
-/* commandflag 0 means do not do auto-saving, but do do redisplay.
-   -1 means do not do redisplay, but do do autosaving.
+/* commandflag 0 means do not autosave, but do redisplay.
+   -1 means do not redisplay, but do autosave.
    1 means do both.  */
 
 /* The arguments MAPS and NMAPS are for menu prompting.
@@ -5143,7 +5143,7 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
 
   if (WINDOWP (window))
     {
-      /* It's a click in window window at frame coordinates (x,y)  */
+      /* It's a click in window WINDOW at frame coordinates (X,Y)  */
       struct window *w = XWINDOW (window);
       Lisp_Object string_info = Qnil;
       EMACS_INT textpos = -1;
diff --git a/src/lread.c b/src/lread.c
index 7b5fc91e991..23cda8eed6d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4109,7 +4109,46 @@ init_lread (void)
   const char *normal;
   int turn_off_warning = 0;
 
-  /* Compute the default load-path.  */
+  /* Compute the default Vload-path, with the following logic:
+     If CANNOT_DUMP just use PATH_LOADSEARCH.
+     Else if purify-flag (ie dumping) start from PATH_DUMPLOADSEARCH;
+     otherwise start from PATH_LOADSEARCH.
+     If !initialized, then just set both Vload_path and dump_path.
+     If initialized, then if Vload_path != dump_path, do nothing.
+     (Presumably the load-path has already been changed by something.)
+     Also do nothing if Vinstallation_directory is nil.
+     Otherwise:
+       Remove site-lisp directories from the front of load-path.
+       Add installation-dir/lisp (if exists and not already a member),
+         at the front, and turn off warnings about missing directories
+         (because we are presumably running uninstalled).
+         If it does not exist, add dump_path at the end instead.
+       Add installation-dir/leim (if exists and not already a member)
+         at the front.
+       Add installation-dir/site-lisp (if !no_site_lisp, and exists
+         and not already a member) at the front.
+       If installation-dir != source-dir (ie running an uninstalled,
+         out-of-tree build) AND install-dir/src/Makefile exists BUT
+         install-dir/src/Makefile.in does NOT exist (this is a sanity
+         check), then repeat the above steps for source-dir/lisp,
+         leim and site-lisp.
+       Finally, add the previously removed site-lisp directories back
+       at the front (if !no_site_lisp).
+
+     We then warn about any of the load-path elements that do not
+     exist.  The only ones that might not exist are those from
+     PATH_LOADSEARCH, and perhaps dump_path.
+
+     Having done all this, we then throw it all away if purify-flag is
+     nil (ie, not dumping) and EMACSLOADPATH is set, and just
+     unconditionally use the latter value instead.
+     So AFAICS the only net results of all the previous steps will be
+     possibly to issue some irrelevant warnings.
+
+     FIXME? There's a case for saying that if we are running
+     uninstalled, the eventual installation directories should not yet
+     be included in load-path.
+  */
 #ifdef CANNOT_DUMP
   normal = PATH_LOADSEARCH;
   Vload_path = decode_env_path (0, normal);
@@ -4119,23 +4158,28 @@ init_lread (void)
   else
     normal = PATH_DUMPLOADSEARCH;
 
-  /* In a dumped Emacs, we normally have to reset the value of
-     Vload_path from PATH_LOADSEARCH, since the value that was dumped
-     uses ../lisp, instead of the path of the installed elisp
-     libraries.  However, if it appears that Vload_path was changed
-     from the default before dumping, don't override that value.  */
+  /* In a dumped Emacs, we normally reset the value of Vload_path using
+     PATH_LOADSEARCH, since the value that was dumped uses lisp/ in
+     the source directory, instead of the path of the installed elisp
+     libraries.  However, if it appears that Vload_path has already been
+     changed from the default that was saved before dumping, don't
+     change it further.  */
   if (initialized)
     {
       if (! NILP (Fequal (dump_path, Vload_path)))
         {
           Vload_path = decode_env_path (0, normal);
-          if (!NILP (Vinstallation_directory))
+          if (no_site_lisp || !NILP (Vinstallation_directory))
             {
               Lisp_Object tem, tem1, sitelisp;
 
-              /* Remove site-lisp dirs from path temporarily and store
-                 them in sitelisp, then conc them on at the end so
-                 they're always first in path.  */
+              /* Remove "site-lisp" dirs from front of path temporarily
+                 and store them in sitelisp, then conc them on at the
+                 end so they're always first in path.
+                 Note that this won't work if you used a
+                 --enable-locallisppath element that does not happen
+                 to contain "site-lisp" in its name.
+              */
               sitelisp = Qnil;
               while (1)
                 {
@@ -4151,96 +4195,99 @@ init_lread (void)
                     break;
                 }
 
-              /* Add to the path the lisp subdir of the
-                 installation dir, if it exists.  */
-              tem = Fexpand_file_name (build_string ("lisp"),
-                                       Vinstallation_directory);
-              tem1 = Ffile_exists_p (tem);
-              if (!NILP (tem1))
-                {
-                  if (NILP (Fmember (tem, Vload_path)))
-                    {
-                      turn_off_warning = 1;
-                      Vload_path = Fcons (tem, Vload_path);
-                    }
-                }
-              else
-                /* That dir doesn't exist, so add the build-time
-                   Lisp dirs instead.  */
-                Vload_path = nconc2 (Vload_path, dump_path);
-
-              /* Add leim under the installation dir, if it exists.  */
-              tem = Fexpand_file_name (build_string ("leim"),
-                                       Vinstallation_directory);
-              tem1 = Ffile_exists_p (tem);
-              if (!NILP (tem1))
-                {
-                  if (NILP (Fmember (tem, Vload_path)))
-                    Vload_path = Fcons (tem, Vload_path);
-                }
-
-              /* Add site-lisp under the installation dir, if it exists.  */
-              if (!no_site_lisp)
+              if (!NILP (Vinstallation_directory))
                 {
-                  tem = Fexpand_file_name (build_string ("site-lisp"),
+                  /* Add to the path the lisp subdir of the
+                     installation dir, if it exists.  */
+                  tem = Fexpand_file_name (build_string ("lisp"),
                                            Vinstallation_directory);
                   tem1 = Ffile_exists_p (tem);
                   if (!NILP (tem1))
                     {
                       if (NILP (Fmember (tem, Vload_path)))
-                        Vload_path = Fcons (tem, Vload_path);
+                        {
+                          turn_off_warning = 1;
+                          Vload_path = Fcons (tem, Vload_path);
+                        }
                     }
-                }
-
-              /* If Emacs was not built in the source directory,
-                 and it is run from where it was built, add to load-path
-                 the lisp, leim and site-lisp dirs under that directory.  */
-
-              if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
-                {
-                  Lisp_Object tem2;
+                  else
+                    /* That dir doesn't exist, so add the build-time
+                       Lisp dirs instead.  */
+                    Vload_path = nconc2 (Vload_path, dump_path);
 
-                  tem = Fexpand_file_name (build_string ("src/Makefile"),
+                  /* Add leim under the installation dir, if it exists.  */
+                  tem = Fexpand_file_name (build_string ("leim"),
                                            Vinstallation_directory);
                   tem1 = Ffile_exists_p (tem);
-
-                  /* Don't be fooled if they moved the entire source tree
-                     AFTER dumping Emacs.  If the build directory is indeed
-                     different from the source dir, src/Makefile.in and
-                     src/Makefile will not be found together.  */
-                  tem = Fexpand_file_name (build_string ("src/Makefile.in"),
-                                           Vinstallation_directory);
-                  tem2 = Ffile_exists_p (tem);
-                  if (!NILP (tem1) && NILP (tem2))
+                  if (!NILP (tem1))
                     {
-                      tem = Fexpand_file_name (build_string ("lisp"),
-                                               Vsource_directory);
-
                       if (NILP (Fmember (tem, Vload_path)))
                         Vload_path = Fcons (tem, Vload_path);
+                    }
 
-                      tem = Fexpand_file_name (build_string ("leim"),
-                                               Vsource_directory);
+                  /* Add site-lisp under the installation dir, if it exists.  */
+                  if (!no_site_lisp)
+                    {
+                      tem = Fexpand_file_name (build_string ("site-lisp"),
+                                               Vinstallation_directory);
+                      tem1 = Ffile_exists_p (tem);
+                      if (!NILP (tem1))
+                        {
+                          if (NILP (Fmember (tem, Vload_path)))
+                            Vload_path = Fcons (tem, Vload_path);
+                        }
+                    }
 
-                      if (NILP (Fmember (tem, Vload_path)))
-                        Vload_path = Fcons (tem, Vload_path);
+                  /* If Emacs was not built in the source directory,
+                     and it is run from where it was built, add to load-path
+                     the lisp, leim and site-lisp dirs under that directory.  */
 
-                      if (!no_site_lisp)
+                  if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
+                    {
+                      Lisp_Object tem2;
+
+                      tem = Fexpand_file_name (build_string ("src/Makefile"),
+                                               Vinstallation_directory);
+                      tem1 = Ffile_exists_p (tem);
+
+                      /* Don't be fooled if they moved the entire source tree
+                         AFTER dumping Emacs.  If the build directory is indeed
+                         different from the source dir, src/Makefile.in and
+                         src/Makefile will not be found together.  */
+                      tem = Fexpand_file_name (build_string ("src/Makefile.in"),
+                                               Vinstallation_directory);
+                      tem2 = Ffile_exists_p (tem);
+                      if (!NILP (tem1) && NILP (tem2))
                         {
-                          tem = Fexpand_file_name (build_string ("site-lisp"),
+                          tem = Fexpand_file_name (build_string ("lisp"),
+                                                   Vsource_directory);
+
+                          if (NILP (Fmember (tem, Vload_path)))
+                            Vload_path = Fcons (tem, Vload_path);
+
+                          tem = Fexpand_file_name (build_string ("leim"),
                                                    Vsource_directory);
 
                           if (NILP (Fmember (tem, Vload_path)))
                             Vload_path = Fcons (tem, Vload_path);
+
+                          if (!no_site_lisp)
+                            {
+                              tem = Fexpand_file_name (build_string ("site-lisp"),
+                                                       Vsource_directory);
+
+                              if (NILP (Fmember (tem, Vload_path)))
+                                Vload_path = Fcons (tem, Vload_path);
+                            }
                         }
-                    }
-                }
+                    } /* Vinstallation_directory != Vsource_directory */
+                }     /* if Vinstallation_directory */
               if (!NILP (sitelisp) && !no_site_lisp)
                 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path);
-            }
-        }
+            } /* if Vinstallation_directory || no_site_lisp */
+        }     /* if dump_path == Vload_path */
     }
-  else
+  else                          /* !initialized */
     {
       /* NORMAL refers to the lisp dir in the source directory.  */
       /* We used to add ../lisp at the front here, but
@@ -4250,7 +4297,7 @@ init_lread (void)
       Vload_path = decode_env_path (0, normal);
       dump_path = Vload_path;
     }
-#endif
+#endif  /* CANNOT_DUMP */
 
 #if (!(defined (WINDOWSNT) || (defined (HAVE_NS))))
   /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
@@ -4258,6 +4305,8 @@ init_lread (void)
      confuses users.  Since PATH_LOADSEARCH is always overridden by the
      EMACSLOADPATH environment variable below, disable the warning on NT.  */
 
+  /* HAVE_NS also uses EMACSLOADPATH.  */
+
   /* Warn if dirs in the *standard* path don't exist.  */
   if (!turn_off_warning)
     {
@@ -4272,6 +4321,10 @@ init_lread (void)
           if (STRINGP (dirfile))
             {
               dirfile = Fdirectory_file_name (dirfile);
+              /* Do we really need to warn about missing site-lisp dirs?
+                 It's true that the installation should have created
+                 them and added subdirs.el, but it's harmless if they
+                 are not there.  */
               if (access (SSDATA (dirfile), 0) < 0)
                 dir_warning ("Warning: Lisp directory `%s' does not exist.\n",
                              XCAR (path_tail));
diff --git a/src/xdisp.c b/src/xdisp.c
index 214cf4c7120..e4a043c4c7b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26055,12 +26055,14 @@ cursor_in_mouse_face_p (struct window *w)
 
 /* Find the glyph rows START_ROW and END_ROW of window W that display
    characters between buffer positions START_CHARPOS and END_CHARPOS
-   (excluding END_CHARPOS).  This is similar to row_containing_pos,
-   but is more accurate when bidi reordering makes buffer positions
-   change non-linearly with glyph rows.  */
+   (excluding END_CHARPOS).  DISP_STRING is a display string that
+   covers these buffer positions.  This is similar to
+   row_containing_pos, but is more accurate when bidi reordering makes
+   buffer positions change non-linearly with glyph rows.  */
 static void
 rows_from_pos_range (struct window *w,
                      EMACS_INT start_charpos, EMACS_INT end_charpos,
+                     Lisp_Object disp_string,
                      struct glyph_row **start, struct glyph_row **end)
 {
   struct glyph_row *first = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
@@ -26112,8 +26114,11 @@ rows_from_pos_range (struct window *w,
 
           while (g < e)
             {
-              if ((BUFFERP (g->object) || INTEGERP (g->object))
-                  && start_charpos <= g->charpos && g->charpos < end_charpos)
+              if (((BUFFERP (g->object) || INTEGERP (g->object))
+                   && start_charpos <= g->charpos && g->charpos < end_charpos)
+                  /* A glyph that comes from DISP_STRING is by
+                     definition to be highlighted.  */
+                  || EQ (g->object, disp_string))
                 *start = row;
               g++;
             }
@@ -26132,14 +26137,15 @@ rows_from_pos_range (struct window *w,
   for ( ; row->enabled_p && MATRIX_ROW_BOTTOM_Y (row) <= last_y; row++)
     {
       struct glyph_row *next = row + 1;
+      EMACS_INT next_start = MATRIX_ROW_START_CHARPOS (next);
 
       if (!next->enabled_p
           || next >= MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w)
           /* The first row >= START whose range of displayed characters
              does NOT intersect the range [START_CHARPOS..END_CHARPOS]
              is the row END + 1.  */
-          || (start_charpos < MATRIX_ROW_START_CHARPOS (next)
-              && end_charpos < MATRIX_ROW_START_CHARPOS (next))
+          || (start_charpos < next_start
+              && end_charpos < next_start)
           || ((start_charpos > MATRIX_ROW_END_CHARPOS (next)
                || (start_charpos == MATRIX_ROW_END_CHARPOS (next)
                    && !next->ends_at_zv_p
@@ -26158,12 +26164,29 @@ rows_from_pos_range (struct window *w,
              but none of the characters it displays are in the range, it is
              also END + 1. */
           struct glyph *g = next->glyphs[TEXT_AREA];
+          struct glyph *s = g;
           struct glyph *e = g + next->used[TEXT_AREA];
 
           while (g < e)
             {
-              if ((BUFFERP (g->object) || INTEGERP (g->object))
-                  && start_charpos <= g->charpos && g->charpos < end_charpos)
+              if (((BUFFERP (g->object) || INTEGERP (g->object))
+                   && (start_charpos <= g->charpos && g->charpos < end_charpos
+                       /* If the buffer position of the first glyph in
+                          the row is equal to END_CHARPOS, it means
+                          the last character to be highlighted is the
+                          newline of ROW, and we must consider NEXT as
+                          END, not END+1.  */
+                       || ((!next->reversed_p && g == s
+                            || next->reversed_p && g == e - 1)
+                           && (g->charpos == end_charpos
+                               /* Special case for when NEXT is an
+                                  empty line at ZV.  */
+                               || (g->charpos == -1
+                                   && !row->ends_at_zv_p
+                                   && next_start == end_charpos)))))
+                  /* A glyph that comes from DISP_STRING is by
+                     definition to be highlighted.  */
+                  || EQ (g->object, disp_string))
                 break;
               g++;
             }
@@ -26172,6 +26195,13 @@ rows_from_pos_range (struct window *w,
               *end = row;
               break;
             }
+          /* The first row that ends at ZV must be the last to be
+             highlighted.  */
+          else if (next->ends_at_zv_p)
+            {
+              *end = next;
+              break;
+            }
         }
     }
 }
@@ -26207,7 +26237,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
   xassert (NILP (after_string) || STRINGP (after_string));
 
   /* Find the rows corresponding to START_CHARPOS and END_CHARPOS.  */
-  rows_from_pos_range (w, start_charpos, end_charpos, &r1, &r2);
+  rows_from_pos_range (w, start_charpos, end_charpos, disp_string, &r1, &r2);
   if (r1 == NULL)
     r1 = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
   /* If the before-string or display-string contains newlines,
@@ -26485,6 +26515,19 @@ mouse_face_from_buffer_pos (Lisp_Object window,
             }
           x += end->pixel_width;
         }
+      /* If we exited the above loop because we arrived at the last
+         glyph of the row, and its buffer position is still not in
+         range, it means the last character in range is the preceding
+         newline.  Bump the end column and x values to get past the
+         last glyph.  */
+      if (end == glyph
+          && BUFFERP (end->object)
+          && (end->charpos < start_charpos
+              || end->charpos >= end_charpos))
+        {
+          x += end->pixel_width;
+          ++end;
+        }
       hlinfo->mouse_face_end_x = x;
       hlinfo->mouse_face_end_col = end - r2->glyphs[TEXT_AREA];
     }