aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGleb Peregud <[email protected]>2012-02-14 12:31:51 +0100
committerGleb Peregud <[email protected]>2012-02-14 12:32:36 +0100
commit59d3e59f113670b9e4e0598cfc9c8784c4208544 (patch)
treec9f944be22cb5bac6330eb55c90b5a9f84f87f7a
parent8d59a1fc518719c8c445d9d94b23c173c18b4438 (diff)
downloadotp-59d3e59f113670b9e4e0598cfc9c8784c4208544.tar.gz
otp-59d3e59f113670b9e4e0598cfc9c8784c4208544.tar.bz2
otp-59d3e59f113670b9e4e0598cfc9c8784c4208544.zip
Make erlang-mode more compatible with package.el
Package.el and Emacs package repositories (like ELPA or Marmalade place some requirements onto packages which are uploaded to them. This commit does minor cosmetic changes which makes it easier to create appropriate package file for those repositories.
-rw-r--r--lib/tools/emacs/erlang-pkg.el3
-rw-r--r--lib/tools/emacs/erlang.el13
-rw-r--r--lib/tools/emacs/vsn.mk3
3 files changed, 12 insertions, 7 deletions
diff --git a/lib/tools/emacs/erlang-pkg.el b/lib/tools/emacs/erlang-pkg.el
new file mode 100644
index 0000000000..decc696e21
--- /dev/null
+++ b/lib/tools/emacs/erlang-pkg.el
@@ -0,0 +1,3 @@
+(define-package "erlang" "2.7.0"
+ "Erlang major mode"
+ '((flymake-mode "0.4.6")))
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index bc7a190fb4..a1c4931cca 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -1,4 +1,10 @@
-;; erlang.el --- Major modes for editing and running Erlang
+;;; erlang.el --- Major modes for editing and running Erlang
+
+;; Copyright (C) 2004 Free Software Foundation, Inc.
+;; Author: Anders Lindgren
+;; Keywords: erlang, languages, processes
+;; Date: 2011-12-11
+
;; %CopyrightBegin%
;;
;; Copyright Ericsson AB 1996-2011. All Rights Reserved.
@@ -15,10 +21,7 @@
;; under the License.
;;
;; %CopyrightEnd%
-;;
-;; Copyright (C) 2004 Free Software Foundation, Inc.
-;; Author: Anders Lindgren
-;; Keywords: erlang, languages, processes
+;;
;; Lars Thors�n's modifications of 2000-06-07 included.
;; The original version of this package was written by Robert Virding.
diff --git a/lib/tools/emacs/vsn.mk b/lib/tools/emacs/vsn.mk
index f33ea8b519..a495da3453 100644
--- a/lib/tools/emacs/vsn.mk
+++ b/lib/tools/emacs/vsn.mk
@@ -1,3 +1,2 @@
-EMACS_VSN = 2.4.13
-
+EMACS_VSN = 2.7.0