Patch 8.1.0380
Problem: "make proto" doesn't work well.
Solution: Define a few more types for cproto. Update proto files. Fix that
workshop didn't build.
Files: src/vim.h, src/protodef.h, src/if_ruby.c, src/workshop.c,
src/proto/digraph.pro, src/proto/hardcopy.pro,
src/proto/option.pro, src/proto/window.pro
*** ../vim-8.1.0379/src/vim.h 2018-09-11 21:30:05.253070476 +0200
--- src/vim.h 2018-09-13 16:39:27.014182296 +0200
***************
*** 9,18 ****
#ifndef VIM__H
# define VIM__H
! #ifdef PROTO
! /* cproto runs into trouble when this type is missing */
! typedef double _Float128;
! #endif
/* use fastcall for Borland, when compiling for Win32 */
#if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
--- 9,15 ----
#ifndef VIM__H
# define VIM__H
! #include "protodef.h"
/* use fastcall for Borland, when compiling for Win32 */
#if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
*** ../vim-8.1.0379/src/protodef.h 2018-09-13 17:25:18.544025832 +0200
--- src/protodef.h 2018-09-13 16:39:03.850408009 +0200
***************
*** 0 ****
--- 1,18 ----
+ /* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved by Bram Moolenaar
+ *
+ * Do ":help uganda" in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ */
+
+ #ifdef PROTO
+ // cproto runs into trouble when these types are missing
+ typedef double _Float16;
+ typedef double _Float32;
+ typedef double _Float64;
+ typedef double _Float128;
+ typedef double _Float32x;
+ typedef double _Float64x;
+ #endif
+
*** ../vim-8.1.0379/src/if_ruby.c 2018-08-11 14:24:06.945748177 +0200
--- src/if_ruby.c 2018-09-13 16:38:17.706857582 +0200
***************
*** 11,16 ****
--- 11,17 ----
* See README.txt for an overview of the Vim source code.
*/
+ #include "protodef.h"
#ifdef HAVE_CONFIG_H
# include "auto/config.h"
#endif
*** ../vim-8.1.0379/src/workshop.c 2018-06-23 19:22:45.618486231 +0200
--- src/workshop.c 2018-09-13 16:42:46.020194024 +0200
***************
*** 8,13 ****
--- 8,14 ----
* See README.txt for an overview of the Vim source code.
*/
+ #include "protodef.h"
#ifdef HAVE_CONFIG_H
# include "auto/config.h"
#endif
***************
*** 1541,1547 ****
#ifdef FEAT_VARTABS
idx = computeIndex(col, text, beval->ts, beval->vts);
#else
! idx = computeIndex(col, text, beval->ts);
#endif
if (idx > 0)
{
--- 1542,1548 ----
#ifdef FEAT_VARTABS
idx = computeIndex(col, text, beval->ts, beval->vts);
#else
! idx = computeIndex(col, text, beval->ts, 0);
#endif
if (idx > 0)
{
***************
*** 1577,1587 ****
computeIndex(
int wantedCol,
char_u *line,
! int ts
! #ifdef FEAT_VARTABS
! int *vts
! #else
! )
{
int col = 0;
int idx = 0;
--- 1578,1585 ----
computeIndex(
int wantedCol,
char_u *line,
! int ts,
! int *vts UNUSED)
{
int col = 0;
int idx = 0;
*** ../vim-8.1.0379/src/proto/digraph.pro 2018-05-17 13:52:31.000000000
+0200
--- src/proto/digraph.pro 2018-09-13 17:24:19.032531752 +0200
***************
*** 1,6 ****
/* digraph.c */
int do_digraph(int c);
! char_u *get_digraph_for_char(int val);
int get_digraph(int cmdline);
int getdigraph(int char1, int char2, int meta_char);
void putdigraph(char_u *str);
--- 1,6 ----
/* digraph.c */
int do_digraph(int c);
! char_u *get_digraph_for_char(int val_arg);
int get_digraph(int cmdline);
int getdigraph(int char1, int char2, int meta_char);
void putdigraph(char_u *str);
*** ../vim-8.1.0379/src/proto/hardcopy.pro 2018-05-17 13:52:37.000000000
+0200
--- src/proto/hardcopy.pro 2018-09-13 17:24:22.172505209 +0200
***************
*** 13,19 ****
int mch_print_begin_page(char_u *str);
int mch_print_blank_page(void);
void mch_print_start_line(int margin, int page_line);
! int mch_print_text_out(char_u *p, int len);
void mch_print_set_font(int iBold, int iItalic, int iUnderline);
void mch_print_set_bg(long_u bgcol);
void mch_print_set_fg(long_u fgcol);
--- 13,19 ----
int mch_print_begin_page(char_u *str);
int mch_print_blank_page(void);
void mch_print_start_line(int margin, int page_line);
! int mch_print_text_out(char_u *textp, int len);
void mch_print_set_font(int iBold, int iItalic, int iUnderline);
void mch_print_set_bg(long_u bgcol);
void mch_print_set_fg(long_u fgcol);
*** ../vim-8.1.0379/src/proto/option.pro 2018-06-23 19:22:45.614486258
+0200
--- src/proto/option.pro 2018-09-13 17:24:28.040455557 +0200
***************
*** 64,70 ****
int tabstop_padding(colnr_T col, int ts_arg, int *vts);
int tabstop_at(colnr_T col, int ts, int *vts);
colnr_T tabstop_start(colnr_T col, int ts, int *vts);
! void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts, int *vts, int
*ntabs, int *nspcs);
int tabstop_eq(int *ts1, int *ts2);
int *tabstop_copy(int *oldts);
int tabstop_count(int *ts);
--- 64,70 ----
int tabstop_padding(colnr_T col, int ts_arg, int *vts);
int tabstop_at(colnr_T col, int ts, int *vts);
colnr_T tabstop_start(colnr_T col, int ts, int *vts);
! void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts_arg, int *vts,
int *ntabs, int *nspcs);
int tabstop_eq(int *ts1, int *ts2);
int *tabstop_copy(int *oldts);
int tabstop_count(int *ts);
*** ../vim-8.1.0379/src/proto/window.pro 2018-08-21 16:56:28.367325278
+0200
--- src/proto/window.pro 2018-09-13 17:24:32.976413749 +0200
***************
*** 94,98 ****
win_T *win_id2wp(typval_T *argvars);
int win_id2win(typval_T *argvars);
void win_findbuf(typval_T *argvars, list_T *list);
! void get_framelayout(frame_T *fr, list_T *l, int topframe);
/* vim: set ft=c : */
--- 94,98 ----
win_T *win_id2wp(typval_T *argvars);
int win_id2win(typval_T *argvars);
void win_findbuf(typval_T *argvars, list_T *list);
! void get_framelayout(frame_T *fr, list_T *l, int outer);
/* vim: set ft=c : */
*** ../vim-8.1.0379/src/version.c 2018-09-13 17:23:05.169150892 +0200
--- src/version.c 2018-09-13 17:24:14.340571382 +0200
***************
*** 796,797 ****
--- 796,799 ----
{ /* Add new patch number below this line */
+ /**/
+ 380,
/**/
--
George: "I just got a new set of golf clubs for my wife!"
John: "Great trade!"
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
