From d8e5a3e1bcbda3b5a48743e83ce7827f34e796a7 Mon Sep 17 00:00:00 2001
From: John Miller <millejoh@mac.com>
Date: Tue, 9 Dec 2014 10:42:39 -0600
Subject: [PATCH] Revert "Renaming to ein2"

This reverts commit 029f72d46d55b37f2274329964bd2e07cf79ab63.
---
 README.rst               |  2 +-
 lisp/ein-core.el         |  2 +-
 lisp/ein-pkg.el          |  2 +-
 lisp/{ein2.el => ein.el} | 15 +++++++--------
 lisp/zeroein.el          |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)
 rename lisp/{ein2.el => ein.el} (83%)

diff --git a/README.rst b/README.rst
index 6d1062c..7705d5d 100644
--- a/README.rst
+++ b/README.rst
@@ -152,7 +152,7 @@ Usage
 
 2. Require module::
 
-     (require 'ein2)
+     (require 'ein)
 
 3. Start `IPython notebook server`_.
 
diff --git a/lisp/ein-core.el b/lisp/ein-core.el
index 0b7fa9f..7471bb5 100644
--- a/lisp/ein-core.el
+++ b/lisp/ein-core.el
@@ -34,7 +34,7 @@
 (declare-function tramp-dissect-file-name "tramp")
 
 
-(require 'ein2)  ; get autoloaded functions into namespace
+(require 'ein)  ; get autoloaded functions into namespace
 (require 'ein-utils)
 
 
diff --git a/lisp/ein-pkg.el b/lisp/ein-pkg.el
index b7075f1..39e397c 100644
--- a/lisp/ein-pkg.el
+++ b/lisp/ein-pkg.el
@@ -1,6 +1,6 @@
 (define-package "ein2"
   "2.0"
-  "Emacs IPython Notebook with support for IPython 2.x and beyond."
+  "Emacs IPython Notebook 2"
   '((websocket "1.3")
     (request "0.2")
     ;; `auto-complete' is not really a dependency, but who use EIN w/o AC?
diff --git a/lisp/ein2.el b/lisp/ein.el
similarity index 83%
rename from lisp/ein2.el
rename to lisp/ein.el
index 4c8a330..e64983c 100644
--- a/lisp/ein2.el
+++ b/lisp/ein.el
@@ -1,21 +1,20 @@
-;;; ein2.el --- IPython 2.x notebook client in Emacs
+;;; ein.el --- IPython notebook client in Emacs
 
 ;; Copyright (C) 2012- Takafumi Arakaki
 
 ;; Author: Takafumi Arakaki <aka.tkf at gmail.com>
-;;         John Miller <aka.millejoh at mac.com>
-;; URL: http://millejoh.github.com/emacs-ipython-notebook/
+;; URL: http://tkf.github.com/emacs-ipython-notebook/
 ;; Keywords: applications, tools
-;; Version: 2.0
+;; Version: 0.2.1alpha2
 
 ;; This file is NOT part of GNU Emacs.
 
-;; ein2.el is free software: you can redistribute it and/or modify
+;; ein.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.
 
-;; ein2.el is distributed in the hope that it will be useful,
+;; ein.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.
@@ -60,6 +59,6 @@
 ;; users who prefer manual installation.
 (require 'ein-loaddefs)
 
-(provide 'ein2)
+(provide 'ein)
 
-;;; ein2.el ends here
+;;; ein.el ends here
diff --git a/lisp/zeroein.el b/lisp/zeroein.el
index 71ca13d..ce33c17 100755
--- a/lisp/zeroein.el
+++ b/lisp/zeroein.el
@@ -72,7 +72,7 @@
 
 ;;; Configurations
 (eval-when-compile (require 'ein-notebooklist))
-(require 'ein2)
+(require 'ein)
 
 ;; auto-complete
 (setq ein:use-auto-complete-superpack t)