Merge branch 'master' into multi-completion

2 files changed, 7 insertions, 4 deletions

diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index 7a9245ab..2bec27d1 100644
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -2221,7 +2221,7 @@ class Cmd(cmd.Cmd):
                 else:
                     line = 'eof'
 
-        return line.strip()
+        return line.rstrip('\r\n')
 
     def _cmdloop(self) -> None:
         """Repeatedly issue a prompt, accept input, parse an initial prefix
diff --git a/cmd2/history.py b/cmd2/history.py
index dbc9a3a4..576ac37d 100644
--- a/cmd2/history.py
+++ b/cmd2/history.py
@@ -44,9 +44,12 @@ class HistoryItem():
         :return: pretty print string version of a HistoryItem
         """
         if verbose:
-            ret_str = self._listformat.format(self.idx, self.raw.rstrip())
-            if self.raw != self.expanded.rstrip():
-                ret_str += '\n' + self._ex_listformat.format(self.idx, self.expanded.rstrip())
+            raw = self.raw.rstrip()
+            expanded = self.expanded.rstrip()
+
+            ret_str = self._listformat.format(self.idx, raw)
+            if raw != expanded:
+                ret_str += '\n' + self._ex_listformat.format(self.idx, expanded)
         else:
             if expanded:
                 ret_str = self.expanded.rstrip()