Merge branch 'master' of git://git.erlware.org/erlware-mode

erlware-deprecated · Jun 8, 2009 · 2cbca81 · 2cbca81
2 parents d1247e5 + 632ddce
commit 2cbca81
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2009-05-18  Magnus Henoch <magnus@erlang-consulting.com>
+
+	* (erlang-mode-map): Define keymap when module is loaded.
+
+	* (erlang-mode): Don't call erlang-keymap-init.
+
+	* (erlang-keymap-init, erlang-mode-commands): Remove.
+
+2009-05-08  Magnus Henoch <magnus@erlang-consulting.com>
+
+	* (inferior-erlang): Prompt for command when called with prefix argument.
+
 2009-05-14  mats cronqvist <mats.cronqvist@gmail.com>
 
 	* flymake support

diff --git a/erlang.el b/erlang.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995-1998,2000  Ericsson Telecom AB
 ;; Copyright (C) 2004  Free Software Foundation, Inc.
 ;; Author:   Anders Lindgren
-;; Version:  0.1.13
+;; Version:  0.1.14
 ;; Keywords: erlang, languages, processes
 ;; Date:     2000-09-11
 
@@ -83,7 +83,7 @@
 
 ;; Variables:
 
-(defconst erlang-version "0.1.13"
+(defconst erlang-version "0.1.14"
   "The version number of Erlware Erlang mode.")
 
 (defvar erlang-man-root-dir nil

diff --git a/release-checklist.txt b/release-checklist.txt
@@ -1,13 +1,13 @@
 Get all changes into 'next'.
 
-Merge into 'master'.
-
 Update version number in erlang.el.
 
 Update ChangeLog.
 
 Tag the release number in git (vx.y.z).
 
+Merge into 'master'.
+
 Push the changes to github.
 
 Upload the tar and zip files to googlecode.