To: vim_dev@googlegroups.com
Subject: Patch 7.3.770
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
 
Patch 7.3.770
Problem:    Vim.h indentation is inconsistent.
Solution:   Adjust the indentation. (Elias Diem)
Files:      src/vim.h
 
 
*** ../vim-7.3.769/src/vim.h	2012-08-15 14:04:50.000000000 +0200
--- src/vim.h	2013-01-17 17:12:54.000000000 +0100
***************
*** 104,110 ****
  # endif
  #endif
  #if defined(MACOS_X) || defined(MACOS_CLASSIC)
! #  define MACOS
  #endif
  #if defined(MACOS_X) && defined(MACOS_CLASSIC)
      Error: To compile for both MACOS X and Classic use a Classic Carbon
--- 104,110 ----
  # endif
  #endif
  #if defined(MACOS_X) || defined(MACOS_CLASSIC)
! # define MACOS
  #endif
  #if defined(MACOS_X) && defined(MACOS_CLASSIC)
      Error: To compile for both MACOS X and Classic use a Classic Carbon
***************
*** 490,496 ****
  #  include <string.h>
  # endif
  # if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H)
! #   include <strings.h>
  # endif
  # ifdef HAVE_STAT_H
  #  include <stat.h>
--- 490,496 ----
  #  include <string.h>
  # endif
  # if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H)
! #  include <strings.h>
  # endif
  # ifdef HAVE_STAT_H
  #  include <stat.h>
***************
*** 515,536 ****
  # include <stdarg.h>
  #endif
  
! # if defined(HAVE_SYS_SELECT_H) && \
  	(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
! #  include <sys/select.h>
! # endif
  
! # 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
- #   endif
  #  endif
  # endif
  
  /* ================ end of the header file puzzle =============== */
  
--- 515,536 ----
  # include <stdarg.h>
  #endif
  
! #if defined(HAVE_SYS_SELECT_H) && \
  	(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
! # include <sys/select.h>
! #endif
  
! #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
  #  endif
  # endif
+ #endif
  
  /* ================ end of the header file puzzle =============== */
  
***************
*** 1877,1884 ****
  /* 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"
  
  /* Selection states for modeless selection */
  # define SELECT_CLEARED		0
--- 1877,1884 ----
  /* 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"
  
  /* Selection states for modeless selection */
  # define SELECT_CLEARED		0
*** ../vim-7.3.769/src/version.c	2013-01-17 17:01:57.000000000 +0100
--- src/version.c	2013-01-17 17:16:45.000000000 +0100
***************
*** 727,728 ****
--- 727,730 ----
  {   /* Add new patch number below this line */
+ /**/
+     770,
  /**/
 
-- 
FIRST HEAD: All right! All right! We'll kill him first and then have tea and
            biscuits.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
 
 /// Bram Moolenaar -- Bram@Moolenaar.net -- 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    ///