diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2001-06-15 11:31:11 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2001-06-15 11:31:11 +0000 |
| commit | 0ae833485ba366bd68782f9f17e2c62e18a53455 (patch) | |
| tree | fe8dbedde96d900aad3e698813d11c749c7a60c3 /src | |
| parent | 17a37d874c348fe64da02f639c8efaaa721e99d4 (diff) | |
| download | emacs-0ae833485ba366bd68782f9f17e2c62e18a53455.tar.gz | |
(Fmessage_box): If the frame is not under a window
system, output the message in the echo area.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/editfns.c | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7ebea9bff45..7575dca29d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-06-15 Eli Zaretskii <eliz@is.elta.co.il> + + * editfns.c (Fmessage_box): If the frame is not under a window + system, output the message in the echo area. + 2001-06-14 Richard M. Stallman <rms@gnu.org> * xdisp.c (try_window_id): When EOB is visible, don't treat diff --git a/src/editfns.c b/src/editfns.c index 37f0162458d..7efa75383ce 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA. */ #include "buffer.h" #include "charset.h" #include "coding.h" +#include "frame.h" #include "window.h" #include "systime.h" @@ -2915,16 +2916,12 @@ use `save-excursion' outermost:\n\ return unbind_to (count, val); } -#ifndef HAVE_MENUS - -/* Buffer for the most recent text displayed by Fmessage. */ +/* Buffer for the most recent text displayed by Fmessage_box. */ static char *message_text; /* Allocated length of that buffer. */ static int message_length; -#endif /* not HAVE_MENUS */ - DEFUN ("message", Fmessage, Smessage, 1, MANY, 0, "Print a one-line message at the bottom of the screen.\n\ The first argument is a format control string, and the rest are data\n\ @@ -2972,6 +2969,10 @@ minibuffer contents show.") register Lisp_Object val; val = Fformat (nargs, args); #ifdef HAVE_MENUS + /* The MS-DOS frames support popup menus even though they are + not FRAME_WINDOW_P. */ + if (FRAME_WINDOW_P (XFRAME (selected_frame)) + || FRAME_MSDOS_P (XFRAME (selected_frame))) { Lisp_Object pane, menu, obj; struct gcpro gcpro1; @@ -2982,7 +2983,7 @@ minibuffer contents show.") UNGCPRO; return val; } -#else /* not HAVE_MENUS */ +#endif /* HAVE_MENUS */ /* Copy the data so that it won't move when we GC. */ if (! message_text) { @@ -2998,7 +2999,6 @@ minibuffer contents show.") message2 (message_text, STRING_BYTES (XSTRING (val)), STRING_MULTIBYTE (val)); return val; -#endif /* not HAVE_MENUS */ } } #ifdef HAVE_MENUS |