[Lldb-commits] [lldb] r156314 - /lldb/trunk/tools/driver/IOChannel.cpp

[Johnny Chen]

Author: johnny
Date: Mon May  7 13:18:08 2012
New Revision: 156314

URL: http://llvm.org/viewvc/llvm-project?rev=156314&view=rev
Log:
Move the el_source() call after the section of code which sets up the default "ctrl-r" and "ctrl-w" bindings
so that user-provided .editrc has a chance to override the lldb's default key bindings.

Modified:
    lldb/trunk/tools/driver/IOChannel.cpp

Modified: lldb/trunk/tools/driver/IOChannel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/IOChannel.cpp?rev=156314&r1=156313&r2=156314&view=diff
==============================================================================
--- lldb/trunk/tools/driver/IOChannel.cpp (original)
+++ lldb/trunk/tools/driver/IOChannel.cpp Mon May  7 13:18:08 2012
@@ -188,9 +188,6 @@
     ::el_set (m_edit_line, EL_EDITOR, "emacs");
     ::el_set (m_edit_line, EL_HIST, history, m_history);
 
-    // Source $PWD/.editrc then $HOME/.editrc
-    ::el_source (m_edit_line, NULL);
-
     el_set (m_edit_line, EL_ADDFN, "lldb_complete",
             "LLDB completion function",
             IOChannel::ElCompletionFn);
@@ -199,6 +196,9 @@
     el_set (m_edit_line, EL_BIND, "^w", "ed-delete-prev-word", NULL); // Delete previous word, behave like bash does.
     el_set (m_edit_line, EL_CLIENTDATA, this);
 
+    // Source $PWD/.editrc then $HOME/.editrc
+    ::el_source (m_edit_line, NULL);
+
     assert (m_history);
     ::history (m_history, &m_history_event, H_SETSIZE, 800);
     ::history (m_history, &m_history_event, H_SETUNIQUE, 1);