branch: elpa/magit
commit c1a86066e8d20b5b54d4c3df0c044c4b9a99a30e
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Depend on Emacs >= 27.1
This version was released more than four years ago and Emacs 30.1 is
around the corner. This is the release available on Debian Bullseye
(oldstable).
---
lisp/git-commit.el | 3 +-
lisp/magit-base.el | 72 +------------------------
lisp/magit-bisect.el | 2 +-
lisp/magit-blame.el | 21 ++++----
lisp/magit-diff.el | 93 +++++++++++++++-----------------
lisp/magit-extras.el | 59 +++++++++------------
lisp/magit-git.el | 4 +-
lisp/magit-section.el | 144 ++++++++++++++++++++++++--------------------------
lisp/magit.el | 4 +-
9 files changed, 154 insertions(+), 248 deletions(-)
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 48d40f066a1..4007c12a2ea 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -649,8 +649,7 @@ the input isn't tacked to the comment."
(defun git-commit-setup-changelog-support ()
"Treat ChangeLog entries as unindented paragraphs."
- (when (fboundp 'log-edit-fill-entry) ; New in Emacs 27.
- (setq-local fill-paragraph-function #'log-edit-fill-entry))
+ (setq-local fill-paragraph-function #'log-edit-fill-entry)
(setq-local fill-indent-according-to-mode t)
(setq-local paragraph-start (concat paragraph-start "\\|\\*\\|(")))
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 9762d54361e..e286dda6d23 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -33,7 +33,7 @@
;;; Code:
(defconst magit--minimal-git "2.25.0")
-(defconst magit--minimal-emacs "26.1")
+(defconst magit--minimal-emacs "27.1")
(require 'cl-lib)
(require 'compat)
@@ -1031,49 +1031,6 @@ This function should be named `version>=' and be part of
Emacs."
;;; Kludges for Emacs Bugs
-(when (< emacs-major-version 27)
- ;; Work around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.
- ;; Fixed by cb55ccae8be946f1562d74718086a4c8c8308ee5 in Emacs 27.1.
- (with-eval-after-load 'vc-git
- (defun vc-git-conflicted-files (directory)
- "Return the list of files with conflicts in DIRECTORY."
- (let* ((status
- (vc-git--run-command-string directory "diff-files"
- "--name-status"))
- (lines (when status (split-string status "\n" 'omit-nulls)))
- files)
- (dolist (line lines files)
- (when (string-match "\\([ MADRCU?!]\\)[ \t]+\\(.+\\)" line)
- (let ((state (match-string 1 line))
- (file (match-string 2 line)))
- (when (equal state "U")
- (push (expand-file-name file directory) files)))))))))
-
-(when (< emacs-major-version 27)
- (defun vc-git--call@bug21559 (fn buffer command &rest args)
- "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.";
- (let ((process-environment process-environment))
- (when revert-buffer-in-progress-p
- (push "GIT_OPTIONAL_LOCKS=0" process-environment))
- (apply fn buffer command args)))
- (advice-add 'vc-git--call :around 'vc-git--call@bug21559)
-
- (defun vc-git-command@bug21559
- (fn buffer okstatus file-or-list &rest flags)
- "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.";
- (let ((process-environment process-environment))
- (when revert-buffer-in-progress-p
- (push "GIT_OPTIONAL_LOCKS=0" process-environment))
- (apply fn buffer okstatus file-or-list flags)))
- (advice-add 'vc-git-command :around 'vc-git-command@bug21559)
-
- (defun auto-revert-handler@bug21559 (fn)
- "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.";
- (let ((revert-buffer-in-progress-p t))
- (funcall fn)))
- (advice-add 'auto-revert-handler :around 'auto-revert-handler@bug21559)
- )
-
(defun magit-which-function ()
"Return current function name based on point.
@@ -1193,33 +1150,6 @@ See
<https://github.com/raxod502/straight.el/issues/520>."
(setq filename (expand-file-name (file-name-nondirectory filename) repo)))
(file-chase-links filename))
-;;; Kludges for older Emacs versions
-
-(if (fboundp 'with-connection-local-variables)
- (defalias 'magit--with-connection-local-variables
- #'with-connection-local-variables)
- (defmacro magit--with-connection-local-variables (&rest body)
- "Abridged `with-connection-local-variables' for pre Emacs 27 compatibility.
-Bind shell file name and switch for remote execution.
-`with-connection-local-variables' isn't available until Emacs 27.
-This kludge provides the minimal functionality required by
-Magit."
- `(if (file-remote-p default-directory)
- (pcase-let ((`(,shell-file-name ,shell-command-switch)
- (with-no-warnings ; about unknown tramp functions
- (require 'tramp)
- (let ((vec (tramp-dissect-file-name
- default-directory)))
- (list (tramp-get-method-parameter
- vec 'tramp-remote-shell)
- (string-join (tramp-get-method-parameter
- vec 'tramp-remote-shell-args)
- " "))))))
- ,@body)
- ,@body)))
-
-(put 'magit--with-connection-local-variables 'lisp-indent-function 'defun)
-
;;; Miscellaneous
(defun magit-message (format-string &rest args)
diff --git a/lisp/magit-bisect.el b/lisp/magit-bisect.el
index 3381224c289..59c250b19f1 100644
--- a/lisp/magit-bisect.el
+++ b/lisp/magit-bisect.el
@@ -205,7 +205,7 @@ bisect run'."
(list :file (expand-file-name "BISECT_CMD_OUTPUT" (magit-gitdir)))
"bisect" "start" bad good args)
(magit-refresh)))
- (magit--with-connection-local-variables
+ (with-connection-local-variables
(magit-git-bisect "run" (list shell-file-name
shell-command-switch cmdline))))
diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index f34bf20a94a..3c48ca64226 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -170,12 +170,12 @@ and then turned on again when turning off the latter."
;;; Faces
(defface magit-blame-highlight
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "grey80"
:foreground "black")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "grey25"
:foreground "white"))
"Face used for highlighting when blaming.
@@ -199,7 +199,7 @@ Also see option `magit-blame-styles'."
:group 'magit-faces)
(defface magit-blame-heading
- `((t ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((t :extend t
:inherit magit-blame-highlight
:weight normal
:slant normal))
@@ -718,13 +718,12 @@ modes is toggled, then this mode also gets toggled
automatically.
str)))
(defun magit-blame--format-separator ()
- (propertize
- (concat (propertize "\s" 'display '(space :height (2)))
- (propertize "\n" 'line-height t))
- 'font-lock-face `(:background
- ,(face-attribute 'magit-blame-heading
- :background nil t)
- ,@(and (>= emacs-major-version 27) '(:extend t)))))
+ (propertize (concat (propertize "\s" 'display '(space :height (2)))
+ (propertize "\n" 'line-height t))
+ 'font-lock-face
+ `( :extend t
+ :background
+ ,(face-attribute 'magit-blame-heading :background nil t))))
(defun magit-blame--format-time-string (time tz)
(let* ((time-format (or (magit-blame--style-get 'time-format)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 09beed4708f..19ca8e192aa 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -541,60 +541,58 @@ If you prefer the old behaviors, then set this to t."
;;; Faces
(defface magit-diff-file-heading
- `((t ,@(and (>= emacs-major-version 27) '(:extend t))
- :weight bold))
+ '((t :extend t :weight bold))
"Face for diff file headings."
:group 'magit-faces)
(defface magit-diff-file-heading-highlight
- `((t ,@(and (>= emacs-major-version 27) '(:extend t))
- :inherit magit-section-highlight))
+ '((t :extend t :inherit magit-section-highlight))
"Face for current diff file headings."
:group 'magit-faces)
(defface magit-diff-file-heading-selection
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:inherit magit-diff-file-heading-highlight
:foreground "salmon4")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:inherit magit-diff-file-heading-highlight
:foreground "LightSalmon3"))
"Face for selected diff file headings."
:group 'magit-faces)
(defface magit-diff-hunk-heading
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "grey90"
:foreground "grey20")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "grey25"
:foreground "grey95"))
"Face for diff hunk headings."
:group 'magit-faces)
(defface magit-diff-hunk-heading-highlight
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "grey80"
:foreground "grey20")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "grey35"
:foreground "grey95"))
"Face for current diff hunk headings."
:group 'magit-faces)
(defface magit-diff-hunk-heading-selection
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:inherit magit-diff-hunk-heading-highlight
:foreground "salmon4")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:inherit magit-diff-hunk-heading-highlight
:foreground "LightSalmon3"))
"Face for selected diff hunk headings."
@@ -602,8 +600,7 @@ If you prefer the old behaviors, then set this to t."
(defface magit-diff-hunk-region
`((t :inherit bold
- ,@(and (>= emacs-major-version 27)
- (list :extend (ignore-errors (face-attribute 'region
:extend))))))
+ :extend ,(ignore-errors (face-attribute 'region :extend))))
"Face used by `magit-diff-highlight-hunk-region-using-face'.
This face is overlaid over text that uses other hunk faces,
@@ -625,12 +622,12 @@ and `:slant'."
:group 'magit-faces)
(defface magit-diff-lines-heading
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:inherit magit-diff-hunk-heading-highlight
:background "LightSalmon3")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:inherit magit-diff-hunk-heading-highlight
:foreground "grey80"
:background "salmon4"))
@@ -638,8 +635,7 @@ and `:slant'."
:group 'magit-faces)
(defface magit-diff-lines-boundary
- `((t ,@(and (>= emacs-major-version 27) '(:extend t)) ; !important
- :inherit magit-diff-lines-heading))
+ '((t :extend t :inherit magit-diff-lines-heading))
"Face for boundary of marked lines in diff hunk."
:group 'magit-faces)
@@ -649,24 +645,24 @@ and `:slant'."
:group 'magit-faces)
(defface magit-diff-added
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "#ddffdd"
:foreground "#22aa22")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "#335533"
:foreground "#ddffdd"))
"Face for lines in a diff that have been added."
:group 'magit-faces)
(defface magit-diff-removed
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "#ffdddd"
:foreground "#aa2222")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "#553333"
:foreground "#ffdddd"))
"Face for lines in a diff that have been removed."
@@ -678,12 +674,12 @@ and `:slant'."
:group 'magit-faces)
(defface magit-diff-base
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "#ffffcc"
:foreground "#aaaa11")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "#555522"
:foreground "#ffffcc"))
"Face for lines in a diff for the base side in a conflict."
@@ -695,34 +691,34 @@ and `:slant'."
:group 'magit-faces)
(defface magit-diff-context
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:foreground "grey50")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:foreground "grey70"))
"Face for lines in a diff that are unchanged."
:group 'magit-faces)
(defface magit-diff-added-highlight
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "#cceecc"
:foreground "#22aa22")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "#336633"
:foreground "#cceecc"))
"Face for lines in a diff that have been added."
:group 'magit-faces)
(defface magit-diff-removed-highlight
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "#eecccc"
:foreground "#aa2222")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "#663333"
:foreground "#eecccc"))
"Face for lines in a diff that have been removed."
@@ -734,12 +730,12 @@ and `:slant'."
:group 'magit-faces)
(defface magit-diff-base-highlight
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "#eeeebb"
:foreground "#aaaa11")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "#666622"
:foreground "#eeeebb"))
"Face for lines in a diff for the base side in a conflict."
@@ -751,12 +747,12 @@ and `:slant'."
:group 'magit-faces)
(defface magit-diff-context-highlight
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "grey95"
:foreground "grey50")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "grey20"
:foreground "grey70"))
"Face for lines in the current context in a diff."
@@ -3438,8 +3434,7 @@ for added and removed lines as for context lines."
'magit-diff-context-highlight
'magit-diff-context)))
(when magit-diff-unmarked-lines-keep-foreground
- (setq face `(,@(and (>= emacs-major-version 27) '(:extend t))
- :background ,(face-attribute face :background))))
+ (setq face `(:extend t :background ,(face-attribute face :background))))
(magit-diff--make-hunk-overlay (oref section content)
(magit-diff-hunk-region-beginning)
'font-lock-face face
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 5a931db0f56..b487289de83 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -200,11 +200,7 @@ blame to center around the line point is on."
To make this command available use something like:
(keymap-set ido-common-completion-map
- \"C-x g\" \\='ido-enter-magit-status)
-
-This command does not work in Emacs 26.1.
-See https://github.com/magit/magit/issues/3634
-and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31707.";
+ \"C-x g\" \\='ido-enter-magit-status)"
(interactive)
(setq ido-exit 'fallback)
(setq ido-fallback #'magit-status)
@@ -277,10 +273,7 @@ for a repository."
(interactive (list (or (magit-toplevel)
(magit-read-repository t))
current-prefix-arg))
- ;; Note: The ERROR argument of `dired-get-marked-files' isn't
- ;; available until Emacs 27.
- (let ((files (or (dired-get-marked-files nil arg)
- (user-error "No files specified"))))
+ (let ((files (dired-get-marked-files nil arg nil nil t)))
(magit-status-setup-buffer repo)
(magit-am-apply-patches files)))
@@ -382,32 +375,28 @@ in HEAD as well as staged changes in the diff to check."
(require 'diff-mode) ; `diff-add-log-current-defuns'.
(require 'vc-git) ; `vc-git-diff'.
(require 'add-log) ; `change-log-insert-entries'.
- (cond
- ((and (fboundp 'change-log-insert-entries)
- (fboundp 'diff-add-log-current-defuns))
- (setq default-directory
- (if (and (file-regular-p "gitdir")
- (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
- (magit-git-true "rev-parse" "--is-inside-git-dir"))
- (file-name-directory (magit-file-line "gitdir"))
- (magit-toplevel)))
- (let ((rev1 (if amending "HEAD^1" "HEAD"))
- (rev2 nil))
- ;; Magit may have updated the files without notifying vc, but
- ;; `diff-add-log-current-defuns' relies on vc being up-to-date.
- (mapc #'vc-file-clearprops (magit-staged-files))
- (change-log-insert-entries
- (with-temp-buffer
- (vc-git-command (current-buffer) 1 nil
- "diff-index" "--exit-code" "--patch"
- (and (magit-anything-staged-p) "--cached")
- rev1 "--")
- ;; `diff-find-source-location' consults these vars.
- (defvar diff-vc-revisions)
- (setq-local diff-vc-revisions (list rev1 rev2))
- (setq-local diff-vc-backend 'Git)
- (diff-add-log-current-defuns)))))
- ((user-error "`magit-generate-changelog' requires Emacs 27 or greater"))))
+ (setq default-directory
+ (if (and (file-regular-p "gitdir")
+ (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
+ (magit-git-true "rev-parse" "--is-inside-git-dir"))
+ (file-name-directory (magit-file-line "gitdir"))
+ (magit-toplevel)))
+ (let ((rev1 (if amending "HEAD^1" "HEAD"))
+ (rev2 nil))
+ ;; Magit may have updated the files without notifying vc, but
+ ;; `diff-add-log-current-defuns' relies on vc being up-to-date.
+ (mapc #'vc-file-clearprops (magit-staged-files))
+ (change-log-insert-entries
+ (with-temp-buffer
+ (vc-git-command (current-buffer) 1 nil
+ "diff-index" "--exit-code" "--patch"
+ (and (magit-anything-staged-p) "--cached")
+ rev1 "--")
+ ;; `diff-find-source-location' consults these vars.
+ (defvar diff-vc-revisions)
+ (setq-local diff-vc-revisions (list rev1 rev2))
+ (setq-local diff-vc-backend 'Git)
+ (diff-add-log-current-defuns)))))
;;;###autoload
(defun magit-add-change-log-entry (&optional whoami file-name other-window)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 4ce9063cbb8..b396f21a390 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1456,8 +1456,6 @@ Git."
(defun magit-name-tag (rev &optional lax)
(and-let* ((name (magit-rev-name rev "refs/tags/*")))
- ;; The progn is necessary to work around debbugs#31840. This, and all
- ;; the other instances, can be removed once we require at least Emacs 27.
(progn
(when (string-suffix-p "^0" name)
(setq name (substring name 0 -2)))
@@ -2257,7 +2255,7 @@ If `first-parent' is set, traverse only first parents."
(cdr (split-string str))))
(defun magit-patch-id (rev)
- (magit--with-connection-local-variables
+ (with-connection-local-variables
(magit--with-temp-process-buffer
(magit-process-file
shell-file-name nil '(t nil) nil shell-command-switch
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index c57d05e3f29..6341d283000 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -10,7 +10,7 @@
;; Package-Version: 4.1.3
;; Package-Requires: (
-;; (emacs "26.1")
+;; (emacs "27.1")
;; (compat "30.0.0.0")
;; (dash "2.19.1")
;; (seq "2.24"))
@@ -329,39 +329,38 @@ no effect. This also has no effect for Emacs >= 28, where
:group 'faces)
(defface magit-section-highlight
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:background "grey95")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:background "grey20"))
"Face for highlighting the current section."
:group 'magit-section-faces)
(defface magit-section-heading
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:foreground "DarkGoldenrod4"
:weight bold)
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:foreground "LightGoldenrod2"
:weight bold))
"Face for section headings."
:group 'magit-section-faces)
(defface magit-section-secondary-heading
- `((t ,@(and (>= emacs-major-version 27) '(:extend t))
- :weight bold))
+ '((t :extend t :weight bold))
"Face for section headings of some secondary headings."
:group 'magit-section-faces)
(defface magit-section-heading-selection
- `((((class color) (background light))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ '((((class color) (background light))
+ :extend t
:foreground "salmon4")
(((class color) (background dark))
- ,@(and (>= emacs-major-version 27) '(:extend t))
+ :extend t
:foreground "LightSalmon3"))
"Face for selected section headings."
:group 'magit-section-faces)
@@ -1183,7 +1182,6 @@ section lineage. This command is intended for debugging
purposes.
(cl-defmethod cl-print-object ((section magit-section) stream)
"Print `magit-describe-section' result of SECTION."
- ;; Used by debug and edebug as of Emacs 26.
(princ (magit-describe-section-briefly section) stream))
(defun magit-describe-section (section &optional interactive-p)
@@ -2441,67 +2439,65 @@ with the variables' values as arguments, which were
recorded by
;;; Bitmaps
-(when (fboundp 'define-fringe-bitmap) ;for Emacs 26
- (define-fringe-bitmap 'magit-fringe-bitmap+
- [#b00000000
- #b00011000
- #b00011000
- #b01111110
- #b01111110
- #b00011000
- #b00011000
- #b00000000])
-
- (define-fringe-bitmap 'magit-fringe-bitmap-
- [#b00000000
- #b00000000
- #b00000000
- #b01111110
- #b01111110
- #b00000000
- #b00000000
- #b00000000])
-
- (define-fringe-bitmap 'magit-fringe-bitmap>
- [#b01100000
- #b00110000
- #b00011000
- #b00001100
- #b00011000
- #b00110000
- #b01100000
- #b00000000])
-
- (define-fringe-bitmap 'magit-fringe-bitmapv
- [#b00000000
- #b10000010
- #b11000110
- #b01101100
- #b00111000
- #b00010000
- #b00000000
- #b00000000])
-
- (define-fringe-bitmap 'magit-fringe-bitmap-bold>
- [#b11100000
- #b01110000
- #b00111000
- #b00011100
- #b00011100
- #b00111000
- #b01110000
- #b11100000])
-
- (define-fringe-bitmap 'magit-fringe-bitmap-boldv
- [#b10000001
- #b11000011
- #b11100111
- #b01111110
- #b00111100
- #b00011000
- #b00000000
- #b00000000])
- )
+(define-fringe-bitmap 'magit-fringe-bitmap+
+ [#b00000000
+ #b00011000
+ #b00011000
+ #b01111110
+ #b01111110
+ #b00011000
+ #b00011000
+ #b00000000])
+
+(define-fringe-bitmap 'magit-fringe-bitmap-
+ [#b00000000
+ #b00000000
+ #b00000000
+ #b01111110
+ #b01111110
+ #b00000000
+ #b00000000
+ #b00000000])
+
+(define-fringe-bitmap 'magit-fringe-bitmap>
+ [#b01100000
+ #b00110000
+ #b00011000
+ #b00001100
+ #b00011000
+ #b00110000
+ #b01100000
+ #b00000000])
+
+(define-fringe-bitmap 'magit-fringe-bitmapv
+ [#b00000000
+ #b10000010
+ #b11000110
+ #b01101100
+ #b00111000
+ #b00010000
+ #b00000000
+ #b00000000])
+
+(define-fringe-bitmap 'magit-fringe-bitmap-bold>
+ [#b11100000
+ #b01110000
+ #b00111000
+ #b00011100
+ #b00011100
+ #b00111000
+ #b01110000
+ #b11100000])
+
+(define-fringe-bitmap 'magit-fringe-bitmap-boldv
+ [#b10000001
+ #b11000011
+ #b11100111
+ #b01111110
+ #b00111100
+ #b00011000
+ #b00000000
+ #b00000000])
;;; _
(provide 'magit-section)
diff --git a/lisp/magit.el b/lisp/magit.el
index 37c10bac0ae..54f391e2194 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -19,7 +19,7 @@
;; Package-Version: 4.1.3
;; Package-Requires: (
-;; (emacs "26.1")
+;; (emacs "27.1")
;; (compat "30.0.0.0")
;; (dash "2.19.1")
;; (magit-section "4.1.3")
@@ -481,7 +481,7 @@ is run in the top-level directory of the current working
tree."
(defun magit--shell-command (command &optional directory)
(let ((default-directory (or directory default-directory)))
(with-environment-variables (("GIT_PAGER" "cat"))
- (magit--with-connection-local-variables
+ (with-connection-local-variables
(magit-with-editor
(magit-start-process shell-file-name nil
shell-command-switch command)))))
