branch: elpa/git-commit
commit 9f237fbf5defbe7522b72862f169a0d4b8e917b7
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Next release will be named 4.0.0
---
docs/RelNotes/{3.4.0.org => 4.0.0.org} | 2 +-
lisp/magit-clone.el | 6 +++---
lisp/magit-diff.el | 2 +-
lisp/magit-ediff.el | 2 +-
lisp/magit-section.el | 4 ++--
lisp/magit.el | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/RelNotes/3.4.0.org b/docs/RelNotes/4.0.0.org
similarity index 99%
rename from docs/RelNotes/3.4.0.org
rename to docs/RelNotes/4.0.0.org
index b0f4b2310e..3ba3e65032 100644
--- a/docs/RelNotes/3.4.0.org
+++ b/docs/RelNotes/4.0.0.org
@@ -1,4 +1,4 @@
-* Magit v3.4.0 Release Notes (unreleased)
+* Magit v4.0.0 Release Notes (unreleased)
** Breaking changes
** Changes since v3.3.0
diff --git a/lisp/magit-clone.el b/lisp/magit-clone.el
index 22be7f7f1f..3c6a781010 100644
--- a/lisp/magit-clone.el
+++ b/lisp/magit-clone.el
@@ -87,7 +87,7 @@ default user specified in the matched entry is used.
If USER contains a dot, then it is treated as a Git variable and
the value of that is used as the username. Otherwise it is used
as the username itself."
- :package-version '(magit . "3.4.0")
+ :package-version '(magit . "4.0.0")
:group 'magit-commands
:type '(repeat (list regexp
(string :tag "Hostname")
@@ -105,7 +105,7 @@ The value can be a string (representing a single static
format)
or an alist with elements (HOSTNAME . FORMAT) mapping hostnames
to formats. When an alist is used, the t key represents the
default. Also see `magit-clone-name-alist'."
- :package-version '(magit . "3.4.0")
+ :package-version '(magit . "4.0.0")
:group 'magit-commands
:type '(choice (string :tag "Format")
(alist :key-type (choice (string :tag "Host")
@@ -117,7 +117,7 @@ default. Also see `magit-clone-name-alist'."
When the hook is called, `default-directory' is let-bound to the
directory where the repository has been cloned."
- :package-version '(magit . "3.4.0")
+ :package-version '(magit . "4.0.0")
:group 'magit-commands
:type 'hook)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 8c0d460b51..8c85ad26e4 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1961,7 +1961,7 @@ Staging and applying changes is documented in info node
(magit-diff-scope))
(define-obsolete-variable-alias 'magit-diff-section-base-map
- 'magit-diff-section-map "Magit-Section 3.4.0")
+ 'magit-diff-section-map "Magit-Section 4.0.0")
(defvar magit-diff-section-map
(let ((map (make-sparse-keymap)))
(magit-menu-set map [magit-cherry-apply]
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index b772c71a19..c3d0996574 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -58,7 +58,7 @@ invoked using Magit."
(defcustom magit-ediff-dwim-resolve-function #'magit-ediff-resolve-rest
"The function `magit-ediff-dwim' uses to resolve conflicts."
- :package-version '(magit . "3.4.0")
+ :package-version '(magit . "4.0.0")
:group 'magit-ediff
:type '(choice (const magit-ediff-resolve-rest)
(const magit-ediff-resolve-all)
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 879e16c4ea..0b3518268e 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -190,7 +190,7 @@ Otherwise the value has to have one of these two forms:
(const :tag "No (kinda ugly)" nil)))))
(define-obsolete-variable-alias 'magit-keep-region-overlay
- 'magit-section-keep-region-overlay "Magit-Section 3.4.0")
+ 'magit-section-keep-region-overlay "Magit-Section 4.0.0")
(defcustom magit-section-keep-region-overlay nil
"Whether to keep the region overlay when there is a valid selection.
@@ -257,7 +257,7 @@ but that ship has sailed, thus this option."
This has to be set before loading `magit-section' or it has
no effect. This also has no effect for Emacs >= 28, where
`context-menu-mode' should be enabled instead."
- :package-version '(magit-section . "3.4.0")
+ :package-version '(magit-section . "4.0.0")
:group 'magit-section
:type 'boolean)
diff --git a/lisp/magit.el b/lisp/magit.el
index 12536a706b..2fd11c67ee 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -85,7 +85,7 @@ If the specified primary key has signing capacity then it is
used
as the value of the `--gpg-sign' argument without prompting, even
when other such keys exist. To be able to select another key you
must then use a prefix argument."
- :package-version '(magit . "3.4.0")
+ :package-version '(magit . "4.0.0")
:group 'magit-commands
:type 'string)
