From 9de0dac16a3bf63b92353213952c72feed201336 Mon Sep 17 00:00:00 2001
From: Chauncey Garrett <vrtcl1dvoshun+github@gmail.com>
Date: Mon, 14 Apr 2014 14:03:28 -0500
Subject: [PATCH] Fixing what didn't merge over

[ticket: X]
---
 modules/README.md       | 2 +-
 modules/editor/init.zsh | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/README.md b/modules/README.md
index 85ecf1d7..fc3b49c8 100644
--- a/modules/README.md
+++ b/modules/README.md
@@ -115,7 +115,7 @@ Initializes Ocaml package management.
 OSX
 ---
 
-Defines OS X aliases and functions.
+Defines Mac OS X aliases and functions.
 
 Pacman
 ------
diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index 1f0d8037..913049a2 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -231,8 +231,10 @@ bindkey -M emacs "$key_info[Control]X$key_info[Control]]" vi-match-bracket
 bindkey -M emacs "$key_info[Control]X$key_info[Control]E" edit-command-line
 
 if (( $+widgets[history-incremental-pattern-search-backward] )); then
-  bindkey -M emacs "$key_info[Control]R" history-incremental-pattern-search-backward
-  bindkey -M emacs "$key_info[Control]S" history-incremental-pattern-search-forward
+  bindkey -M emacs "$key_info[Control]R" \
+    history-incremental-pattern-search-backward
+  bindkey -M emacs "$key_info[Control]S" \
+    history-incremental-pattern-search-forward
 fi
 
 #
@@ -299,7 +301,8 @@ for keymap in 'emacs' 'viins'; do
   fi
 
   # Display an indicator when completing.
-  bindkey -M "$keymap" "$key_info[Control]I" expand-or-complete-with-indicator
+  bindkey -M "$keymap" "$key_info[Control]I" \
+    expand-or-complete-with-indicator
 
   # Insert 'sudo ' at the beginning of the line.
   bindkey -M "$keymap" "$key_info[Control]X$key_info[Control]S" prepend-sudo