Skip to content

Commit 50ac869

Browse files
Merge pull request #482 from phikal/master
Remove pkg-info dependency
2 parents 6bbc1e5 + 31a31bf commit 50ac869

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

elixir-mode.el

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
;; Created: Mon Nov 7 2011
1212
;; Keywords: languages elixir
1313
;; Version: 2.4.0
14-
;; Package-Requires: ((emacs "25") (pkg-info "0.6"))
14+
;; Package-Requires: ((emacs "25"))
1515

1616
;; This file is not a part of GNU Emacs.
1717

@@ -38,7 +38,6 @@
3838

3939
(require 'easymenu) ; Elixir Mode menu definition
4040
(require 'elixir-smie) ; Syntax and indentation support
41-
(require 'pkg-info) ; Display Elixir Mode package version
4241
(require 'elixir-format) ; Elixir Format functions
4342

4443
(defgroup elixir nil
@@ -464,6 +463,19 @@ is used to limit the scan."
464463
(interactive)
465464
(browse-url elixir-mode-doc-url))
466465

466+
(defconst elixir--version
467+
(eval-when-compile
468+
(require 'lisp-mnt)
469+
(let ((file (or byte-compile-current-file
470+
load-file-name
471+
(buffer-file-name))))
472+
(if file
473+
(with-temp-buffer
474+
(insert-file-contents file)
475+
(lm-version))
476+
"Unknown")))
477+
"The current version of `elixir-mode'.")
478+
467479
;;;###autoload
468480
(defun elixir-mode-version (&optional show-version)
469481
"Get the Elixir-Mode version as string.
@@ -478,10 +490,9 @@ If the version number could not be determined, signal an error,
478490
if called interactively, or if SHOW-VERSION is non-nil, otherwise
479491
just return nil."
480492
(interactive (list t))
481-
(let ((version (pkg-info-version-info 'elixir-mode)))
482-
(when show-version
483-
(message "Elixir-Mode version: %s" version))
484-
version))
493+
(when show-version
494+
(message "Elixir-Mode version: %s" elixir--version))
495+
elixir--version)
485496

486497
(defun elixir-mode-fill-doc-string ()
487498
(interactive)

0 commit comments

Comments
 (0)