unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] master fd8f724: * src/xdisp.c (overlay_arrows_changed_p): Fix last change.
Date: Tue, 28 Feb 2017 12:47:05 -0500	[thread overview]
Message-ID: <jwvy3wq1a95.fsf-monnier+emacsdiffs@gnu.org> (raw)
In-Reply-To: <83y3wqnvol.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 28 Feb 2017 18:10:02 +0200")

> Stefan, I don't understand the new semantics of
> overlay_arrows_changed_p, and even less so after your latest updates.

Does the patch below clarify the situation and clean up the behavior enough?
I'm still wondering about

                /* FIXME: Don't we have a problem, using such a global
                 * "last-position" if the variable is buffer-local?  */


-- Stefan


diff --git a/src/xdisp.c b/src/xdisp.c
index 4e87001abf..1f8878408b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13338,12 +13338,15 @@ overlay_arrow_in_current_buffer_p (void)
 
 
 /* Return true if any overlay_arrows have moved or overlay-arrow-string
-   has changed.  */
+   has changed.
+   If SET_REDISPLAY is true, additionally, set the `redisplay' bit in those
+   buffers that are affected.  */
 
 static bool
 overlay_arrows_changed_p (bool set_redisplay)
 {
   Lisp_Object vlist;
+  bool changed = false;
 
   for (vlist = Voverlay_arrow_variable_list;
        CONSP (vlist);
@@ -13370,12 +13373,13 @@ overlay_arrows_changed_p (bool set_redisplay)
             {
               if (buf)
 	        bset_redisplay (buf);
+              changed = true;
             }
 	  else
 	    return true;
 	}
     }
-  return false;
+  return changed;
 }
 
 /* Mark overlay arrows to be updated on next redisplay.  */
@@ -13397,6 +13401,8 @@ update_overlay_arrows (int up_to_date)
       if (up_to_date > 0)
 	{
 	  Lisp_Object val = find_symbol_value (var);
+          if (!MARKERP (val))
+	    continue;
 	  Fput (var, Qlast_arrow_position,
 		COERCE_MARKER (val));
 	  Fput (var, Qlast_arrow_string,



  reply	other threads:[~2017-02-28 17:47 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-28 16:10 [Emacs-diffs] master fd8f724: * src/xdisp.c (overlay_arrows_changed_p): Fix last change Eli Zaretskii
2017-02-28 17:47 ` Stefan Monnier [this message]
2017-02-28 18:09   ` Eli Zaretskii
2017-02-28 18:58     ` Stefan Monnier
2017-02-28 19:11       ` Eli Zaretskii
2017-02-28 20:02         ` Stefan Monnier
2017-03-01 17:03           ` Eli Zaretskii
2017-03-02  5:27             ` Stefan Monnier
2017-03-02 16:02               ` Eli Zaretskii
2017-03-02 18:29                 ` Stefan Monnier
2017-03-02 20:18                   ` Eli Zaretskii
2017-03-02 22:32                     ` Stefan Monnier
2017-03-03  8:11                       ` Eli Zaretskii
2017-03-06  2:53                         ` Stefan Monnier
2017-03-03  8:13                   ` Eli Zaretskii
2017-03-06  4:17                     ` Stefan Monnier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwvy3wq1a95.fsf-monnier+emacsdiffs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).