From 8795efdf19ad72d85b2cdc1ec1db447178520b74 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Wed, 2 Jul 2014 23:58:58 +0100
Subject: [PATCH] Minor style cleanup

---
 src/normal.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/normal.cc b/src/normal.cc
index 5c073220..5aaa79ae 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -497,18 +497,17 @@ template<InsertMode mode>
 void paste(Context& context, int)
 {
     auto strings = RegisterManager::instance()['"'].values(context);
-    bool linewise = false;
+    InsertMode effective_mode = mode;
     for (auto& str : strings)
     {
         if (not str.empty() and str.back() == '\n')
         {
-            linewise = true;
+            effective_mode = adapt_for_linewise(mode);
             break;
         }
     }
     ScopedEdition edition(context);
-    context.selections().insert(strings,
-                                linewise ? adapt_for_linewise(mode) : mode);
+    context.selections().insert(strings, effective_mode);
 }
 
 template<typename T>