diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-01-23 15:07:28 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-01-23 15:07:28 -0500 |
| commit | b09cca6ace3728ad8a93b3c0301520fa75e71586 (patch) | |
| tree | fa12508ec95ada37cf95445ecf91d8f7786dab7e /src/frame.h | |
| parent | 54ab1c5acf892f07dd8121d4bbafe7601a54bcb5 (diff) | |
* src/xdisp.c (message2, message2_nolog): Remove functions.
(message3, message3_nolog): Extract nbytes and multibyteness directly
from the string. Change all callers.
(message3_nolog): Don't set message_enable_multibyte since set_message
will reset it anyway.
(message1, message1_nolog): Use message3.
(vmessage): Use a stack allocated buffer rather than f->message_buf.
(with_echo_area_buffer): Remove last two arguments. Update all callers.
(set_message): Drop all but the second arg, which has to be a string.
(set_message_1): Simplify now that we know that a1 is NULL and the
second arg is a string.
* src/frame.h (struct frame): Remove `message_buf' field.
Use glyphs_initialized_p instead.
(FRAME_MESSAGE_BUF): Remove macro.
* src/w16select.c (Fw16_set_clipboard_data): Prefer message3 to message2.
* src/lisp.h (message2, message2_nolog): Remove declarations.
(message3, message3_nolog): Update declarations.
* src/keyboard.c (read_char_minibuf_menu_text)
(read_char_minibuf_menu_width): Remove vars.
(read_char_minibuf_menu_prompt): Rewrite the menu's construction so as
to correctly handle multibyte strings.
* src/frame.c (delete_frame): Don't free message_buf any more.
* src/editfns.c (message_text, message_length): Remove vars.
(Fmessage_box): Don't copy the Lisp string's bytes any longer.
* src/fileio.c (auto_save_error): Use message3 instead of message2.
* src/dispnew.c (adjust_frame_message_buffer): Remove function.
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/frame.h b/src/frame.h index ec535d4448..c2821066c8 100644 --- a/src/frame.h +++ b/src/frame.h @@ -18,7 +18,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Don't multiply include: dispextern.h includes macterm.h which includes frame.h some emacs source includes both dispextern.h and - frame.h */ + frame.h. */ #ifndef EMACS_FRAME_H #define EMACS_FRAME_H @@ -33,7 +33,7 @@ INLINE_HEADER_BEGIN /* Miscellanea. */ -/* Nonzero means there is at least one garbaged frame. */ +/* Nonzero means there is at least one garbaged frame. */ extern bool frame_garbaged; @@ -200,7 +200,7 @@ struct frame string's pointer (`name', above) because it might get relocated. */ char *namebuf; - /* Glyph pool and matrix. */ + /* Glyph pool and matrix. */ struct glyph_pool *current_pool; struct glyph_pool *desired_pool; struct glyph_matrix *desired_matrix; @@ -444,9 +444,6 @@ struct frame /* Width of bar cursor (if we are using that) for blink-off state. */ int blink_off_cursor_width; - /* Storage for messages to this frame. */ - char *message_buf; - /* Nonnegative if current redisplay should not do scroll computation for lines beyond a certain vpos. This is the vpos. */ int scroll_bottom_vpos; @@ -751,7 +748,6 @@ typedef struct frame *FRAME_PTR; #define FRAME_DELETE_COST(f) (f)->delete_line_cost #define FRAME_INSERTN_COST(f) (f)->insert_n_lines_cost #define FRAME_DELETEN_COST(f) (f)->delete_n_lines_cost -#define FRAME_MESSAGE_BUF(f) (f)->message_buf #define FRAME_SCROLL_BOTTOM_VPOS(f) (f)->scroll_bottom_vpos #define FRAME_FOCUS_FRAME(f) f->focus_frame |