Merge branch 'master' of https://github.com/lzybkr/PSReadLine

Conflicts:
	PSReadLine/Changes.txt

Author: lzybkr

PSReadLine/Changes.txt

@@ -26,6 +26,7 @@ New functions:
 
 New key bindings:
 * Ctrl+D bound to DeleteCharOrExit in Emacs mode
+* Ctrl+N/Ctrl+P bound to NextHistory/PreviousHistory in Emacs mode
 * Ctrl+PageUp bound to ScrollDisplayUpLine
 * Ctrl+PageDown bound to ScrollDisplayDownLine
 

PSReadLine/KeyBindings.cs

@@ -181,7 +181,9 @@ void SetDefaultEmacsBindings()
                 { Keys.CtrlL,           MakeKeyHandler(ClearScreen,          "ClearScreen") },
                 { Keys.CtrlK,           MakeKeyHandler(KillLine,             "KillLine") },
                 { Keys.CtrlM,           MakeKeyHandler(ValidateAndAcceptLine,"ValidateAndAcceptLine") },
+                { Keys.CtrlN,           MakeKeyHandler(NextHistory,          "NextHistory") },
                 { Keys.CtrlO,           MakeKeyHandler(AcceptAndGetNext,     "AcceptAndGetNext") },
+                { Keys.CtrlP,           MakeKeyHandler(PreviousHistory,      "PreviousHistory") },
                 { Keys.CtrlR,           MakeKeyHandler(ReverseSearchHistory, "ReverseSearchHistory") },
                 { Keys.CtrlS,           MakeKeyHandler(ForwardSearchHistory, "ForwardSearchHistory") },
                 { Keys.CtrlU,           MakeKeyHandler(BackwardKillLine,     "BackwardKillLine") },

PSReadLine/en-US/about_PSReadline.help.txt

@@ -220,11 +220,11 @@ LONG DESCRIPTION
 
         Clears history in PSReadline.  This does not affect PowerShell history.
 
-    PreviousHistory          (Cmd: <UpArrow>            Emacs: <UpArrow>)
+    PreviousHistory          (Cmd: <UpArrow>            Emacs: <UpArrow> or <Ctrl+P>)
 
         Replace the current input with the 'previous' item from PSReadline history.
 
-    NextHistory              (Cmd: <DownArrow>          Emacs: <DownArrow>)
+    NextHistory              (Cmd: <DownArrow>          Emacs: <DownArrow> or <Ctrl+N>)
 
         Replace the current input with the 'next' item from PSReadline history.