comparison src/search.c @ 9113:766b6288e0f2

(Fmatch_data, Fstore_match_data): Use type test macros.
author Karl Heuer <kwzh@gnu.org>
date Tue, 27 Sep 1994 01:24:44 +0000
parents f0d89b62dd27
children f2138d548313
comparison
equal deleted inserted replaced
9112:85182997b9c9 9113:766b6288e0f2
1502 if (EQ (last_thing_searched, Qt)) 1502 if (EQ (last_thing_searched, Qt))
1503 { 1503 {
1504 XFASTINT (data[2 * i]) = start; 1504 XFASTINT (data[2 * i]) = start;
1505 XFASTINT (data[2 * i + 1]) = search_regs.end[i]; 1505 XFASTINT (data[2 * i + 1]) = search_regs.end[i];
1506 } 1506 }
1507 else if (XTYPE (last_thing_searched) == Lisp_Buffer) 1507 else if (BUFFERP (last_thing_searched))
1508 { 1508 {
1509 data[2 * i] = Fmake_marker (); 1509 data[2 * i] = Fmake_marker ();
1510 Fset_marker (data[2 * i], 1510 Fset_marker (data[2 * i],
1511 make_number (start), 1511 make_number (start),
1512 last_thing_searched); 1512 last_thing_searched);
1582 search_regs.start[i] = -1; 1582 search_regs.start[i] = -1;
1583 list = Fcdr (list); 1583 list = Fcdr (list);
1584 } 1584 }
1585 else 1585 else
1586 { 1586 {
1587 if (XTYPE (marker) == Lisp_Marker) 1587 if (MARKERP (marker))
1588 { 1588 {
1589 if (XMARKER (marker)->buffer == 0) 1589 if (XMARKER (marker)->buffer == 0)
1590 XFASTINT (marker) = 0; 1590 XFASTINT (marker) = 0;
1591 else 1591 else
1592 XSET (last_thing_searched, Lisp_Buffer, 1592 XSET (last_thing_searched, Lisp_Buffer,
1596 CHECK_NUMBER_COERCE_MARKER (marker, 0); 1596 CHECK_NUMBER_COERCE_MARKER (marker, 0);
1597 search_regs.start[i] = XINT (marker); 1597 search_regs.start[i] = XINT (marker);
1598 list = Fcdr (list); 1598 list = Fcdr (list);
1599 1599
1600 marker = Fcar (list); 1600 marker = Fcar (list);
1601 if (XTYPE (marker) == Lisp_Marker 1601 if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
1602 && XMARKER (marker)->buffer == 0)
1603 XFASTINT (marker) = 0; 1602 XFASTINT (marker) = 0;
1604 1603
1605 CHECK_NUMBER_COERCE_MARKER (marker, 0); 1604 CHECK_NUMBER_COERCE_MARKER (marker, 0);
1606 search_regs.end[i] = XINT (marker); 1605 search_regs.end[i] = XINT (marker);
1607 } 1606 }