aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/readline/extconf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 253cb17e58..f4694b9d84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 6 11:38:14 2016 Chris Jones <chris@christopherjones.us>
+
+ * ext/readline/extconf.rb: Update error message with correct words.
+ [fix GH-1453][ci skip] Patch by @magikid
+
Thu Oct 6 11:01:49 2016 Tieg Zaharia <tieg.zaharia@gmail.com>
* lib/uri/common.rb (WEB_ENCODINGS_): Update URI::WEB_ENCODINGS_
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index dfa192ff95..7bba386540 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -59,7 +59,7 @@ else
have_library("edit", "readline"))) ||
(readline.have_header("editline/readline.h") &&
have_library("edit", "readline"))
- raise "readline nor libedit not found"
+ raise "Neither readline nor libedit was found"
end
end