From 08ed30eca7d64e623a5363a6a0eac79af48ec1c0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 17 Jan 2013 17:17:26 +0100 Subject: [PATCH] updated for version 7.3.770 Problem: Vim.h indentation is inconsistent. Solution: Adjust the indentation. (Elias Diem) --- src/version.c | 2 ++ src/vim.h | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/version.c b/src/version.c index 6d15d58647..18fcd020f0 100644 --- a/src/version.c +++ b/src/version.c @@ -725,6 +725,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 770, /**/ 769, /**/ diff --git a/src/vim.h b/src/vim.h index 35b23105b6..a501a71e4d 100644 --- a/src/vim.h +++ b/src/vim.h @@ -104,7 +104,7 @@ # endif #endif #if defined(MACOS_X) || defined(MACOS_CLASSIC) -# define MACOS +# define MACOS #endif #if defined(MACOS_X) && defined(MACOS_CLASSIC) Error: To compile for both MACOS X and Classic use a Classic Carbon @@ -490,7 +490,7 @@ typedef unsigned long u8char_T; /* long should be 32 bits or more */ # include # endif # if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H) -# include +# include # endif # ifdef HAVE_STAT_H # include @@ -515,22 +515,22 @@ typedef unsigned long u8char_T; /* long should be 32 bits or more */ # include #endif -# if defined(HAVE_SYS_SELECT_H) && \ +#if defined(HAVE_SYS_SELECT_H) && \ (!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME)) -# include -# endif +# include +#endif -# ifndef HAVE_SELECT -# ifdef HAVE_SYS_POLL_H -# include +#ifndef HAVE_SELECT +# ifdef HAVE_SYS_POLL_H +# include +# define HAVE_POLL +# else +# ifdef HAVE_POLL_H +# include # define HAVE_POLL -# else -# ifdef HAVE_POLL_H -# include -# define HAVE_POLL -# endif # endif # endif +#endif /* ================ end of the header file puzzle =============== */ @@ -1877,8 +1877,8 @@ typedef int proftime_T; /* dummy for function prototypes */ /* VIM_ATOM_NAME is the older Vim-specific selection type for X11. Still * supported for when a mix of Vim versions is used. VIMENC_ATOM_NAME includes * the encoding to support Vims using different 'encoding' values. */ -#define VIM_ATOM_NAME "_VIM_TEXT" -#define VIMENC_ATOM_NAME "_VIMENC_TEXT" +# define VIM_ATOM_NAME "_VIM_TEXT" +# define VIMENC_ATOM_NAME "_VIMENC_TEXT" /* Selection states for modeless selection */ # define SELECT_CLEARED 0 -- 2.47.2