From 6c341cfe35b2e0cdd8fe01c01287ebaed378c67b Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 18 Mar 2012 19:00:12 -0400
Subject: [PATCH] [#50] Split widget definition from widget binding

---
 keyboard.zsh | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/keyboard.zsh b/keyboard.zsh
index 8bc40af..c8784bc 100644
--- a/keyboard.zsh
+++ b/keyboard.zsh
@@ -95,6 +95,26 @@ function zle-line-finish() {
 }
 zle -N zle-line-finish
 
+# Converts .... to ../...
+function expand-dot-to-parent-directory-path() {
+  if [[ $LBUFFER = *.. ]]; then
+    LBUFFER+='/..'
+  else
+    LBUFFER+='.'
+  fi
+}
+zle -N expand-dot-to-parent-directory-path
+
+# Displays an indicator when completing.
+function expand-or-complete-prefix-with-indicator() {
+  local indicator
+  zstyle -s ':omz:completion' indicator 'indicator'
+  print -Pn "$indicator"
+  zle expand-or-complete-prefix
+  zle redisplay
+}
+zle -N expand-or-complete-prefix-with-indicator
+
 zstyle -s ':omz:editor' keymap 'keymap'
 if [[ "$keymap" == (emacs|) ]]; then
   # Use Emacs key bindings.
@@ -272,27 +292,11 @@ fi
 
 # Convert .... to ../.. automatically.
 if zstyle -t ':omz:editor' dot-expansion; then
-  function expand-dot-to-parent-directory-path() {
-    if [[ $LBUFFER = *.. ]]; then
-      LBUFFER+=/..
-    else
-      LBUFFER+=.
-    fi
-  }
-  zle -N expand-dot-to-parent-directory-path
-  # Do not expand .... to ../..  during incremental search.
+  # Do not expand during incremental search.
   bindkey -M isearch . self-insert 2>/dev/null
 fi
 
 # Display an indicator when completing.
-function expand-or-complete-prefix-with-indicator() {
-  local indicator
-  zstyle -s ':omz:completion' indicator 'indicator'
-  print -Pn "$indicator"
-  zle expand-or-complete-prefix
-  zle redisplay
-}
-zle -N expand-or-complete-prefix-with-indicator
 [[ -n "$keyinfo[Control]" ]] && \
   bindkey "$keyinfo[Control]I" expand-or-complete-prefix-with-indicator