Index: lib/TWiki/UI/View.pm
===================================================================
--- lib/TWiki/UI/View.pm	(revision 3733)
+++ lib/TWiki/UI/View.pm	(working copy)
@@ -138,7 +138,7 @@
         if( $skin !~ /^text/ ) {
             my $vtext = "<form><textarea readonly=\"readonly\" " .
               "wrap=\"virtual\" rows=\"\%EDITBOXHEIGHT%\" " .
-	        "style=\"\%EDITBOXSTYLE%\" " .
+               "style=\"\%EDITBOXSTYLE%\" " .
                 "cols=\"\%EDITBOXWIDTH%\">";
             $vtext = $session->handleCommonTags( $vtext, $webName, $topicName );
             $text = TWiki::entityEncode( $text );
@@ -221,33 +221,39 @@
 
     # SMELL: HUH? - TODO: why would you not show the revisions around
     # the version that you are displaying? and this logic is yucky@!
-    my $i = $maxrev;
-    my $j = $maxrev;
+    use integer;
+    my $revsToShow = $TWiki::cfg{NumberOfRevisions};
+    my $doRev = $rev + $revsToShow / 2;
+    $doRev = $maxrev if $doRev > $maxrev;
+    $doRev = $revsToShow if $doRev < $revsToShow;
     my $revisions = "";
-    my $breakRev = 0;
-    if( ( $TWiki::cfg{NumberOfRevisions} > 0 ) &&
-        ( $TWiki::cfg{NumberOfRevisions} < $maxrev ) ) {
-        $breakRev = $maxrev - $TWiki::cfg{NumberOfRevisions} + 1;
+    if ($doRev != $maxrev) {
+        # force the presence of a link to the latest revision
+        $revisions = "<a href=\"".
+            $session->getScriptUrl( $webName, $topicName, "view" ) .
+            "\" $TWiki::cfg{NoFollow}>r$maxrev</a>";
+        if ($doRev == $maxrev-1) {
+            # for uniformity, force the presence of a difflink
+            $revisions = "$revisions | <a href=\"".
+                $session->getScriptUrl( $webName, $topicName, "rdiff").
+                "?rev1=$maxrev&amp;rev2=$doRev\" $TWiki::cfg{NoFollow}>&gt;</a>";
+        }
     }
-    while( $i > 0 ) {
-        if( $i == $rev) {
-            $revisions = "$revisions | r$i";
+    while( $revsToShow > 0 ) {
+        if( $doRev == $rev) {
+            $revisions = "$revisions | r$rev";
         } else {
             $revisions = "$revisions | <a href=\"".
-              $session->getScriptUrl( $webName, $topicName, "view" ) .
-                "?rev=$i\" $TWiki::cfg{NoFollow}>r$i</a>";
+                $session->getScriptUrl( $webName, $topicName, "view" ) .
+                "?rev=$doRev\" $TWiki::cfg{NoFollow}>r$doRev</a>";
         }
-        if( $i != 1 ) {
-            if( $i == $breakRev ) {
-                $i = 1;
-            } else {
-                $j = $i - 1;
-                $revisions = "$revisions | <a href=\"".
-                  $session->getScriptUrl( $webName, $topicName, "rdiff").
-                    "?rev1=$i&amp;rev2=$j\" $TWiki::cfg{NoFollow}>&gt;</a>";
-            }
+        if( $revsToShow != 1 ) {
+            $revisions = "$revisions | <a href=\"".
+                $session->getScriptUrl( $webName, $topicName, "rdiff").
+                "?rev1=$doRev&amp;rev2=".($doRev-1)."\" $TWiki::cfg{NoFollow}>&gt;</a>";
         }
-        $i = $i - 1;
+        $revsToShow = $revsToShow - 1;
+        $doRev = $doRev - 1;
     }
     $tmpl =~ s/%REVISIONS%/$revisions/go;