comparison src/workshop.c @ 14736:3e9b24eac417 v8.1.0380

patch 8.1.0380: "make proto" doesn't work well commit https://github.com/vim/vim/commit/32d19c1820305729c0d1b21536b18bae2d8378ed Author: Bram Moolenaar <Bram@vim.org> Date: Thu Sep 13 17:26:54 2018 +0200 patch 8.1.0380: "make proto" doesn't work well Problem: "make proto" doesn't work well. Solution: Define a few more types for cproto. Update proto files. Fix that workshop didn't build.
author Christian Brabandt <cb@256bit.org>
date Thu, 13 Sep 2018 17:30:06 +0200
parents 2ad722003b36
children 27b9a84395b5
comparison
equal deleted inserted replaced
14735:d8679b4c9074 14736:3e9b24eac417
6 * Do ":help uganda" in Vim to read copying and usage conditions. 6 * Do ":help uganda" in Vim to read copying and usage conditions.
7 * Do ":help credits" in Vim to see a list of people who contributed. 7 * Do ":help credits" in Vim to see a list of people who contributed.
8 * See README.txt for an overview of the Vim source code. 8 * See README.txt for an overview of the Vim source code.
9 */ 9 */
10 10
11 #include "protodef.h"
11 #ifdef HAVE_CONFIG_H 12 #ifdef HAVE_CONFIG_H
12 # include "auto/config.h" 13 # include "auto/config.h"
13 #endif 14 #endif
14 #include <stdio.h> 15 #include <stdio.h>
15 #include <stdlib.h> 16 #include <stdlib.h>
1539 * line to 0 because thats what dbx expects. 1540 * line to 0 because thats what dbx expects.
1540 */ 1541 */
1541 #ifdef FEAT_VARTABS 1542 #ifdef FEAT_VARTABS
1542 idx = computeIndex(col, text, beval->ts, beval->vts); 1543 idx = computeIndex(col, text, beval->ts, beval->vts);
1543 #else 1544 #else
1544 idx = computeIndex(col, text, beval->ts); 1545 idx = computeIndex(col, text, beval->ts, 0);
1545 #endif 1546 #endif
1546 if (idx > 0) 1547 if (idx > 0)
1547 { 1548 {
1548 lnum = 0; 1549 lnum = 0;
1549 1550
1575 1576
1576 static int 1577 static int
1577 computeIndex( 1578 computeIndex(
1578 int wantedCol, 1579 int wantedCol,
1579 char_u *line, 1580 char_u *line,
1580 int ts 1581 int ts,
1581 #ifdef FEAT_VARTABS 1582 int *vts UNUSED)
1582 int *vts
1583 #else
1584 )
1585 { 1583 {
1586 int col = 0; 1584 int col = 0;
1587 int idx = 0; 1585 int idx = 0;
1588 1586
1589 while (line[idx]) 1587 while (line[idx])