Merge from trunk.

15 files changed, 89 insertions, 90 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 10a0d5e7a91..029406e2d30 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (Other Gnus Versions): Remove.
+
 2011-10-28  Alan Mackenzie  <acm@muc.de>
 
 	* cc-mode.texi (Indentation Commands): Mention "macros with semicolons".
@@ -6,9 +10,8 @@
 	"Macros with ;".
 	(Macros with ;): New page.
 
-	* progmodes/cc-mode.texi (Movement Commands): Document
-	`c-defun-tactic'.  Document the new handling of nested scopes for
-	movement by defuns.
+	* cc-mode.texi (Movement Commands): Document `c-defun-tactic'.
+	Document the new handling of nested scopes for movement by defuns.
 
 2011-10-23  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index ad1d45cca1a..70ed62ddfa9 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -891,7 +891,6 @@ Appendices
 History
 
 * Gnus Versions::               What Gnus versions have been released.
-* Other Gnus Versions::         Other Gnus versions that also have been released.
 * Why?::                        What's the point of Gnus?
 * Compatibility::               Just how compatible is Gnus with @sc{gnus}?
 * Conformity::                  Gnus tries to conform to all standards.
@@ -26382,7 +26381,6 @@ renamed it back again to ``Gnus''.  But in mixed case.  ``Gnus'' vs.
 
 @menu
 * Gnus Versions::               What Gnus versions have been released.
-* Other Gnus Versions::         Other Gnus versions that also have been released.
 * Why?::                        What's the point of Gnus?
 * Compatibility::               Just how compatible is Gnus with @sc{gnus}?
 * Conformity::                  Gnus tries to conform to all standards.
@@ -26438,22 +26436,6 @@ you do, don't run.  Walk away, calmly, until you're out of its reach.
 Find a proper released version of Gnus and snuggle up to that instead.
 
 
