Mercurial > vim
changeset 4031:da7a7ba36ed2 v7.3.770
updated for version 7.3.770
Problem: Vim.h indentation is inconsistent.
Solution: Adjust the indentation. (Elias Diem)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Thu, 17 Jan 2013 17:17:26 +0100 |
parents | e27a6d286f3e |
children | bc8f5d7548ef |
files | src/version.c src/vim.h |
diffstat | 2 files changed, 17 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 770, +/**/ 769, /**/ 768,
--- 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; /* l # include <string.h> # endif # if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H) -# include <strings.h> +# include <strings.h> # endif # ifdef HAVE_STAT_H # include <stat.h> @@ -515,22 +515,22 @@ typedef unsigned long u8char_T; /* l # include <stdarg.h> #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 <sys/select.h> -# endif +# include <sys/select.h> +#endif -# ifndef HAVE_SELECT -# ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> +#ifndef HAVE_SELECT +# ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +# define HAVE_POLL +# else +# ifdef HAVE_POLL_H +# include <poll.h> # define HAVE_POLL -# else -# ifdef HAVE_POLL_H -# include <poll.h> -# define HAVE_POLL -# endif # endif # endif +#endif /* ================ end of the header file puzzle =============== */ @@ -1877,8 +1877,8 @@ typedef int proftime_T; /* dummy for /* 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