Skip to content

Commit 5df6566

Browse files
committed
Directly depend on magit-popup
`magit' uses `transient' instead of `magit-popup' now. Because `magit-stgit' still uses `magit-popup' it has to depend on that itself. This makes it necessary to bump the `magit' dependency too. `magit-popup' was split from `magit' in 2.12.0, so we have depend on that version of both packages. The dependency specification should be: ((emacs "24.4") (or ((magit "2.1.0 <= v < " 2.12.0")) ((magit "2.12.0") (magit-popup "2.12.0")))) But `package.el' does not support that.
1 parent 186e604 commit 5df6566

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

magit-stgit.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
;;; magit-stgit.el --- StGit extension for Magit
22

3-
;; Copyright (C) 2011-2017 The Magit Project Contributors
3+
;; Copyright (C) 2011-2019 The Magit Project Contributors
44

55
;; Author: Lluís Vilanova <[email protected]>
66
;; Maintainer: Lluís Vilanova <[email protected]>
77
;; Keywords: vc tools
88
;; Package: magit-stgit
9-
;; Package-Requires: ((emacs "24.4") (magit "2.1.0"))
9+
;; Package-Requires: ((emacs "24.4") (magit "2.12.0") (magit-popup "2.12.0")
1010

1111
;; Magit is free software; you can redistribute it and/or modify it
1212
;; under the terms of the GNU General Public License as published by
@@ -58,6 +58,7 @@
5858
(require 'dash)
5959

6060
(require 'magit)
61+
(require 'magit-popup)
6162

6263
;;; Options
6364
;;;; Variables

0 commit comments

Comments
 (0)