diff options
| author | Dmitry Antipov | 2014-07-17 14:18:19 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-07-17 14:18:19 +0400 |
| commit | 5d59504a3198da6173a8cc1d4125a76b657b4538 (patch) | |
| tree | b1d028d1e7b7a90c8d56140aff7f6416254507cc /src/data.c | |
| parent | b1bfebbfc50e3d83a76ec1469b1e4570b1b022bc (diff) | |
| download | emacs-5d59504a3198da6173a8cc1d4125a76b657b4538.tar.gz emacs-5d59504a3198da6173a8cc1d4125a76b657b4538.zip | |
* data.c (wrong_choice): Not static any more.
* lisp.h (wrong_choice): Add prototype.
* frame.h (struct frame) [USE_X_TOOLKIT || HAVE_NTGUI]:
Declare namebuf as such. Tweak comment.
[USE_GTK]: Likewise for tool_bar_position.
(fset_tool_bar_position) [USE_GTK]: Ditto.
(FRAME_TOOL_BAR_POSITION): New macro.
* frame.c (x_report_frame_params):
* gtkutil.c (update_frame_tool_bar):
* xfns.c (Fx_create_frame): Use it.
(x_set_tool_bar_position): Add meaningful diagnostic messages.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index 790d0fee981..3e651414e68 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -974,7 +974,7 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents) | |||
| 974 | /* Used to signal a user-friendly error when symbol WRONG is | 974 | /* Used to signal a user-friendly error when symbol WRONG is |
| 975 | not a member of CHOICE, which should be a list of symbols. */ | 975 | not a member of CHOICE, which should be a list of symbols. */ |
| 976 | 976 | ||
| 977 | static void | 977 | void |
| 978 | wrong_choice (Lisp_Object choice, Lisp_Object wrong) | 978 | wrong_choice (Lisp_Object choice, Lisp_Object wrong) |
| 979 | { | 979 | { |
| 980 | ptrdiff_t i = 0, len = XINT (Flength (choice)); | 980 | ptrdiff_t i = 0, len = XINT (Flength (choice)); |