summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-11-20 17:19:01 +0100
committerBram Moolenaar <Bram@vim.org>2012-11-20 17:19:01 +0100
commit8d4eecc5e876f5ead8984492ab482c00a9dcb511 (patch)
tree7411ee31fb1ec3c7651ea294eb5aaeddd9be477c /src
parentd59762dcb6f3dd15fd1e91745561c4558a7b75a6 (diff)
downloadvim-8d4eecc5e876f5ead8984492ab482c00a9dcb511.zip
updated for version 7.3.723
Problem: Various tiny problems. Solution: Various tiny fixes.
Diffstat (limited to 'src')
-rw-r--r--src/gui_mac.c2
-rw-r--r--src/if_sniff.c12
-rw-r--r--src/netbeans.c4
-rw-r--r--src/sha256.c4
-rw-r--r--src/version.c2
-rw-r--r--src/xpm_w32.c2
6 files changed, 15 insertions, 11 deletions
diff --git a/src/gui_mac.c b/src/gui_mac.c
index 69c190301..5ba9fec8f 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -5728,7 +5728,7 @@ gui_mch_dialog(
case VIM_QUESTION: useIcon = kNoteIcon; break;
case VIM_WARNING: useIcon = kCautionIcon; break;
case VIM_ERROR: useIcon = kStopIcon; break;
- default: useIcon = kStopIcon;
+ default: useIcon = kStopIcon;
}
AppendDITL(theDialog, iconDITL, overlayDITL);
ReleaseResource(iconDITL);
diff --git a/src/if_sniff.c b/src/if_sniff.c
index a9e9be022..5cacb72f6 100644
--- a/src/if_sniff.c
+++ b/src/if_sniff.c
@@ -449,7 +449,7 @@ find_sniff_cmd(cmd)
if (!sniff_cmd)
{
struct sn_cmd_list *list = sniff_cmd_ext;
- while(list)
+ while (list)
{
if (!strcmp(cmd, list->sniff_cmd->cmd_name))
{
@@ -479,7 +479,7 @@ add_sniff_cmd(cmd, def, msg)
/* unescape message text */
char *p = msg;
char *end = p+strlen(msg);
- while(*p)
+ while (*p)
{
if (*p == '\\')
mch_memmove(p,p+1,end-p);
@@ -489,7 +489,7 @@ add_sniff_cmd(cmd, def, msg)
SNIFF_TRACE1("request def = %s\n",def);
SNIFF_TRACE1("request msg = %s\n",msg);
- while(list && list->next_cmd)
+ while (list && list->next_cmd)
list = list->next_cmd;
if (!list)
sniff_cmd_ext = cmd_node;
@@ -628,7 +628,7 @@ sniff_disconnect(immediately)
gui_mch_wait_for_chars(0L);
#endif
#ifdef WIN32
- while(sniffBufStart != NULL)
+ while (sniffBufStart != NULL)
{
struct sniffBufNode *node = sniffBufStart;
sniffBufStart = sniffBufStart->next;
@@ -789,7 +789,7 @@ HandleSniffRequest(buffer)
command = buffer[0];
arguments = &buffer[1];
token = strtok(arguments, sniff_rq_sep);
- while(argc <3)
+ while (argc <3)
{
if (token)
{
@@ -925,7 +925,7 @@ HandleSniffRequest(buffer)
default :
break;
}
- while(argc)
+ while (argc)
vim_free(argv[--argc]);
}
diff --git a/src/netbeans.c b/src/netbeans.c
index d2f4ce4da..fc93f93a7 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -978,7 +978,7 @@ nb_free()
buf_list_used = 0;
/* free the queued key commands */
- while(key_node != NULL && key_node != &keyHead)
+ while (key_node != NULL && key_node != &keyHead)
{
keyQ_T *next = key_node->next;
vim_free(key_node->keystr);
@@ -993,7 +993,7 @@ nb_free()
}
/* free the queued netbeans commands */
- while(cmd_node != NULL && cmd_node != &head)
+ while (cmd_node != NULL && cmd_node != &head)
{
queue_T *next = cmd_node->next;
vim_free(cmd_node->buffer);
diff --git a/src/sha256.c b/src/sha256.c
index 0b931a8f6..3392fc08e 100644
--- a/src/sha256.c
+++ b/src/sha256.c
@@ -7,9 +7,11 @@
* See README.txt for an overview of the Vim source code.
*
* FIPS-180-2 compliant SHA-256 implementation
- * GPL by Christophe Devine.
+ * GPL by Christophe Devine, applies to older version.
* Modified for md5deep, in public domain.
* Modified For Vim, Mohsin Ahmed, http://www.cs.albany.edu/~mosh
+ * Mohsin Ahmed states this work is distributed under the VIM License or GPL,
+ * at your choice.
*
* Vim specific notes:
* Functions exported by this file:
diff --git a/src/version.c b/src/version.c
index 7c65bd417..fe31681cd 100644
--- 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 */
/**/
+ 723,
+/**/
722,
/**/
721,
diff --git a/src/xpm_w32.c b/src/xpm_w32.c
index 2ec32ed9f..7241fb6a9 100644
--- a/src/xpm_w32.c
+++ b/src/xpm_w32.c
@@ -55,7 +55,7 @@ LoadXpmImage(filename, hImage, hShape)
return -1;
if (shp == NULL)
{
- if (img)
+ if (img)
XDestroyImage(img);
return -1;
}