Merge branch 'pseudo-console'

doc/source/index.rst

@@ -498,6 +498,7 @@ Change Log
 v0.2
 ----
 
+* Add :el:symbol:`ein:pseudo-console-mode`.
 * Add "scratch sheet".  This acts almost as same as worksheet, but you
   don't need to save it.  You can use try any code without saving
   junks in your notebook.  Use the command

lisp/ein-notebook.el

@@ -866,6 +866,8 @@ Do not use `python-mode'.  Use plain mode when MuMaMo is not installed::
            ("Open scratch sheet" ein:notebook-scratchsheet-open)))
       ["Popup traceback viewer" ein:tb-show
        :help "Show full traceback in different buffer"]
+      ["Toggle pseudo console mode" ein:pseudo-console-mode
+       :help "Hit RET to execute code"]
       ["Evaluate code in minibuffer" ein:shared-output-eval-string
        :help "Result will appear in the shared output buffer"]
       ["Show code cell with full output"

lisp/ein-pseudo-console.el

@@ -0,0 +1,46 @@
+;;; ein-pseudo-console.el --- Pseudo console mode
+
+;; Copyright (C) 2012 Takafumi Arakaki
+
+;; Author: Takafumi Arakaki <aka.tkf at gmail.com>
+
+;; This file is NOT part of GNU Emacs.
+
+;; ein-pseudo-console.el is free software: you can redistribute it
+;; and/or modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation, either version 3 of
+;; the License, or (at your option) any later version.
+
+;; ein-pseudo-console.el is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+;; of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with ein-pseudo-console.el.
+;; If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(defvar ein:pseudo-console-mode-map (make-sparse-keymap))
+
+(let ((map ein:pseudo-console-mode-map))
+  (define-key map "\C-m" 'ein:worksheet-execute-cell-and-insert-below))
+
+(define-minor-mode ein:pseudo-console-mode
+  "Pseudo console mode."
+  :lighter " ein:pseudo"
+  :keymap ein:pseudo-console-mode-map
+  :group 'ein)
+
+;; To avoid MuMaMo to discard `ein:pseudo-console-mode', make it
+;; permanent local.
+(put 'ein:pseudo-console-mode 'permanent-local t)
+
+(provide 'ein-pseudo-console)
+
+;;; ein-pseudo-console.el ends here

lisp/ein.el

@@ -64,6 +64,8 @@
 
 (autoload 'ein:console-open "ein-console" nil t)
 
+(autoload 'ein:pseudo-console-mode "ein-pseudo-console" nil t)
+
 (autoload 'ein:connect-to-notebook-command "ein-connect" nil t)
 (autoload 'ein:connect-to-notebook         "ein-connect" nil t)
 (autoload 'ein:connect-to-notebook-buffer  "ein-connect" nil t)