diff options
| author | Richard M. Stallman | 1996-09-04 18:54:36 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-09-04 18:54:36 +0000 |
| commit | 1747fb168a6ac97e64154749b15f65e34cb680b0 (patch) | |
| tree | df5f2092bc7bc9604d2a7cca62079372be9c9bb7 /src | |
| parent | 13abef241fe6a8c267eeeecca309fcbcec85ad93 (diff) | |
| download | emacs-1747fb168a6ac97e64154749b15f65e34cb680b0.tar.gz emacs-1747fb168a6ac97e64154749b15f65e34cb680b0.zip | |
Add many declarations.
(BITS_PER_EMACS_INT): New macro.
(XMARKBIT): Test BITS_PER_EMACS_INT to conditionalize fast definition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lisp.h | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/src/lisp.h b/src/lisp.h index d524f3fb140..01bf1fe4710 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 22 | /* These are default choices for the types to use. */ | 22 | /* These are default choices for the types to use. */ |
| 23 | #ifndef EMACS_INT | 23 | #ifndef EMACS_INT |
| 24 | #define EMACS_INT int | 24 | #define EMACS_INT int |
| 25 | #define BITS_PER_EMACS_INT BITS_PER_INT | ||
| 25 | #endif | 26 | #endif |
| 26 | #ifndef EMACS_UINT | 27 | #ifndef EMACS_UINT |
| 27 | #define EMACS_UINT unsigned int | 28 | #define EMACS_UINT unsigned int |
| @@ -322,7 +323,7 @@ extern int pure_size; | |||
| 322 | #define XGCTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & GCTYPEMASK)) | 323 | #define XGCTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & GCTYPEMASK)) |
| 323 | #endif | 324 | #endif |
| 324 | 325 | ||
| 325 | #if VALBITS + GCTYPEBITS == BITS_PER_INT - 1 | 326 | #if VALBITS + GCTYPEBITS == BITS_PER_EMACS_INT - 1 |
| 326 | /* Make XMARKBIT faster if mark bit is sign bit. */ | 327 | /* Make XMARKBIT faster if mark bit is sign bit. */ |
| 327 | #ifndef XMARKBIT | 328 | #ifndef XMARKBIT |
| 328 | #define XMARKBIT(a) ((a) < 0) | 329 | #define XMARKBIT(a) ((a) < 0) |
| @@ -1397,6 +1398,7 @@ extern Lisp_Object indirect_function (), Findirect_function (); | |||
| 1397 | extern Lisp_Object Ffset (), Fsetplist (); | 1398 | extern Lisp_Object Ffset (), Fsetplist (); |
| 1398 | extern Lisp_Object Fsymbol_value (), find_symbol_value (), Fset (); | 1399 | extern Lisp_Object Fsymbol_value (), find_symbol_value (), Fset (); |
| 1399 | extern Lisp_Object Fdefault_value (), Fset_default (), Fdefault_boundp (); | 1400 | extern Lisp_Object Fdefault_value (), Fset_default (), Fdefault_boundp (); |
| 1401 | extern Lisp_Object Fmake_local_variable (); | ||
| 1400 | 1402 | ||
| 1401 | extern Lisp_Object Faref (), Faset (); | 1403 | extern Lisp_Object Faref (), Faset (); |
| 1402 | 1404 | ||
| @@ -1447,6 +1449,7 @@ extern Lisp_Object concat2 (), nconc2 (); | |||
| 1447 | extern Lisp_Object assq_no_quit (); | 1449 | extern Lisp_Object assq_no_quit (); |
| 1448 | extern Lisp_Object Fcopy_alist (); | 1450 | extern Lisp_Object Fcopy_alist (); |
| 1449 | extern Lisp_Object Fplist_get (); | 1451 | extern Lisp_Object Fplist_get (); |
| 1452 | extern Lisp_Object Fset_char_table_parent (); | ||
| 1450 | 1453 | ||
| 1451 | /* Defined in insdel.c */ | 1454 | /* Defined in insdel.c */ |
| 1452 | extern void move_gap (); | 1455 | extern void move_gap (); |
| @@ -1468,6 +1471,10 @@ extern void prepare_to_modify_buffer (); | |||
| 1468 | extern void signal_before_change (); | 1471 | extern void signal_before_change (); |
| 1469 | extern void signal_after_change (); | 1472 | extern void signal_after_change (); |
| 1470 | 1473 | ||
| 1474 | /* Defined in dispnew.c */ | ||
| 1475 | extern Lisp_Object Fding (), Fredraw_display (); | ||
| 1476 | extern Lisp_Object Fsleep_for (); | ||
| 1477 | |||
| 1471 | /* Defined in xdisp.c */ | 1478 | /* Defined in xdisp.c */ |
| 1472 | extern Lisp_Object Vmessage_log_max; | 1479 | extern Lisp_Object Vmessage_log_max; |
| 1473 | extern void message (); | 1480 | extern void message (); |
| @@ -1489,6 +1496,7 @@ extern Lisp_Object Fpurecopy (), make_pure_string (); | |||
| 1489 | extern Lisp_Object pure_cons (), make_pure_vector (); | 1496 | extern Lisp_Object pure_cons (), make_pure_vector (); |
| 1490 | extern Lisp_Object Fgarbage_collect (); | 1497 | extern Lisp_Object Fgarbage_collect (); |
| 1491 | extern Lisp_Object Fmake_byte_code (); | 1498 | extern Lisp_Object Fmake_byte_code (); |
| 1499 | extern Lisp_Object Fmake_bool_vector (), Fmake_char_table (); | ||
| 1492 | extern Lisp_Object Qchar_table_extra_slots; | 1500 | extern Lisp_Object Qchar_table_extra_slots; |
| 1493 | extern struct Lisp_Vector *allocate_vectorlike (); | 1501 | extern struct Lisp_Vector *allocate_vectorlike (); |
| 1494 | extern int gc_in_progress; | 1502 | extern int gc_in_progress; |
| @@ -1497,6 +1505,7 @@ extern int gc_in_progress; | |||
| 1497 | extern Lisp_Object Vprin1_to_string_buffer; | 1505 | extern Lisp_Object Vprin1_to_string_buffer; |
| 1498 | extern Lisp_Object Fprin1 (), Fprin1_to_string (), Fprinc (); | 1506 | extern Lisp_Object Fprin1 (), Fprin1_to_string (), Fprinc (); |
| 1499 | extern Lisp_Object Fterpri (), Fprint (); | 1507 | extern Lisp_Object Fterpri (), Fprint (); |
| 1508 | extern Lisp_Object Ferror_message_string (); | ||
| 1500 | extern Lisp_Object Vstandard_output, Qstandard_output; | 1509 | extern Lisp_Object Vstandard_output, Qstandard_output; |
| 1501 | extern Lisp_Object Qexternal_debugging_output; | 1510 | extern Lisp_Object Qexternal_debugging_output; |
| 1502 | extern void temp_output_buffer_setup (), temp_output_buffer_show (); | 1511 | extern void temp_output_buffer_setup (), temp_output_buffer_show (); |
| @@ -1562,7 +1571,10 @@ extern Lisp_Object Fpoint_min_marker (), Fpoint_max_marker (); | |||
| 1562 | extern Lisp_Object Fpoint_min (), Fpoint_max (); | 1571 | extern Lisp_Object Fpoint_min (), Fpoint_max (); |
| 1563 | extern Lisp_Object Fpoint (), Fpoint_marker (), Fmark_marker (); | 1572 | extern Lisp_Object Fpoint (), Fpoint_marker (), Fmark_marker (); |
| 1564 | extern Lisp_Object Ffollowing_char (), Fprevious_char (), Fchar_after (); | 1573 | extern Lisp_Object Ffollowing_char (), Fprevious_char (), Fchar_after (); |
| 1565 | extern Lisp_Object Finsert (); | 1574 | extern Lisp_Object Finsert (), Finsert_and_inherit (); |
| 1575 | extern Lisp_Object Finsert_before_markers (); | ||
| 1576 | extern Lisp_Object Finsert_buffer_substring (); | ||
| 1577 | extern Lisp_Object Finsert_char (); | ||
| 1566 | extern Lisp_Object Feolp (), Feobp (), Fbolp (), Fbobp (); | 1578 | extern Lisp_Object Feolp (), Feobp (), Fbolp (), Fbobp (); |
| 1567 | extern Lisp_Object Fformat (), format1 (); | 1579 | extern Lisp_Object Fformat (), format1 (); |
| 1568 | extern Lisp_Object make_buffer_string (), Fbuffer_substring (); | 1580 | extern Lisp_Object make_buffer_string (), Fbuffer_substring (); |
| @@ -1585,6 +1597,10 @@ extern Lisp_Object Fbarf_if_buffer_read_only (); | |||
| 1585 | extern Lisp_Object Fcurrent_buffer (), Fswitch_to_buffer (), Fpop_to_buffer (); | 1597 | extern Lisp_Object Fcurrent_buffer (), Fswitch_to_buffer (), Fpop_to_buffer (); |
| 1586 | extern Lisp_Object Fother_buffer (); | 1598 | extern Lisp_Object Fother_buffer (); |
| 1587 | extern Lisp_Object Foverlay_get (); | 1599 | extern Lisp_Object Foverlay_get (); |
| 1600 | extern Lisp_Object Fbuffer_modified_p (), Fset_buffer_modified_p (); | ||
| 1601 | extern Lisp_Object Fkill_buffer (), Fkill_all_local_variables (); | ||
| 1602 | extern Lisp_Object Fbuffer_disable_undo (), Fbuffer_enable_undo (); | ||
| 1603 | extern Lisp_Object Ferase_buffer (); | ||
| 1588 | extern Lisp_Object Qoverlayp; | 1604 | extern Lisp_Object Qoverlayp; |
| 1589 | extern struct buffer *all_buffers; | 1605 | extern struct buffer *all_buffers; |
| 1590 | 1606 | ||
| @@ -1609,6 +1625,8 @@ extern Lisp_Object Ffile_name_directory (); | |||
| 1609 | extern Lisp_Object expand_and_dir_to_file (); | 1625 | extern Lisp_Object expand_and_dir_to_file (); |
| 1610 | extern Lisp_Object Ffile_accessible_directory_p (); | 1626 | extern Lisp_Object Ffile_accessible_directory_p (); |
| 1611 | extern Lisp_Object Funhandled_file_name_directory (); | 1627 | extern Lisp_Object Funhandled_file_name_directory (); |
| 1628 | extern Lisp_Object Ffile_directory_p (); | ||
| 1629 | extern Lisp_Object Fwrite_region (); | ||
| 1612 | 1630 | ||
| 1613 | /* Defined in abbrev.c */ | 1631 | /* Defined in abbrev.c */ |
| 1614 | 1632 | ||
| @@ -1631,6 +1649,7 @@ extern Lisp_Object Fread_variable (), Fread_buffer (), Fread_key_sequence (); | |||
| 1631 | extern Lisp_Object Fread_minibuffer (), Feval_minibuffer (); | 1649 | extern Lisp_Object Fread_minibuffer (), Feval_minibuffer (); |
| 1632 | extern Lisp_Object Fread_string (), Fread_file_name (); | 1650 | extern Lisp_Object Fread_string (), Fread_file_name (); |
| 1633 | extern Lisp_Object Fread_no_blanks_input (); | 1651 | extern Lisp_Object Fread_no_blanks_input (); |
| 1652 | extern Lisp_Object get_minibuffer (); | ||
| 1634 | 1653 | ||
| 1635 | /* Defined in callint.c */ | 1654 | /* Defined in callint.c */ |
| 1636 | 1655 | ||
| @@ -1643,8 +1662,14 @@ extern Lisp_Object Fprefix_numeric_value (); | |||
| 1643 | /* defined in casefiddle.c */ | 1662 | /* defined in casefiddle.c */ |
| 1644 | 1663 | ||
| 1645 | extern Lisp_Object Fdowncase (), Fupcase (), Fcapitalize (); | 1664 | extern Lisp_Object Fdowncase (), Fupcase (), Fcapitalize (); |
| 1665 | extern Lisp_Object Fupcase_region (); | ||
| 1646 | extern Lisp_Object Fupcase_initials (), Fupcase_initials_region (); | 1666 | extern Lisp_Object Fupcase_initials (), Fupcase_initials_region (); |
| 1647 | 1667 | ||
| 1668 | /* defined in casetab.c */ | ||
| 1669 | |||
| 1670 | extern Lisp_Object Fset_case_table (); | ||
| 1671 | extern Lisp_Object Fset_standard_case_table (); | ||
| 1672 | |||
| 1648 | /* defined in keyboard.c */ | 1673 | /* defined in keyboard.c */ |
| 1649 | 1674 | ||
| 1650 | extern Lisp_Object Qdisabled; | 1675 | extern Lisp_Object Qdisabled; |
| @@ -1653,6 +1678,7 @@ extern Lisp_Object Fdiscard_input (), Frecursive_edit (); | |||
| 1653 | extern Lisp_Object Fcommand_execute (), Finput_pending_p (); | 1678 | extern Lisp_Object Fcommand_execute (), Finput_pending_p (); |
| 1654 | extern Lisp_Object menu_bar_items (); | 1679 | extern Lisp_Object menu_bar_items (); |
| 1655 | extern Lisp_Object Qvertical_scroll_bar; | 1680 | extern Lisp_Object Qvertical_scroll_bar; |
| 1681 | extern Lisp_Object Fevent_convert_list (); | ||
| 1656 | #ifdef MULTI_KBOARD | 1682 | #ifdef MULTI_KBOARD |
| 1657 | extern void delete_kboard (); | 1683 | extern void delete_kboard (); |
| 1658 | #endif | 1684 | #endif |
| @@ -1661,6 +1687,7 @@ extern void delete_kboard (); | |||
| 1661 | 1687 | ||
| 1662 | extern Lisp_Object Qkeymap, Qmenu_bar; | 1688 | extern Lisp_Object Qkeymap, Qmenu_bar; |
| 1663 | extern Lisp_Object current_global_map; | 1689 | extern Lisp_Object current_global_map; |
| 1690 | extern Lisp_Object Fdefine_key (); | ||
| 1664 | extern Lisp_Object Fkey_description (), Fsingle_key_description (); | 1691 | extern Lisp_Object Fkey_description (), Fsingle_key_description (); |
| 1665 | extern Lisp_Object Fwhere_is_internal (); | 1692 | extern Lisp_Object Fwhere_is_internal (); |
| 1666 | extern Lisp_Object access_keymap (), store_in_keymap (); | 1693 | extern Lisp_Object access_keymap (), store_in_keymap (); |
| @@ -1672,12 +1699,17 @@ extern Lisp_Object Fvertical_motion (), Findent_to (), Fcurrent_column (); | |||
| 1672 | 1699 | ||
| 1673 | /* defined in window.c */ | 1700 | /* defined in window.c */ |
| 1674 | extern Lisp_Object Qwindowp, Qwindow_live_p; | 1701 | extern Lisp_Object Qwindowp, Qwindow_live_p; |
| 1702 | extern Lisp_Object Fselected_window (); | ||
| 1675 | extern Lisp_Object Fget_buffer_window (); | 1703 | extern Lisp_Object Fget_buffer_window (); |
| 1676 | extern Lisp_Object Fsave_window_excursion (); | 1704 | extern Lisp_Object Fsave_window_excursion (); |
| 1677 | extern Lisp_Object Fset_window_configuration (), Fcurrent_window_configuration (); | 1705 | extern Lisp_Object Fset_window_configuration (), Fcurrent_window_configuration (); |
| 1678 | extern Lisp_Object Fcoordinates_in_window_p (); | 1706 | extern Lisp_Object Fcoordinates_in_window_p (); |
| 1679 | extern Lisp_Object Fwindow_at (); | 1707 | extern Lisp_Object Fwindow_at (); |
| 1708 | extern Lisp_Object Fpos_visible_in_window_p (); | ||
| 1680 | extern int window_internal_height (), window_internal_width (); | 1709 | extern int window_internal_height (), window_internal_width (); |
| 1710 | extern Lisp_Object Frecenter (); | ||
| 1711 | extern Lisp_Object Fscroll_other_window (); | ||
| 1712 | extern Lisp_Object Fset_window_start (); | ||
| 1681 | 1713 | ||
| 1682 | /* defined in frame.c */ | 1714 | /* defined in frame.c */ |
| 1683 | extern Lisp_Object Qvisible; | 1715 | extern Lisp_Object Qvisible; |
| @@ -1687,8 +1719,6 @@ extern Lisp_Object get_frame_param(); | |||
| 1687 | extern Lisp_Object frame_buffer_predicate (); | 1719 | extern Lisp_Object frame_buffer_predicate (); |
| 1688 | extern Lisp_Object Fframep (); | 1720 | extern Lisp_Object Fframep (); |
| 1689 | extern Lisp_Object Fselect_frame (); | 1721 | extern Lisp_Object Fselect_frame (); |
| 1690 | extern Lisp_Object Ffocus_frame (); | ||
| 1691 | extern Lisp_Object Funfocus_frame (); | ||
| 1692 | extern Lisp_Object Fselected_frame (); | 1722 | extern Lisp_Object Fselected_frame (); |
| 1693 | extern Lisp_Object Fwindow_frame (); | 1723 | extern Lisp_Object Fwindow_frame (); |
| 1694 | extern Lisp_Object Fframe_root_window (); | 1724 | extern Lisp_Object Fframe_root_window (); |
| @@ -1714,6 +1744,8 @@ extern Lisp_Object Fset_frame_height (); | |||
| 1714 | extern Lisp_Object Fset_frame_width (); | 1744 | extern Lisp_Object Fset_frame_width (); |
| 1715 | extern Lisp_Object Fset_frame_size (); | 1745 | extern Lisp_Object Fset_frame_size (); |
| 1716 | extern Lisp_Object Fset_frame_position (); | 1746 | extern Lisp_Object Fset_frame_position (); |
| 1747 | extern Lisp_Object Fraise_frame (); | ||
| 1748 | extern Lisp_Object Fredirect_frame_focus (); | ||
| 1717 | 1749 | ||
| 1718 | /* defined in emacs.c */ | 1750 | /* defined in emacs.c */ |
| 1719 | extern Lisp_Object decode_env_path (); | 1751 | extern Lisp_Object decode_env_path (); |
| @@ -1764,6 +1796,9 @@ extern Lisp_Object Qinsert_in_front_hooks, Qinsert_behind_hooks; | |||
| 1764 | extern Lisp_Object Fnext_property_change (); | 1796 | extern Lisp_Object Fnext_property_change (); |
| 1765 | extern Lisp_Object Fnext_single_property_change (); | 1797 | extern Lisp_Object Fnext_single_property_change (); |
| 1766 | extern Lisp_Object Fprevious_single_property_change (); | 1798 | extern Lisp_Object Fprevious_single_property_change (); |
| 1799 | extern Lisp_Object Fget_text_property (), Fput_text_property (); | ||
| 1800 | extern Lisp_Object Fset_text_properties (); | ||
| 1801 | extern Lisp_Object Ftext_property_not_all (); | ||
| 1767 | 1802 | ||
| 1768 | /* defined in intervals.c */ | 1803 | /* defined in intervals.c */ |
| 1769 | extern Lisp_Object get_local_map (); | 1804 | extern Lisp_Object get_local_map (); |