-@node Other Gnus Versions
-@subsection Other Gnus Versions
-@cindex Semi-gnus
-
-In addition to the versions of Gnus which have had their releases
-coordinated by Lars, one major development has been Semi-gnus from
-Japan.  It's based on a library called @acronym{SEMI}, which provides
-@acronym{MIME} capabilities.
-
-These Gnusae are based mainly on Gnus 5.6 and Pterodactyl Gnus.
-Collectively, they are called ``Semi-gnus'', and different strains are
-called T-gnus, ET-gnus, Nana-gnus and Chaos.  These provide powerful
-@acronym{MIME} and multilingualization things, especially important for
-Japanese users.
-
-
 @node Why?
 @subsection Why?
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97ae0232d55..4591b9b9281 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-02  Juanma Barranquero  <lekktu@gmail.com>
+
+	* vc/vc-bzr.el (vc-bzr-state, vc-bzr-after-dir-status):
+	Accept status with more than 9 shelves.  (Bug#9935)
+	Reported by Colin D Bennett <colin@gibibit.com>.
+
+2011-11-01  Martin Rudalics  <rudalics@gmx.at>
+
+	* help.el (with-help-window): Don't reference
+	temp-buffer-show-specifiers in doc-string.
+
 2011-10-31  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* subr.el (keymap--menu-item-with-binding): Ignore item if not a
@@ -14,8 +25,8 @@
 	* net/newst-treeview.el: Remove "Time-stamp".
 	(newsticker--group-manage-orphan-feeds): Do not call
 	newsticker--treeview-tree-update.
-	(newsticker-treeview-update, newsticker-treeview): Call
-	newsticker--treeview-tree-update if necessary.
+	(newsticker-treeview-update, newsticker-treeview):
+	Call newsticker--treeview-tree-update if necessary.
 
 2011-10-30  Martin Rudalics  <rudalics@gmx.at>
 
@@ -28,8 +39,7 @@
 	(split-window, balance-windows-1)
 	(shrink-window-if-larger-than-buffer):
 	* calendar/calendar.el (calendar-generate-window):
-	* help.el (resize-temp-buffer-window): Adjust callers
-	accordingly.
+	* help.el (resize-temp-buffer-window): Adjust callers accordingly.
 
 2011-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -104,7 +114,7 @@
 
 2011-10-28  Alan Mackenzie  <acm@muc.de>
 
-	* progmodes/cc-defs.el (c-version).  -> 5.32.2.
+	* progmodes/cc-defs.el (c-version): -> 5.32.2.
 
 2011-10-28  Alan Mackenzie  <acm@muc.de>
 
@@ -292,7 +302,7 @@
 	Fix bug #9560, sporadic wrong indentation; improve instrumentation
 	of c-parse-state.
 
-	* cc-engine.el (c-append-lower-brace-pair-to-state-cache):
+	* progmodes/cc-engine.el (c-append-lower-brace-pair-to-state-cache):
 	correct faulty logical expression.
 	(c-parse-state-state, c-record-parse-state-state):
 	(c-replay-parse-state-state): New defvar/defuns.
@@ -334,7 +344,7 @@
 
 2011-10-20  Glenn Morris  <rgm@gnu.org>
 
-	* vc/vc.el (vc-next-action): Handle removed directories. (Bug#9781)
+	* vc/vc.el (vc-next-action): Handle removed directories.  (Bug#9781)
 
 2011-10-20  Christoph Scholtes  <cschol2112@googlemail.com>
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7519252f037..a208ccefd4c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2011-10-31  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-util.el (gnus-bound-and-true-dumber-p): Define new, slower, dumb
+	function because `gnus-bound-and-true-p' doesn't work well in XEmacs
+	for reasons unknown.
+	* nnir.el: Use it.
+	* nnmairix.el: Use it.
+
+	* nnregistry.el: Remove unnecessary `gnus-registry-enabled' defvar.
+	* nnir.el: Ditto.
+	* nnmairix.el: Ditto.
+
+	* gnus-registry.el (gnus-registry-enabled): Default to nil.
+
 2011-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* message.el (message-completion-function): Make sure
@@ -25,7 +39,7 @@
 	* nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy.
 	* nnmairix.el (gnus-registry-enabled): Ditto.
 
-2011-10-17  Dave Abrahams  <dave@boostpro.com>
+2011-10-17  Dave Abrahams  <dave@boostpro.com>  (tiny change)
 
 	* gnus-registry.el (gnus-registry-enabled): Add new variable. (Bug#9691)
 	(gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 652e816e56a..d25b8b1d24b 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -164,7 +164,7 @@ nnmairix groups are specifically excluded because they are ephemeral."
                  (const :tag "Always Install" t)
                  (const :tag "Ask Me" ask)))
 
-(defvar gnus-registry-enabled)
+(defvar gnus-registry-enabled nil)
 
 (defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning.
 
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 9c5e6e8312b..71ed50591ad 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1994,6 +1994,9 @@ definitions to shadow the loaded ones for use in file byte-compilation."
       "Return the value of symbol VAR if it is bound, else nil."
       `(and (boundp (quote ,var)) ,var))))
 
+(defun gnus-bound-and-true-dumber-p (sym)
+  (and (boundp sym) (symbol-value sym)))
+
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 2d3c05864e8..7087f8dba96 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -292,9 +292,6 @@ is `(valuefunc member)'."
   (autoload 'nnimap-make-thread-query "nnimap")
   (autoload 'gnus-registry-action "gnus-registry"))
 
-;; Suppress byte-compiler warning `reference to free variable'
-(defvar gnus-registry-enabled)
-
 (nnoo-declare nnir)
 (nnoo-define-basics nnir)
 
@@ -1742,7 +1739,7 @@ environment unless `not-global' is non-nil."
   (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir)
     (setq gnus-summary-line-format
 	  (or nnir-summary-line-format gnus-summary-line-format))
-    (when (gnus-bound-and-true-p gnus-registry-enabled)
+    (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled)
       (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t)
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 1bf28c5d32f..0e58af73666 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -605,9 +605,6 @@ Other back ends might or might not work.")
 ;; Silence byte-compiler.
 (autoload 'gnus-registry-get-id-key "gnus-registry")
 
-;; Suppress byte-compiler warning `reference to free variable'
-(defvar gnus-registry-enabled)
-
 (deffoo nnmairix-request-set-mark (group actions &optional server)
   (when server
     (nnmairix-open-server server))
@@ -1638,7 +1635,7 @@ search in raw mode."
 
 (defun nnmairix-determine-original-group-from-registry (mid)
   "Try to determinale original group for message-id MID from the registry."
-  (when (gnus-bound-and-true-p gnus-registry-enabled)
+  (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled)
     (unless (string-match "^<" mid)
       (set mid (concat "<" mid)))
     (unless (string-match ">$" mid)
diff --git a/lisp/gnus/nnregistry.el b/lisp/gnus/nnregistry.el
index 75a640a428a..2001f8f2366 100644
--- a/lisp/gnus/nnregistry.el
+++ b/lisp/gnus/nnregistry.el
@@ -36,9 +36,6 @@
 
 (nnoo-declare nnregistry)
 
-;; Suppress byte-compiler warning `reference to free variable'
-(defvar gnus-registry-enabled)
-
 (deffoo nnregistry-server-opened (server)
   gnus-registry-enabled)
 
diff --git a/lisp/help.el b/lisp/help.el
index bc3d863f357..506889c210e 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1125,10 +1125,7 @@ HELP-WINDOW is the window used for displaying the help buffer."
 (defmacro with-help-window (buffer-name &rest body)
   "Display buffer with name BUFFER-NAME in a help window evaluating BODY.
 Select help window if the actual value of the user option
-`help-window-select' says so.  Return last value in BODY.
-
-You can specify where and how to show the buffer by binding the
-variable `temp-buffer-show-specifiers' to an appropriate value."
+`help-window-select' says so.  Return last value in BODY."
   (declare (indent 1) (debug t))
   `(progn
      ;; Make `help-window-point-marker' point nowhere.  The only place
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index cc28db689e9..f6b6a56f31c 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -444,7 +444,7 @@ If any error occurred in running `bzr status', then return nil."
       (let ((warnings (cdr result)))
         (when warnings
           ;; bzr 2.3.0 returns info about shelves, which is not really a warning
-          (when (string-match "[1-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings)
+          (when (string-match "[0-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings)
             (setq warnings (replace-match "" nil nil warnings)))
           (unless (string= warnings "")
             (message "Warnings in `bzr' output: %s" warnings))))
@@ -891,7 +891,7 @@ stream.  Standard error output is discarded."
       (goto-char (point-min))
       (while (not (eobp))
         ;; Bzr 2.3.0 added this if there are shelves.  (Bug#8170)
-        (unless (looking-at "[1-9]+ shel\\(f\\|ves\\) exists?\\.")
+        (unless (looking-at "[0-9]+ shel\\(f\\|ves\\) exists?\\.")
           (setq status-str
                 (buffer-substring-no-properties (point) (+ (point) 3)))
           (setq translated (cdr (assoc status-str translation)))
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index ed16ee9f6f8..82eb8783a74 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -992,8 +992,8 @@ specific headers."
   (let ((def-dir default-directory)
 	(backend vc-dir-backend))
     (vc-set-mode-line-busy-indicator)
-    ;; Call the `dir-status-file' backend function.
-    ;; `dir-status-file' is supposed to be asynchronous.
+    ;; Call the `dir-status-files' backend function.
+    ;; `dir-status-files' is supposed to be asynchronous.
     ;; It should compute the results, and then call the function
     ;; passed as an argument in order to update the vc-dir buffer
     ;; with the results.
diff --git a/src/ChangeLog b/src/ChangeLog
index 0b4da8f5e40..eb71bfc62ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-10-29  Paul Eggert  <eggert@cs.ucla.edu>
+2011-11-02  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix integer width and related bugs (Bug#9874).
 	* alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -786,6 +786,20 @@
 	rather than rolling our own approximation.
 	(SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
+	Don't stop backward scan on the continuation glyph, even though
+	its CHARPOS is positive.
+	(mouse_face_from_buffer_pos, note_mouse_highlight): Rename
+	cover_string to disp_string.
+
+2011-11-01  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.c (temp_output_buffer_show): Don't use
+	Vtemp_buffer_show_specifiers.
+	(Vtemp_buffer_show_specifiers): Remove unused variable.
+
 2011-10-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
diff --git a/src/window.c b/src/window.c
index d9ef9d090ae..5ed7db2c916 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3186,10 +3186,7 @@ temp_output_buffer_show (register Lisp_Object buf)
     call1 (Vtemp_buffer_show_function, buf);
   else
     {
-      window = display_buffer (buf, Vtemp_buffer_show_specifiers, Qnil);
-      /* Reset Vtemp_buffer_show_specifiers immediately so it won't
-	 affect subsequent calls.  */
-      Vtemp_buffer_show_specifiers = Qnil;
+      window = display_buffer (buf, Qnil, Qnil);
 
       if (!EQ (XWINDOW (window)->frame, selected_frame))
 	Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
@@ -6462,16 +6459,6 @@ If this function is used, then it must do the entire job of showing
 the buffer; `temp-buffer-show-hook' is not run unless this function runs it.  */);
   Vtemp_buffer_show_function = Qnil;
 
-  DEFVAR_LISP ("temp-buffer-show-specifiers", Vtemp_buffer_show_specifiers,
-	       doc: /* Buffer display specifiers used by `with-output-to-temp-buffer'.
-These specifiers are passed by `with-output-to-temp-buffer' as second
-argument to `display-buffer'.  Applications should only let-bind this
-around a call to `with-output-to-temp-buffer'.
-
-For a description of buffer display specifiers see the variable
-`display-buffer-alist'.  */);
-  Vtemp_buffer_show_specifiers = Qnil;
-
   DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window,
 	       doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll.  */);
   Vminibuf_scroll_window = Qnil;
diff --git a/src/xdisp.c b/src/xdisp.c
index a177a8aca87..698f217f240 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25813,7 +25813,7 @@ rows_from_pos_range (struct window *w,
    for the overlay or run of text properties specifying the mouse
    face.  BEFORE_STRING and AFTER_STRING, if non-nil, are a
    before-string and after-string that must also be highlighted.
-   COVER_STRING, if non-nil, is a display string that may cover some
+   DISP_STRING, if non-nil, is a display string that may cover some
    or all of the highlighted text.  */
 
 static void
@@ -25824,7 +25824,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
 			    ptrdiff_t end_charpos,
 			    Lisp_Object before_string,
 			    Lisp_Object after_string,
-			    Lisp_Object cover_string)
+			    Lisp_Object disp_string)
 {
   struct window *w = XWINDOW (window);
   struct glyph_row *first = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
@@ -25833,7 +25833,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
   ptrdiff_t ignore, pos;
   int x;
 
-  xassert (NILP (cover_string) || STRINGP (cover_string));
+  xassert (NILP (disp_string) || STRINGP (disp_string));
   xassert (NILP (before_string) || STRINGP (before_string));
   xassert (NILP (after_string) || STRINGP (after_string));
 
@@ -25843,7 +25843,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
     r1 = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
   /* If the before-string or display-string contains newlines,
      rows_from_pos_range skips to its last row.  Move back.  */
-  if (!NILP (before_string) || !NILP (cover_string))
+  if (!NILP (before_string) || !NILP (disp_string))
     {
       struct glyph_row *prev;
       while ((prev = r1 - 1, prev >= first)
@@ -25855,7 +25855,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
 	  while (--glyph >= beg && INTEGERP (glyph->object));
 	  if (glyph < beg
 	      || !(EQ (glyph->object, before_string)
-		   || EQ (glyph->object, cover_string)))
+		   || EQ (glyph->object, disp_string)))
 	    break;
 	  r1 = prev;
 	}
@@ -25880,10 +25880,10 @@ mouse_face_from_buffer_pos (Lisp_Object window,
 	r2 = next;
     }
   /* The rest of the display engine assumes that mouse_face_beg_row is
-     either above below mouse_face_end_row or identical to it.  But
-     with bidi-reordered continued lines, the row for START_CHARPOS
-     could be below the row for END_CHARPOS.  If so, swap the rows and
-     store them in correct order.  */
+     either above mouse_face_end_row or identical to it.  But with
+     bidi-reordered continued lines, the row for START_CHARPOS could
+     be below the row for END_CHARPOS.  If so, swap the rows and store
+     them in correct order.  */
   if (r1->y > r2->y)
     {
       struct glyph_row *tem = r2;
@@ -25898,7 +25898,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
   hlinfo->mouse_face_end_row = MATRIX_ROW_VPOS (r2, w->current_matrix);
 
   /* For a bidi-reordered row, the positions of BEFORE_STRING,
-     AFTER_STRING, COVER_STRING, START_CHARPOS, and END_CHARPOS
+     AFTER_STRING, DISP_STRING, START_CHARPOS, and END_CHARPOS
      could be anywhere in the row and in any order.  The strategy
      below is to find the leftmost and the rightmost glyph that
      belongs to either of these 3 strings, or whose position is
@@ -25924,11 +25924,11 @@ mouse_face_from_buffer_pos (Lisp_Object window,
 	  x += glyph->pixel_width;
 
       /* Scan the glyph row, looking for BEFORE_STRING, AFTER_STRING,
-	 or COVER_STRING, and the first glyph from buffer whose
+	 or DISP_STRING, and the first glyph from buffer whose
 	 position is between START_CHARPOS and END_CHARPOS.  */
       for (; glyph < end
 	     && !INTEGERP (glyph->object)
-	     && !EQ (glyph->object, cover_string)
+	     && !EQ (glyph->object, disp_string)
 	     && !(BUFFERP (glyph->object)
 		  && (glyph->charpos >= start_charpos
 		      && glyph->charpos < end_charpos));
@@ -25975,11 +25975,11 @@ mouse_face_from_buffer_pos (Lisp_Object window,
 	  ;
 
       /* Scan the glyph row, looking for BEFORE_STRING, AFTER_STRING,
-	 or COVER_STRING, and the first glyph from buffer whose
+	 or DISP_STRING, and the first glyph from buffer whose
 	 position is between START_CHARPOS and END_CHARPOS.  */
       for (; glyph > end
 	     && !INTEGERP (glyph->object)
-	     && !EQ (glyph->object, cover_string)
+	     && !EQ (glyph->object, disp_string)
 	     && !(BUFFERP (glyph->object)
 		  && (glyph->charpos >= start_charpos
 		      && glyph->charpos < end_charpos));
@@ -26035,17 +26035,16 @@ mouse_face_from_buffer_pos (Lisp_Object window,
 	 row, and also blanks and stretch glyphs inserted by
 	 extend_face_to_end_of_line.  */
       while (end > glyph
-	     && INTEGERP ((end - 1)->object)
-	     && (end - 1)->charpos <= 0)
+	     && INTEGERP ((end - 1)->object))
 	--end;
       /* Scan the rest of the glyph row from the end, looking for the
 	 first glyph that comes from BEFORE_STRING, AFTER_STRING, or
-	 COVER_STRING, or whose position is between START_CHARPOS
+	 DISP_STRING, or whose position is between START_CHARPOS
 	 and END_CHARPOS */
       for (--end;
 	     end > glyph
 	     && !INTEGERP (end->object)
-	     && !EQ (end->object, cover_string)
+	     && !EQ (end->object, disp_string)
 	     && !(BUFFERP (end->object)
 		  && (end->charpos >= start_charpos
 		      && end->charpos < end_charpos));
@@ -26082,20 +26081,19 @@ mouse_face_from_buffer_pos (Lisp_Object window,
       x = r2->x;
       end++;
       while (end < glyph
-	     && INTEGERP (end->object)
-	     && end->charpos <= 0)
+	     && INTEGERP (end->object))
 	{
 	  x += end->pixel_width;
 	  ++end;
 	}
       /* Scan the rest of the glyph row from the end, looking for the
 	 first glyph that comes from BEFORE_STRING, AFTER_STRING, or
-	 COVER_STRING, or whose position is between START_CHARPOS
+	 DISP_STRING, or whose position is between START_CHARPOS
 	 and END_CHARPOS */
       for ( ;
 	     end < glyph
 	     && !INTEGERP (end->object)
-	     && !EQ (end->object, cover_string)
+	     && !EQ (end->object, disp_string)
 	     && !(BUFFERP (end->object)
 		  && (end->charpos >= start_charpos
 		      && end->charpos < end_charpos));
@@ -27092,7 +27090,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
 	      /* The mouse-highlighting, if any, comes from an overlay
 		 or text property in the buffer.  */
 	      Lisp_Object buffer IF_LINT (= Qnil);
-	      Lisp_Object cover_string IF_LINT (= Qnil);
+	      Lisp_Object disp_string IF_LINT (= Qnil);
 
 	      if (STRINGP (object))
 		{
@@ -27106,13 +27104,13 @@ note_mouse_highlight (struct frame *f, int x, int y)
 		      mouse_face = get_char_property_and_overlay
 			(make_number (pos), Qmouse_face, w->buffer, &overlay);
 		      buffer = w->buffer;
-		      cover_string = object;
+		      disp_string = object;
 		    }
 		}
 	      else
 		{
 		  buffer = object;
-		  cover_string = Qnil;
+		  disp_string = Qnil;
 		}
 
 	      if (!NILP (mouse_face))
@@ -27164,7 +27162,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
 					      XFASTINT (before),
 					      XFASTINT (after),
 					      before_string, after_string,
-					      cover_string);
+					      disp_string);
 		  cursor = No_Cursor;
 		}
 	    }