vim: move linenr_T and colnr_T to pos.h

Try to cut down vim.h's size. It's keeping us from testing more things.
This commit is contained in:
Nicolas Hillegeer 2014-07-06 17:27:09 +02:00
parent fb72f1ee37
commit e288ddaee7
5 changed files with 12 additions and 5 deletions

View File

@ -1,6 +1,8 @@
#ifndef NVIM_BUFFER_H #ifndef NVIM_BUFFER_H
#define NVIM_BUFFER_H #define NVIM_BUFFER_H
#include "nvim/pos.h" // for linenr_T
/* Values for buflist_getfile() */ /* Values for buflist_getfile() */
#define GETF_SETMARK 0x01 /* set pcmark before jumping */ #define GETF_SETMARK 0x01 /* set pcmark before jumping */
#define GETF_ALT 0x02 /* jumping to alternate file (not buf num) */ #define GETF_ALT 0x02 /* jumping to alternate file (not buf num) */

View File

@ -16,6 +16,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "nvim/pos.h" // for linenr_T
#include "nvim/normal.h" #include "nvim/normal.h"
/* /*

View File

@ -1,6 +1,8 @@
#ifndef NVIM_EX_EVAL_H #ifndef NVIM_EX_EVAL_H
#define NVIM_EX_EVAL_H #define NVIM_EX_EVAL_H
#include "nvim/pos.h" // for linenr_T
/* /*
* A list used for saving values of "emsg_silent". Used by ex_try() to save the * A list used for saving values of "emsg_silent". Used by ex_try() to save the
* value of "emsg_silent" if it was non-zero. When this is done, the CSF_SILENT * value of "emsg_silent" if it was non-zero. When this is done, the CSF_SILENT

View File

@ -1,6 +1,12 @@
#ifndef NVIM_POS_H #ifndef NVIM_POS_H
#define NVIM_POS_H #define NVIM_POS_H
typedef long linenr_T; // line number type
typedef int colnr_T; // column number type
#define MAXLNUM (0x7fffffffL) // maximum (invalid) line number
#define MAXCOL (0x7fffffffL) // maximum column number, 31 bits
/* /*
* position in file or buffer * position in file or buffer
*/ */

View File

@ -9,6 +9,7 @@
# define NVIM_VIM_H # define NVIM_VIM_H
#include "nvim/types.h" #include "nvim/types.h"
#include "nvim/pos.h" // for linenr_T, MAXCOL, etc...
/* Some defines from the old feature.h */ /* Some defines from the old feature.h */
#define SESSION_FILE "Session.vim" #define SESSION_FILE "Session.vim"
@ -354,13 +355,8 @@ enum {
#define PERROR(msg) \ #define PERROR(msg) \
(void) emsg3((char_u *) "%s: %s", (char_u *)msg, (char_u *)strerror(errno)) (void) emsg3((char_u *) "%s: %s", (char_u *)msg, (char_u *)strerror(errno))
typedef long linenr_T; /* line number type */
typedef int colnr_T; /* column number type */
typedef unsigned short disptick_T; /* display tick type */ typedef unsigned short disptick_T; /* display tick type */
#define MAXLNUM (0x7fffffffL) /* maximum (invalid) line number */
#define MAXCOL (0x7fffffffL) /* maximum column number, 31 bits */
#define SHOWCMD_COLS 10 /* columns needed by shown command */ #define SHOWCMD_COLS 10 /* columns needed by shown command */
#define STL_MAX_ITEM 80 /* max nr of %<flag> in statusline */ #define STL_MAX_ITEM 80 /* max nr of %<flag> in statusline */