From 330f36ccdf469e358079a3afb9327ef62b6253bd Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Sat, 12 Oct 2013 21:00:24 +0200
Subject: Allow small_more to work with clear_messages

Previously, combining both options caused the small_more setting to be
disabled regardless of player settings.

Fixes 0002296
---
 crawl-ref/docs/options_guide.txt | 5 +++--
 crawl-ref/source/message.cc      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index ddd8310..c15c01f 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -1315,8 +1315,9 @@ show_more = true
 small_more = false
         With small_more = false (default), the --more-- prompt is on a
         separate line at the bottom of the message window. With
-        small_more = true, it is just the bottom left character if
-        clear_messages is not set.
+        small_more = true, it is just the bottom left character.
+        Note: This will overwrite the first letter of the last message
+              line if clear_messages is set.
 
 show_inventory_weights = false
         When this is set to true, inventory listings will mention the
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 735611e..d760594 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -435,7 +435,7 @@ public:
 
     bool first_col_more() const
     {
-        return (use_first_col() && Options.small_more);
+        return Options.small_more;
     }
 
     bool use_first_col() const
-- 
1.8.4