From f1dc4965b51903f1235c4d1145c57ada40c517aa Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 10 May 2007 16:50:23 +0000
Subject: [PATCH] updated for version 7.1b
---
runtime/doc/gui.txt | 2 +-
runtime/doc/os_qnx.txt | 2 +-
runtime/indent/css.vim | 21 +++++++++++----------
src/message.c | 6 +++---
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 1d413c31bb..4d5d20e8da 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt* For Vim version 7.1a. Last change: 2006 Aug 08
+*gui.txt* For Vim version 7.1b. Last change: 2006 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt
index 5faad515f4..52d7ed141c 100644
--- a/runtime/doc/os_qnx.txt
+++ b/runtime/doc/os_qnx.txt
@@ -1,4 +1,4 @@
-*os_qnx.txt* For Vim version 7.1a. Last change: 2005 Mar 29
+*os_qnx.txt* For Vim version 7.1b. Last change: 2005 Mar 29
VIM REFERENCE MANUAL by Julian Kinraid
diff --git a/runtime/indent/css.vim b/runtime/indent/css.vim
index be1c4d73ec..d13c1ad48c 100644
--- a/runtime/indent/css.vim
+++ b/runtime/indent/css.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: CSS
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2006-04-19
+" Latest Revision: 2006-12-20
if exists("b:did_indent")
finish
@@ -10,6 +10,7 @@ let b:did_indent = 1
setlocal indentexpr=GetCSSIndent()
setlocal indentkeys=0{,0},!^F,o,O
+setlocal nosmartindent
if exists("*GetCSSIndent")
finish
@@ -22,12 +23,12 @@ function s:prevnonblanknoncomment(lnum)
let line = getline(lnum)
if line =~ '\*/'
while lnum > 1 && line !~ '/\*'
- let lnum -= 1
+ let lnum -= 1
endwhile
if line =~ '^\s*/\*'
- let lnum -= 1
+ let lnum -= 1
else
- break
+ break
endif
else
break
@@ -45,13 +46,13 @@ function s:count_braces(lnum, count_open)
while i != -1
if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'css\%(Comment\|StringQ\{1,2}\)'
if line[i] == '{'
- let n_open += 1
+ let n_open += 1
elseif line[i] == '}'
- if n_open > 0
- let n_open -= 1
- else
- let n_close += 1
- endif
+ if n_open > 0
+ let n_open -= 1
+ else
+ let n_close += 1
+ endif
endif
endif
let i = match(line, pattern, i + 1)
diff --git a/src/message.c b/src/message.c
index 0c40823a78..8bb27cddc4 100644
--- a/src/message.c
+++ b/src/message.c
@@ -3042,7 +3042,7 @@ redir_write(str, maxlen)
}
/*
- * Before giving verbose messsage.
+ * Before giving verbose message.
* Must always be called paired with verbose_leave()!
*/
void
@@ -3864,7 +3864,7 @@ tv_str(tvs, idxp)
*
* This code is based on snprintf.c - a portable implementation of snprintf
* by Mark Martinec <mark.martinec@ijs.si>, Version 2.2, 2000-10-06.
- * Included with permission. It was heavely modified to fit in Vim.
+ * Included with permission. It was heavily modified to fit in Vim.
* The original code, including useful comments, can be found here:
* http://www.ijs.si/software/snprintf/
*
@@ -4453,7 +4453,7 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
/* unrecognized conversion specifier, keep format string
* as-is */
zero_padding = 0; /* turn zero padding off for non-numeric
- convers. */
+ conversion */
justify_left = 1;
min_field_width = 0; /* reset flags */
--
GitLab