Mercurial > emacs
changeset 13867:19a05b5a597d
(check_x_display_info, check_x_frame, x_set_font)
(Fx_list_fonts): Fix error messages.
(have_menus_p): Renamed from using_x_p.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 26 Dec 1995 04:41:21 +0000 |
| parents | 808d4570cb4b |
| children | cc995a858ce1 |
| files | src/xfns.c |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfns.c Tue Dec 26 04:39:17 1995 +0000 +++ b/src/xfns.c Tue Dec 26 04:41:21 1995 +0000 @@ -208,10 +208,11 @@ error ("X windows are not in use or not initialized"); } -/* Nonzero if using X for display. */ +/* Nonzero if we can use mouse menus. + You should not call this unless HAVE_MENUS is defined. */ int -using_x_p () +have_menus_p () { return x_in_use; } @@ -233,7 +234,7 @@ f = XFRAME (frame); } if (! FRAME_X_P (f)) - error ("non-X frame used"); + error ("Non-X frame used"); return f; } @@ -263,7 +264,7 @@ CHECK_LIVE_FRAME (frame, 0); f = XFRAME (frame); if (! FRAME_X_P (f)) - error ("non-X frame used"); + error ("Non-X frame used"); return FRAME_X_DISPLAY_INFO (f); } } @@ -1584,7 +1585,7 @@ UNBLOCK_INPUT; if (EQ (result, Qnil)) - error ("Font \"%s\" is not defined", XSTRING (arg)->data); + error ("Font `%s' is not defined", XSTRING (arg)->data); else if (EQ (result, Qt)) error ("the characters of the given font have varying widths"); else if (STRINGP (result)) @@ -3262,7 +3263,7 @@ /* Don't die if we get called with a terminal frame. */ if (! FRAME_X_P (f)) - error ("non-X frame used in `x-list-fonts'"); + error ("Non-X frame used in `x-list-fonts'"); face_id = face_name_id_number (f, face);