aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-02-26 19:52:22 +0200
committerEli Zaretskii2017-02-26 19:52:22 +0200
commitd8899b9d1baf517b30ec4752d1458e2a06000646 (patch)
tree1c4deab7172faa9eb93e1e55e490d27e58a1ac6f /src
parent6b6cc56e728a4d8b5ccac86ac393be7cd29207e2 (diff)
downloademacs-d8899b9d1baf517b30ec4752d1458e2a06000646.tar.gz
emacs-d8899b9d1baf517b30ec4752d1458e2a06000646.zip
Avoid segfault in overlay_arrows_changed_p
* src/xdisp.c (overlay_arrows_changed_p): Fix recent change to avoid a segfault.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index cec649f590d..a4c3c706552 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13362,8 +13362,10 @@ overlay_arrows_changed_p (bool set_redisplay)
13362 || ! (pstr = overlay_arrow_string_or_property (var), 13362 || ! (pstr = overlay_arrow_string_or_property (var),
13363 EQ (pstr, Fget (var, Qlast_arrow_string)))) 13363 EQ (pstr, Fget (var, Qlast_arrow_string))))
13364 { 13364 {
13365 if (set_redisplay) 13365 struct buffer *buf = XMARKER (val)->buffer;
13366 bset_redisplay (XMARKER (val)->buffer); 13366
13367 if (set_redisplay && buf)
13368 bset_redisplay (buf);
13367 else 13369 else
13368 return true; 13370 return true;
13369 } 13371 }