[nongnu] elpa/git-commit b47efecfe6 2/5: magit-branch-name-format: Remove support for obsolete %-sequence

[ELPA Syncer]

branch: elpa/git-commit
commit b47efecfe652dfddc1de5a751e44cfa64d7a7ea6
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-branch-name-format: Remove support for obsolete %-sequence
    
    "%T" was deprecated in [1: 831372a4ff], five years ago.
    
    1: 2018-02-11 831372a4ffc0c2882599a30f064b230272fcb116
       magit-buffer-name-format: put * at both ends or neither
---
 docs/magit.org     | 12 +++---------
 docs/magit.texi    | 13 +++----------
 lisp/magit-mode.el | 15 ++++-----------
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 2ac41c32e0..68d8ecdcd9 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -557,15 +557,9 @@ buffers whose major-modes derive from ~magit-mode~.
     string.  Due to limitations of the ~uniquify~ package, buffer names
     must end with the path.
 
-  - ~%T~
-
-    Obsolete, use "%t%x" instead.  Like ~%t~, but append an asterisk if
-    and only if ~magit-uniquify-buffer-names~ is nil.
-
-  The value should always contain ~%m~ or ~%M~, ~%v~ or ~%V~, and ~%t~ (or the
-  obsolete ~%T~).  If ~magit-uniquify-buffer-names~ is non-nil, then the
-  value must end with ~%t~ or ~%t%x~ (or the obsolete ~%T~).  See issue
-  #2841.
+  The value should always contain ~%m~ or ~%M~, ~%v~ or ~%V~, and ~%t~.  If
+  ~magit-uniquify-buffer-names~ is non-nil, then the value must end with
+  ~%t~ or ~%t%x~.  See issue #2841.
 
 - User Option: magit-uniquify-buffer-names ::
 
diff --git a/docs/magit.texi b/docs/magit.texi
index 2ace950a82..0fcf0418de 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -920,18 +920,11 @@ if @code{magit-uniquify-buffer-names} is non-nil an 
abbreviation of that.
 If @code{magit-uniquify-buffer-names} is nil "*", otherwise the empty
 string.  Due to limitations of the @code{uniquify} package, buffer names
 must end with the path.
-
-@item
-@code{%T}
-
-Obsolete, use "%t%x" instead.  Like @code{%t}, but append an asterisk if
-and only if @code{magit-uniquify-buffer-names} is nil.
 @end itemize
 
-The value should always contain @code{%m} or @code{%M}, @code{%v} or 
@code{%V}, and @code{%t} (or the
-obsolete @code{%T}).  If @code{magit-uniquify-buffer-names} is non-nil, then 
the
-value must end with @code{%t} or @code{%t%x} (or the obsolete @code{%T}).  See 
issue
-#2841.
+The value should always contain @code{%m} or @code{%M}, @code{%v} or 
@code{%V}, and @code{%t}.  If
+@code{magit-uniquify-buffer-names} is non-nil, then the value must end with
+@code{%t} or @code{%t%x}.  See issue #2841.
 @end defopt
 
 @defopt magit-uniquify-buffer-names
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index d09337fe6f..0b30e1d16c 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -163,15 +163,9 @@ The following %-sequences are supported:
      empty string.  Due to limitations of the `uniquify' package,
      buffer names must end with the path.
 
-`%T' Obsolete, use \"%t%x\" instead.  Like \"%t\", but append an
-     asterisk if and only if `magit-uniquify-buffer-names' is nil.
-
-The value should always contain \"%m\" or \"%M\", \"%v\" or
-\"%V\", and \"%t\" (or the obsolete \"%T\").
-
-If `magit-uniquify-buffer-names' is non-nil, then the value must
-end with \"%t\" or \"%t%x\" (or the obsolete \"%T\").  See issue
-#2841.
+The value should always contain \"%m\" or \"%M\", \"%v\" or \"%V\", and
+\"%t\".  If `magit-uniquify-buffer-names' is non-nil, then the
+value must end with \"%t\" or \"%t%x\".  See issue #2841.
 
 This is used by `magit-generate-buffer-name-default-function'.
 If another `magit-generate-buffer-name-function' is used, then
@@ -862,8 +856,7 @@ account."
        (?v . ,(or v ""))
        (?V . ,(if v (concat " " v) ""))
        (?t . ,n)
-       (?x . ,(if magit-uniquify-buffer-names "" "*"))
-       (?T . ,(if magit-uniquify-buffer-names n (concat n "*")))))))
+       (?x . ,(if magit-uniquify-buffer-names "" "*"))))))
 
 ;;; Buffer Lock