branch: elpa/magit
commit bbb52942feb534ed44dda06344e279d926189455
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Next release will be 4.3.0
---
CHANGELOG | 2 +-
lisp/magit-diff.el | 6 +++---
lisp/magit-log.el | 6 +++---
lisp/magit-process.el | 2 +-
lisp/magit-refs.el | 2 +-
lisp/magit-status.el | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 340c0336110..69b0ed299b5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
# -*- mode: org -*-
-* v4.2.1 UNRELEASED
+* v4.3.0 UNRELEASED
- Added new option ~magit-refs-show-branch-descriptions~. 42ed6c1966
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index b4ee8025219..13ecb8036e4 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -94,11 +94,11 @@
'magit-diff-section-map "Magit 4.0.0")
(define-obsolete-variable-alias 'magit-wash-message-hook
- 'magit-revision-wash-message-hook "Magit 4.2.1")
+ 'magit-revision-wash-message-hook "Magit 4.3.0")
(make-obsolete-variable 'magit-diff-highlight-keywords
'magit-revision-wash-message-hook
- "Magit 4.2.1")
+ "Magit 4.3.0")
;;; Options
;;;; Diff Mode
@@ -371,7 +371,7 @@ beginning of the narrowed region of the buffer.
See also the related `magit-log-wash-summary-hook'. You likely want to
use the same functions for both hooks."
- :package-version '(magit . "4.2.1")
+ :package-version '(magit . "4.3.0")
:group 'magit-log
:type 'hook
:options (list #'magit-highlight-squash-markers
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 83030deff82..0ab1c40729f 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -57,11 +57,11 @@
(make-obsolete-variable 'magit-log-highlight-keywords
'magit-log-wash-summary-hook
- "Magit 4.2.1")
+ "Magit 4.3.0")
(make-obsolete-variable 'magit-log-format-message-function
'magit-log-wash-summary-hook
- "Magit 4.2.1")
+ "Magit 4.3.0")
;;; Options
;;;; Log Mode
@@ -163,7 +163,7 @@ called, point is at the beginning of the buffer.
See also the related `magit-revision-wash-message-hook'. You likely
want to use the same functions for both hooks."
- :package-version '(magit . "4.2.1")
+ :package-version '(magit . "4.3.0")
:group 'magit-log
:type 'hook
:options (list #'magit-highlight-squash-markers
diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index cdde64756c2..915eb81f65e 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -177,7 +177,7 @@ itself from the hook, to avoid further futile attempts."
"Please enter the passphrase to unlock the OpenPGP secret key")
"List of regexps matching password prompts of Git and its subprocesses.
Also see `magit-process-find-password-functions'."
- :package-version '(magit . "4.2.1")
+ :package-version '(magit . "4.3.0")
:group 'magit-process
:type '(repeat (regexp)))
diff --git a/lisp/magit-refs.el b/lisp/magit-refs.el
index bfb9f7a82a0..d6499f9b8c5 100644
--- a/lisp/magit-refs.el
+++ b/lisp/magit-refs.el
@@ -105,7 +105,7 @@ in the heading preceding the list of its branches."
To distinguish branch descriptions from the commit summary of the tip,
which is shown when there is no description or this option is disabled,
descriptions use the bold face."
- :package-version '(magit . "4.2.1")
+ :package-version '(magit . "4.3.0")
:group 'magit-refs
:type 'boolean)
diff --git a/lisp/magit-status.el b/lisp/magit-status.el
index 75d421efbae..0dbfbf9fb78 100644
--- a/lisp/magit-status.el
+++ b/lisp/magit-status.el
@@ -172,7 +172,7 @@ but it does override its global value.
See the last section in the git-status(1) manpage, to speed up the part
of the work Git is responsible for. Turning that list into sections is
also not free, so Magit only lists `magit-status-file-list-limit' files."
- :package-version '(magit . "4.2.1")
+ :package-version '(magit . "4.3.0")
:group 'magit-status
:type 'boolean
:safe 'booleanp)
@@ -181,7 +181,7 @@ also not free, so Magit only lists
`magit-status-file-list-limit' files."
"How many files to list in file list sections in the status buffer.
For performance reasons, it is recommended that you do not
increase this limit."
- :package-version '(magit . "4.2.1")
+ :package-version '(magit . "4.3.0")
:group 'magit-status
:type 'natnum)
