Mercurial > emacs
comparison src/marker.c @ 22744:79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
fall thru into normal case.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Sun, 12 Jul 1998 19:13:45 +0000 |
parents | 64ac294567a6 |
children | 4b675266db04 |
comparison
equal
deleted
inserted
replaced
22743:ea36144e7977 | 22744:79ca732d9740 |
---|---|
826 (marker, type) | 826 (marker, type) |
827 register Lisp_Object marker, type; | 827 register Lisp_Object marker, 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 |
843 DEFUN ("marker-insertion-type", Fmarker_insertion_type, | 841 DEFUN ("marker-insertion-type", Fmarker_insertion_type, |
844 Smarker_insertion_type, 1, 1, 0, | 842 Smarker_insertion_type, 1, 1, 0, |
845 "Return insertion type of MARKER: t if it stays after inserted text.\n\ | 843 "Return insertion type of MARKER: t if it stays after inserted text.\n\ |