Skip to content

Commit 5acd218

Browse files
committed
Require pkg-info and add (revert) workaround
This process was deleted with 6d1c29c, but it was restored as a workaround for environments not dependent on external packages.
1 parent 6d1c29c commit 5acd218

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Cask

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
(package-file "php-project.el")
66

77
(development
8+
(depends-on "pkg-info")
89
(depends-on "shut-up"))

php-mode.el

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,7 @@ After setting the stylevars run hooks according to STYLENAME
11881188
"Display informations useful for debugging PHP Mode."
11891189
(interactive)
11901190
(require 'cus-edit)
1191+
(require 'pkg-info nil t)
11911192
(php-mode-debug--buffer 'init)
11921193
(php-mode-debug--message "Feel free to report on GitHub what you noticed!")
11931194
(php-mode-debug--message "https://github.com/ejmr/php-mode/issues/new")
@@ -1196,7 +1197,13 @@ After setting the stylevars run hooks according to STYLENAME
11961197
(php-mode-debug--message "```")
11971198
(php-mode-debug--message "--- PHP-MODE DEBUG BEGIN ---")
11981199
(php-mode-debug--message "versions: %s; %s" (emacs-version) (php-mode-version))
1199-
(php-mode-debug--message "package-version: %s" (pkg-info-version-info 'php-mode))
1200+
(php-mode-debug--message "package-version: %s"
1201+
(if (fboundp 'pkg-info)
1202+
(pkg-info-version-info 'php-mode)
1203+
(let ((pkg (and (boundp 'package-alist)
1204+
(cadr (assq 'php-mode package-alist)))))
1205+
(when (and pkg (member (package-desc-status pkg) '("unsigned" "dependency")))
1206+
(package-version-join (package-desc-version pkg))))))
12001207

12011208
(php-mode-debug--message "major-mode: %s" major-mode)
12021209
(php-mode-debug--message "minor-modes: %s"

0 commit comments

Comments
 (0)