Permalink
Browse files

updated for version 7.0098

  • Loading branch information...
1 parent 3823661 commit a87efd30ea8c5b1c5ecee2f96852c574497cd256 vimboss committed Jun 30, 2005
View
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0aa. Last change: 2005 Jun 28
+*options.txt* For Vim version 7.0aa. Last change: 2005 Jun 30
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1443,7 +1443,8 @@ A jump table for the options with a short description can be found at |Q_op|.
|fold-marker|.
*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
-'compatible' 'cp' boolean (default on, off when a .vimrc file is found)
+'compatible' 'cp' boolean (default on, off when a .vimrc or .gvimrc file
+ is found)
global
{not in Vi}
This option has the effect of making Vim either more Vi-compatible, or
@@ -1458,12 +1459,13 @@ A jump table for the options with a short description can be found at |Q_op|.
options. This default was chosen for those people who want to use Vim
just like Vi, and don't even (want to) know about the 'compatible'
option.
- When a ".vimrc" file is found while Vim is starting up, this option is
- switched off, and all options that have not been modified will be set
- to the Vim defaults. Effectively, this means that when a ".vimrc"
- file exists, Vim will use the Vim defaults, otherwise it will use the
- Vi defaults. (Note: This doesn't happen for the system-wide vimrc
- file). Also see |compatible-default| and |posix-compliance|.
+ When a ".vimrc" or ".gvimrc" file is found while Vim is starting up,
+ this option is switched off, and all options that have not been
+ modified will be set to the Vim defaults. Effectively, this means
+ that when a ".vimrc" or ".gvimrc" file exists, Vim will use the Vim
+ defaults, otherwise it will use the Vi defaults. (Note: This doesn't
+ happen for the system-wide vimrc or gvimrc file). Also see
+ |compatible-default| and |posix-compliance|.
You can also set this option with the "-C" argument, and reset it with
"-N". See |-C| and |-N|.
Switching this option off makes the Vim defaults be used for options
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-*starting.txt* For Vim version 7.0aa. Last change: 2005 May 31
+*starting.txt* For Vim version 7.0aa. Last change: 2005 Jun 30
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -890,7 +890,8 @@ set, it will be set to 'nocompatible'. This has the side effect of setting or
resetting other options (see 'compatible'). But only the options that have
not been set or reset will be changed. This has the same effect like the
value of 'compatible' had this value when starting Vim. Note that this
-doesn't happen for the system-wide vimrc file.
+doesn't happen for the system-wide vimrc file. It does also happen for gvimrc
+files.
But there is a side effect of setting or resetting 'compatible' at the moment
a .vimrc file is found: Mappings are interpreted the moment they are
View
@@ -6293,6 +6293,7 @@ spell-load spell.txt /*spell-load*
spell-midword spell.txt /*spell-midword*
spell-mkspell spell.txt /*spell-mkspell*
spell-quickstart spell.txt /*spell-quickstart*
+spell-remarks spell.txt /*spell-remarks*
spell-syntax spell.txt /*spell-syntax*
spell-wordlist-format spell.txt /*spell-wordlist-format*
spell.txt spell.txt /*spell.txt*
View
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Jun 29
+" Last Change: 2005 Jun 30
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -1585,7 +1585,27 @@ au BufNewFile,BufRead *.slt setf tsalt
au BufNewFile,BufRead *.ti setf terminfo
" TeX
-au BufNewFile,BufRead *.tex,*.latex,*.sty,*.dtx,*.ltx,*.bbl setf tex
+au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl setf tex
+au BufNewFile,BufRead *.tex call s:FTtex()
+
+fun! s:FTtex()
+ let n = 1
+ while n < 10 && n < line("$")
+ let line = getline(n)
+ if line =~ '^\s*\\\%(documentclass\>\|usepackage\>\|begin{\)'
+ setf tex
+ return
+ elseif line =~ '^\s*\\\%(start\l\+\|setup\l\+\|usemodule\)\>'
+ setf context
+ return
+ endif
+ let n = n + 1
+ endwhile
+ setf tex
+endfun
+
+" Context
+au BufNewFile,BufRead tex/context/*/*.tex setf context
" Texinfo
au BufNewFile,BufRead *.texinfo,*.texi,*.txi setf texinfo
@@ -1746,7 +1766,7 @@ au BufNewFile,BufRead *.y call s:FTy()
fun! s:FTy()
let n = 1
- while n < 10
+ while n < 10 && n < line("$")
if getline(n) =~ '^\s*\(#\|class\>\)'
setf racc
return
View
@@ -1,6 +1,6 @@
" Vim indent file
" Language: C-shell (tcsh)
-" Maintainor: Gautam Iyer <gautam@math.uchicago.edu>
+" Maintainer: Gautam Iyer <gautam@math.uchicago.edu>
" Last Modified: Wed 04 Feb 2004 04:36:07 PM CST
" Only load this indent file when no other was loaded.
View
@@ -4829,7 +4829,7 @@ struct prt_dsc_line_S
#define SIZEOF_CSTR(s) (sizeof(s) - 1)
-struct prt_dsc_comment_S prt_dsc_table[] =
+static struct prt_dsc_comment_S prt_dsc_table[] =
{
{PRT_DSC_TITLE, SIZEOF_CSTR(PRT_DSC_TITLE), PRT_DSC_TITLE_TYPE},
{PRT_DSC_VERSION, SIZEOF_CSTR(PRT_DSC_VERSION),
@@ -4876,6 +4876,7 @@ static int prt_next_dsc __ARGS((struct prt_dsc_line_S *p_dsc_line));
#ifdef FEAT_MBYTE
static int prt_build_cid_fontname __ARGS((int font, char_u *name, int name_len));
static void prt_def_cidfont __ARGS((char *new_name, int height, char *cidfont));
+static void prt_dup_cidfont __ARGS((char *original_name, char *new_name));
static int prt_match_encoding __ARGS((char *p_encoding, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_encoding_S **pp_mbenc));
static int prt_match_charset __ARGS((char *p_charset, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_charset_S **pp_mbchar));
#endif
View
@@ -19,8 +19,10 @@ extern "C" {
BOOL WINAPI global_ime_TranslateMessage(CONST MSG *);
void WINAPI global_ime_set_position(POINT*);
void WINAPI global_ime_set_font(LOGFONT*);
+#if 0
void WINAPI global_ime_status_evacuate(void);
void WINAPI global_ime_status_restore(void);
+#endif
void WINAPI global_ime_set_status(int status);
int WINAPI global_ime_get_status(void);
#ifdef __cplusplus
View
@@ -989,7 +989,6 @@ EXTERN char breakat_flags[256]; /* which characters are in 'breakat' */
/* these are in version.c */
extern char *Version;
-extern char *mediumVersion;
#if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
extern char longVersion[];
#else
@@ -1200,11 +1199,6 @@ EXTERN char pseps[2] /* normal path separator string */
= {'\\', 0}
# endif
;
-EXTERN char psepsN[2] /* abnormal path separator string */
-# ifdef DO_INIT
- = {'/', 0}
-# endif
- ;
#endif
#ifdef FEAT_VIRTUALEDIT
@@ -1244,7 +1238,6 @@ EXTERN char *netbeansArg INIT(= NULL); /* the -nb[:host:port:passwd] arg */
EXTERN int netbeansCloseFile INIT(= 0); /* send killed if != 0 */
EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
-EXTERN int netbeansOpenFile INIT(= 1); /* send fileOpened if != 0 */
EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */
EXTERN int netbeansSuppressNoLines INIT(= 0); /* skip "No lines in buffer" */
EXTERN int usingNetbeans INIT(= 0); /* set if -nb flag is used */
View
@@ -29,7 +29,6 @@
#define CSCOPE_DBFILE "cscope.out"
#define CSCOPE_PROMPT ">> "
-#define CSCOPE_QUERIES "sgdct efi"
/*
* s 0name Find this C symbol
View
@@ -1366,6 +1366,7 @@ del_trailing_spaces(ptr)
/*
* Like strncpy(), but always terminate the result with one NUL.
+ * "to" must be "len + 1" long!
*/
void
vim_strncpy(to, from, len)
View
@@ -24,7 +24,6 @@
#endif
#define nbdebug(a) nbdbg##a
-#define nbprint(a) nbprt##a
#define NB_TRACE 0x00000001
#define NB_TRACE_VERBOSE 0x00000002
View
@@ -6645,14 +6645,12 @@ set_bool_option(opt_idx, varp, value, opt_flags)
psepc = '/';
psepcN = '\\';
pseps[0] = '/';
- psepsN[0] = '\\';
}
else
{
psepc = '\\';
psepcN = '/';
pseps[0] = '\\';
- psepsN[0] = '/';
}
/* need to adjust the file name arguments and buffer names. */
View
@@ -467,7 +467,9 @@ static char *(p_fdo_values[]) = {"all", "block", "hor", "mark", "percent",
# define FDO_JUMP 0x400
#endif
EXTERN char_u *p_fp; /* 'formatprg' */
+#ifdef HAVE_FSYNC
EXTERN int p_fs; /* 'fsync' */
+#endif
EXTERN int p_gd; /* 'gdefault' */
#ifdef FEAT_PRINTER
EXTERN char_u *p_pdev; /* 'printdevice' */
View
@@ -14,7 +14,6 @@
#define BINARY_FILE_IO
#define USE_EXE_NAME /* use argv[0] for $VIM */
-#define NO_COOKED_INPUT /* mch_inchar() doesn't return whole lines */
#define SYNC_DUP_CLOSE /* sync() a file with dup() and close() */
#define USE_TERM_CONSOLE
#ifdef DJGPP
View
@@ -2509,8 +2509,8 @@ win_line(wp, lnum, startrow, endrow)
starts */
int spell_attr = 0; /* attributes desired by spelling */
int word_end = 0; /* last byte with same spell_attr */
- static linenr_T checked_lnum = 0; /* line number for checked_col */
- static int checked_col = 0; /* column in checked_lnum up to which
+ static linenr_T checked_lnum = 0; /* line number for "checked_col" */
+ static int checked_col = 0; /* column in "checked_lnum" up to which
* there are no spell errors */
int cur_checked_col = 0; /* checked column for current line */
#endif
View
@@ -1469,7 +1469,10 @@ struct file_buffer
/* for spell checking */
garray_T b_langp; /* list of pointers to slang_T, see spell.c */
-
+ char_u b_spell_ismw[256];/* flags: is midword char */
+# ifdef FEAT_MBYTE
+ char_u *b_spell_ismw_mb; /* multi-byte midword chars */
+# endif
#endif /* FEAT_SYN_HL */
#ifdef FEAT_SIGNS
View
@@ -27,8 +27,8 @@
#include "version.h"
-char *Version = VIM_VERSION_SHORT;
-char *mediumVersion = VIM_VERSION_MEDIUM;
+char *Version = VIM_VERSION_SHORT;
+static char *mediumVersion = VIM_VERSION_MEDIUM;
#if defined(HAVE_DATE_TIME) || defined(PROTO)
# if (defined(VMS) && defined(VAXC)) || defined(PROTO)
View
@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 29)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 29, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 30)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 30, compiled "

0 comments on commit a87efd3

Please sign in to comment.