From 3705a2cfa6fb4cae4c1aca495e2952be0a294e28 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Tue, 19 Feb 2008 04:07:52 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@895 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/ex_cmds.c | 4 ++++
 src/version.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index f207ee7e..a87dab6a 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -365,6 +365,10 @@ ex_sort(eap)
     int		sort_oct;		/* sort on octal number */
     int		sort_hex;		/* sort on hex number */
 
+    /* Sorting one line is really quick! */
+    if (count <= 1)
+	return;
+
     if (u_save((linenr_T)(eap->line1 - 1), (linenr_T)(eap->line2 + 1)) == FAIL)
 	return;
     sortbuf1 = NULL;
diff --git a/src/version.c b/src/version.c
index 2c3b9c6e..dc7a05a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    253,
+/**/
     252,
 /**/
     251,
-- 
2.11.4.GIT