summaryrefslogtreecommitdiff
path: root/src/vim.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-12-06 19:50:41 +0000
committerBram Moolenaar <Bram@vim.org>2005-12-06 19:50:41 +0000
commitcef9dcc37ef6dce3d98cf1550c3731fff9d451b5 (patch)
tree1ed76e3b15dfd3280a92cf0699d5c851730f09bd /src/vim.h
parent943d2b5b80e81d2b089bd6ca391a5fcbaccdde24 (diff)
downloadvim-git-cef9dcc37ef6dce3d98cf1550c3731fff9d451b5.tar.gz
updated for version 7.0163
Diffstat (limited to 'src/vim.h')
-rw-r--r--src/vim.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/vim.h b/src/vim.h
index 16dc879e1..8b76721a0 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -57,7 +57,7 @@
/*
* MACOS_CLASSIC compiling for MacOS prior to MacOS X
* MACOS_X_UNIX compiling for MacOS X (using os_unix.c)
- * MACOS_X compiling for MacOS X (using os_unix.c or os_mac.c)
+ * MACOS_X compiling for MacOS X (using os_unix.c)
* MACOS compiling for either one
*/
#if defined(macintosh) && !defined(MACOS_CLASSIC)
@@ -68,10 +68,6 @@
# ifndef HAVE_CONFIG_H
# define UNIX
# endif
-# ifdef HAVE_STRINGS_H
-/* On Mac OS X strings.h exists but produces an annoying warning message. */
-# undef HAVE_STRINGS_H
-# endif
#endif
#if defined(MACOS_X) || defined(MACOS_CLASSIC)
# define MACOS
@@ -91,8 +87,7 @@
|| defined(FEAT_GUI_MAC) \
|| defined(FEAT_GUI_W32) \
|| defined(FEAT_GUI_W16) \
- || defined(FEAT_GUI_PHOTON) \
- || defined(FEAT_GUI_KDE)
+ || defined(FEAT_GUI_PHOTON)
# if !defined(FEAT_GUI) && !defined(NO_X11_INCLUDES)
# define FEAT_GUI
# endif
@@ -1091,6 +1086,7 @@ enum auto_event
EVENT_MENUPOPUP, /* just before popup menu is displayed */
EVENT_QUICKFIXCMDPOST, /* after :make, :grep etc */
EVENT_QUICKFIXCMDPRE, /* before :make, :grep etc */
+ EVENT_SESSIONLOADPOST, /* after loading a session file */
EVENT_STDINREADPOST, /* after reading from stdin */
EVENT_STDINREADPRE, /* before reading from stdin */
EVENT_SYNTAX, /* syntax selected */
@@ -1683,7 +1679,7 @@ typedef int proftime_T; /* dummy for function prototypes */
* been seen at that stage. But it must be before globals.h, where error_ga
* is declared. */
#if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \
- && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_KDE) && !defined(FEAT_GUI_MAC)
+ && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC)
# define mch_errmsg(str) fprintf(stderr, "%s", (str))
# define display_errors() fflush(stderr)
# define mch_msg(str) printf("%s", (str))