aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2020-03-26 13:06:12 -0700
committerPaul Eggert2020-03-26 13:06:45 -0700
commit934b3c9ecc2b91723b9e5826080424ec1a90f264 (patch)
treed7d87b6d3a0083802f3434793440fac5ed9f02b0 /src
parentfe6b8c91cb7a3c1959f7fb2b43f73cc7f7fc9fc3 (diff)
downloademacs-934b3c9ecc2b91723b9e5826080424ec1a90f264.tar.gz
emacs-934b3c9ecc2b91723b9e5826080424ec1a90f264.zip
Remove COERCE_MARKER
* src/xdisp.c (COERCE_MARKER): Remove. All uses replaced by Fmarker_position; this is simpler as the macro was invoked only on markers.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 04fc8aa3c45..58d7ca5cb71 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -815,11 +815,6 @@ static struct props it_props[] =
815 {0, 0, NULL} 815 {0, 0, NULL}
816}; 816};
817 817
818/* Value is the position described by X. If X is a marker, value is
819 the marker_position of X. Otherwise, value is X. */
820
821#define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X))
822
823/* Enumeration returned by some move_it_.* functions internally. */ 818/* Enumeration returned by some move_it_.* functions internally. */
824 819
825enum move_it_result 820enum move_it_result
@@ -14944,7 +14939,7 @@ overlay_arrows_changed_p (bool set_redisplay)
14944 val = find_symbol_value (var); 14939 val = find_symbol_value (var);
14945 if (!MARKERP (val)) 14940 if (!MARKERP (val))
14946 continue; 14941 continue;
14947 if (! EQ (COERCE_MARKER (val), 14942 if (! EQ (Fmarker_position (val),
14948 /* FIXME: Don't we have a problem, using such a global 14943 /* FIXME: Don't we have a problem, using such a global
14949 * "last-position" if the variable is buffer-local? */ 14944 * "last-position" if the variable is buffer-local? */
14950 Fget (var, Qlast_arrow_position)) 14945 Fget (var, Qlast_arrow_position))
@@ -14987,8 +14982,7 @@ update_overlay_arrows (int up_to_date)
14987 Lisp_Object val = find_symbol_value (var); 14982 Lisp_Object val = find_symbol_value (var);
14988 if (!MARKERP (val)) 14983 if (!MARKERP (val))
14989 continue; 14984 continue;
14990 Fput (var, Qlast_arrow_position, 14985 Fput (var, Qlast_arrow_position, Fmarker_position (val));
14991 COERCE_MARKER (val));
14992 Fput (var, Qlast_arrow_string, 14986 Fput (var, Qlast_arrow_string,
14993 overlay_arrow_string_or_property (var)); 14987 overlay_arrow_string_or_property (var));
14994 } 14988 }