diff options
| author | Henrik Nord <[email protected]> | 2012-10-03 15:20:49 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-10-03 15:23:03 +0200 |
| commit | 3ba23ad869bf8e81758d40cee9ddcb545af28aa2 (patch) | |
| tree | cd826c94a36fd52e161dfda8c9251e43096d75b3 | |
| parent | 197b7b99b9e7e70046d51fa90b5922a1b22ee8cc (diff) | |
| parent | 59d3e59f113670b9e4e0598cfc9c8784c4208544 (diff) | |
| download | otp-3ba23ad869bf8e81758d40cee9ddcb545af28aa2.tar.gz otp-3ba23ad869bf8e81758d40cee9ddcb545af28aa2.tar.bz2 otp-3ba23ad869bf8e81758d40cee9ddcb545af28aa2.zip | |
Merge branch 'gp/make_erlang_mode_elpa_friendly'
* gp/make_erlang_mode_elpa_friendly:
Make erlang-mode more compatible with package.el
OTP-10465
| -rw-r--r-- | lib/tools/emacs/erlang-pkg.el | 3 | ||||
| -rw-r--r-- | lib/tools/emacs/erlang.el | 13 | ||||
| -rw-r--r-- | lib/tools/emacs/vsn.mk | 3 |
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 aae118f3db..e2bcd37def 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-2012. 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 |