diff options
| author | Richard M. Stallman | 1997-01-20 02:21:19 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-01-20 02:21:19 +0000 |
| commit | e12c1054457fa9e7c0d20de92a8eeff87f03a8e6 (patch) | |
| tree | 4200ff4010121f6d53b9241b996f34f2adcf642b /src | |
| parent | 1bad7c592501927d868b017c8119002e59f0a4c0 (diff) | |
| download | emacs-e12c1054457fa9e7c0d20de92a8eeff87f03a8e6.tar.gz emacs-e12c1054457fa9e7c0d20de92a8eeff87f03a8e6.zip | |
(fatal): Print a newline at the end.
(term_init): Calls to fatal changed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/term.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/term.c b/src/term.c index 311845dd1c1..ce771533b6f 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -1474,9 +1474,9 @@ term_init (terminal_type) | |||
| 1474 | if (status < 0) | 1474 | if (status < 0) |
| 1475 | { | 1475 | { |
| 1476 | #ifdef TERMINFO | 1476 | #ifdef TERMINFO |
| 1477 | fatal ("Cannot open terminfo database file.\n"); | 1477 | fatal ("Cannot open terminfo database file"); |
| 1478 | #else | 1478 | #else |
| 1479 | fatal ("Cannot open termcap database file.\n"); | 1479 | fatal ("Cannot open termcap database file"); |
| 1480 | #endif | 1480 | #endif |
| 1481 | } | 1481 | } |
| 1482 | if (status == 0) | 1482 | if (status == 0) |
| @@ -1486,14 +1486,14 @@ term_init (terminal_type) | |||
| 1486 | If that is not the actual type of terminal you have,\n\ | 1486 | If that is not the actual type of terminal you have,\n\ |
| 1487 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | 1487 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ |
| 1488 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ | 1488 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ |
| 1489 | to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.\n", | 1489 | to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", |
| 1490 | terminal_type); | 1490 | terminal_type); |
| 1491 | #else | 1491 | #else |
| 1492 | fatal ("Terminal type %s is not defined.\n\ | 1492 | fatal ("Terminal type %s is not defined.\n\ |
| 1493 | If that is not the actual type of terminal you have,\n\ | 1493 | If that is not the actual type of terminal you have,\n\ |
| 1494 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | 1494 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ |
| 1495 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ | 1495 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ |
| 1496 | to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.\n", | 1496 | to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", |
| 1497 | terminal_type); | 1497 | terminal_type); |
| 1498 | #endif | 1498 | #endif |
| 1499 | } | 1499 | } |
| @@ -1602,7 +1602,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.\n", | |||
| 1602 | 1602 | ||
| 1603 | if (FRAME_HEIGHT (selected_frame) < 3 | 1603 | if (FRAME_HEIGHT (selected_frame) < 3 |
| 1604 | || FRAME_WIDTH (selected_frame) < 3) | 1604 | || FRAME_WIDTH (selected_frame) < 3) |
| 1605 | fatal ("Screen size %dx%d is too small.\n", | 1605 | fatal ("Screen size %dx%d is too small", |
| 1606 | FRAME_HEIGHT (selected_frame), FRAME_WIDTH (selected_frame)); | 1606 | FRAME_HEIGHT (selected_frame), FRAME_WIDTH (selected_frame)); |
| 1607 | 1607 | ||
| 1608 | min_padding_speed = tgetnum ("pb"); | 1608 | min_padding_speed = tgetnum ("pb"); |
| @@ -1726,7 +1726,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.\n", | |||
| 1726 | It lacks the ability to position the cursor.\n\ | 1726 | It lacks the ability to position the cursor.\n\ |
| 1727 | If that is not the actual type of terminal you have, use either the\n\ | 1727 | If that is not the actual type of terminal you have, use either the\n\ |
| 1728 | DCL command `SET TERMINAL/DEVICE= ...' for DEC-compatible terminals,\n\ | 1728 | DCL command `SET TERMINAL/DEVICE= ...' for DEC-compatible terminals,\n\ |
| 1729 | or `define EMACS_TERM \"terminal type\"' for non-DEC terminals.\n", | 1729 | or `define EMACS_TERM \"terminal type\"' for non-DEC terminals.", |
| 1730 | terminal_type); | 1730 | terminal_type); |
| 1731 | #else /* not VMS */ | 1731 | #else /* not VMS */ |
| 1732 | # ifdef TERMINFO | 1732 | # ifdef TERMINFO |
| @@ -1735,7 +1735,7 @@ It lacks the ability to position the cursor.\n\ | |||
| 1735 | If that is not the actual type of terminal you have,\n\ | 1735 | If that is not the actual type of terminal you have,\n\ |
| 1736 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | 1736 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ |
| 1737 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ | 1737 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ |
| 1738 | to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.\n", | 1738 | to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", |
| 1739 | terminal_type); | 1739 | terminal_type); |
| 1740 | # else /* TERMCAP */ | 1740 | # else /* TERMCAP */ |
| 1741 | fatal ("Terminal type \"%s\" is not powerful enough to run Emacs.\n\ | 1741 | fatal ("Terminal type \"%s\" is not powerful enough to run Emacs.\n\ |
| @@ -1743,13 +1743,13 @@ It lacks the ability to position the cursor.\n\ | |||
| 1743 | If that is not the actual type of terminal you have,\n\ | 1743 | If that is not the actual type of terminal you have,\n\ |
| 1744 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ | 1744 | use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ |
| 1745 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ | 1745 | `setenv TERM ...') to specify the correct type. It may be necessary\n\ |
| 1746 | to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.\n", | 1746 | to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", |
| 1747 | terminal_type); | 1747 | terminal_type); |
| 1748 | # endif /* TERMINFO */ | 1748 | # endif /* TERMINFO */ |
| 1749 | #endif /*VMS */ | 1749 | #endif /*VMS */ |
| 1750 | if (FRAME_HEIGHT (selected_frame) <= 0 | 1750 | if (FRAME_HEIGHT (selected_frame) <= 0 |
| 1751 | || FRAME_WIDTH (selected_frame) <= 0) | 1751 | || FRAME_WIDTH (selected_frame) <= 0) |
| 1752 | fatal ("The frame size has not been specified."); | 1752 | fatal ("The frame size has not been specified"); |
| 1753 | 1753 | ||
| 1754 | delete_in_insert_mode | 1754 | delete_in_insert_mode |
| 1755 | = TS_delete_mode && TS_insert_mode | 1755 | = TS_delete_mode && TS_insert_mode |
| @@ -1795,6 +1795,7 @@ fatal (str, arg1, arg2) | |||
| 1795 | { | 1795 | { |
| 1796 | fprintf (stderr, "emacs: "); | 1796 | fprintf (stderr, "emacs: "); |
| 1797 | fprintf (stderr, str, arg1, arg2); | 1797 | fprintf (stderr, str, arg1, arg2); |
| 1798 | fprintf (stderr, "\n"); | ||
| 1798 | fflush (stderr); | 1799 | fflush (stderr); |
| 1799 | exit (1); | 1800 | exit (1); |
| 1800 | } | 1801 | } |