aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1998-07-12 19:13:45 +0000
committerKarl Heuer1998-07-12 19:13:45 +0000
commit0469366f994d3c03006c30262408379e416a03d4 (patch)
treea607bf8424974e3e9426d79efec796d9e76528d0 /src
parentb2a8c84d18112f03478f17a0bbc51e65c0d9b51e (diff)
downloademacs-0469366f994d3c03006c30262408379e416a03d4.tar.gz
emacs-0469366f994d3c03006c30262408379e416a03d4.zip
(Fcopy_marker): Make return from wrong_type_argument
fall thru into normal case.
Diffstat (limited to 'src')
-rw-r--r--src/marker.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/marker.c b/src/marker.c
index ae6b2e5eb6d..7e4cd4fa343 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -828,16 +828,14 @@ see `marker-insertion-type'.")
828{ 828{
829 register Lisp_Object new; 829 register Lisp_Object new;
830 830
831 if (INTEGERP (marker) || MARKERP (marker)) 831 if (! (INTEGERP (marker) || MARKERP (marker)))
832 {
833 new = Fmake_marker ();
834 Fset_marker (new, marker,
835 (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil));
836 XMARKER (new)->insertion_type = !NILP (type);
837 return new;
838 }
839 else
840 marker = wrong_type_argument (Qinteger_or_marker_p, marker); 832 marker = wrong_type_argument (Qinteger_or_marker_p, marker);
833
834 new = Fmake_marker ();
835 Fset_marker (new, marker,
836 (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil));
837 XMARKER (new)->insertion_type = !NILP (type);
838 return new;
841} 839}
842 840
843DEFUN ("marker-insertion-type", Fmarker_insertion_type, 841DEFUN ("marker-insertion-type", Fmarker_insertion_type,