aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoni Rabkin <yoni@rabkins.net>2020-05-28 17:16:44 -0400
committerYoni Rabkin <yoni@rabkins.net>2020-05-28 17:16:44 -0400
commit3eed06dde4c683bb5f2f43a65a554900445351a0 (patch)
tree38dea81c6783aca85efd2507280d13260761415d
parentecdac97e8a2aed88d37380daccc594e2bb54b7d8 (diff)
More elpa work.
Unfortunately, this commit is more of a "one step forward, two steps back" kind of situation.
-rw-r--r--emms-elpa.el16
-rw-r--r--lisp/emms.el8
2 files changed, 5 insertions, 19 deletions
diff --git a/emms-elpa.el b/emms-elpa.el
deleted file mode 100644
index a331445..0000000
--- a/emms-elpa.el
+++ /dev/null
@@ -1,16 +0,0 @@
-;;; emms-elpa.el --- The Emacs Multimedia System
-
-;; Copyright (C) 2020 Free Software Foundation, Inc.
-
-;; Author: the Emms developers (see AUTHORS file)
-;; Maintainer: Yoni Rabkin <yrk@gnu.org>
-;; Version: 5.4
-;; Keywords: emms, mp3, ogg, flac, music, mpeg, video, multimedia
-;; Package-Requires: ((cl-lib "0.5"))
-;; url: https://www.gnu.org/software/emms/
-
-;; This file serves as an interface to ELPA, so that Emms can be
-;; distributed as an Emacs Lisp Package. The following line ensures
-;; that the code in the "lisp" directory is loaded.
-
-;;;###autoload (load "lisp/emms-auto" nil 'nowarn)
diff --git a/lisp/emms.el b/lisp/emms.el
index 20bb580..ee51e35 100644
--- a/lisp/emms.el
+++ b/lisp/emms.el
@@ -1,7 +1,7 @@
;;; emms.el --- The Emacs Multimedia System
;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009, 2018 Free Software Foundation, Inc.
+;; 2009, 2018, 2020 Free Software Foundation, Inc.
;; Author: Jorgen Schäfer <forcer@forcix.cx>, the Emms developers (see AUTHORS file)
;; Maintainer: Yoni Rabkin <yrk@gnu.org>
@@ -39,8 +39,10 @@
;; even know how to find any tracks to consider playing --- for this,
;; you need sources.
-;; A sample configuration is offered in emms-setup.el, so you might
-;; just want to use that file.
+;; A sample configuration is offered in emms-setup.el, and the
+;; Friendly Manual in the doc/ directory is both detailed, and kept up
+;; to date.
+
;;; Code: