Merge branch 'rs/ipv6-ssh-url' into maint

diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el
index 7f4c7929784f8e2d8b24b0eaf9f05a2f10c1c6eb..37d797e12419960c0698ec294b89060fd77d8d88 100644 (file)
--- a/contrib/emacs/git-blame.el
+++ b/contrib/emacs/git-blame.el
@@ -79,6 +79,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))                            ; to use `push', `pop'
+(require 'format-spec)
 
 (defface git-blame-prefix-face
   '((((background dark)) (:foreground "gray"
@@ -303,7 +304,7 @@ See also function `git-blame-mode'."
 
 (defun git-blame-cleanup ()
   "Remove all blame properties"
-    (mapcar 'delete-overlay git-blame-overlays)
+    (mapc 'delete-overlay git-blame-overlays)
     (setq git-blame-overlays nil)
     (remove-git-blame-text-properties (point-min) (point-max)))