[elpa] externals/embark 8fccb6ee89 3/3: Merge pull request #446 from minad/multi

[ELPA Syncer]

branch: externals/embark
commit 8fccb6ee894ebb9ec66b449934edfd3ffac222c9
Merge: 8cf1fdbfac 4addf71500
Author: Omar Antolín Camarena <omar.antolin@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #446 from minad/multi
    
    Minor stuff
---
 embark.el | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/embark.el b/embark.el
index 63c475e697..f533923b91 100644
--- a/embark.el
+++ b/embark.el
@@ -125,7 +125,8 @@
     (buffer . embark-buffer-map)
     (expression . embark-expression-map)
     (identifier . embark-identifier-map)
-    (defun . embark-defun-map)
+    ;; NOTE: Weird space in front of defun to please package-lint.
+    ( defun . embark-defun-map)
     (symbol . embark-symbol-map)
     (face . embark-face-map)
     (command . embark-command-map)
@@ -179,9 +180,7 @@ bounds pair of the target at point for highlighting."
     (embark-keybinding . embark--keybinding-command)
     (project-file . embark--project-file-full-path)
     (package . embark--remove-package-version)
-    (multi-category . embark--refine-multi-category)
-    ;; TODO: `consult-multi' has been obsoleted by `multi-category'. Remove!
-    (consult-multi . embark--refine-multi-category))
+    (multi-category . embark--refine-multi-category))
   "Alist associating type to functions for transforming targets.
 Each function should take a type and a target string and return a
 pair of the form a `cons' of the new type and the new target."
@@ -1836,8 +1835,6 @@ minibuffer before executing the action."
 (defun embark--refine-multi-category (_type target)
   "Refine `multi-category' TARGET to its actual type."
   (or (get-text-property 0 'multi-category target)
-      ;; TODO: `consult-multi' has been obsoleted by `multi-category'. Remove!
-      (get-text-property 0 'consult-multi target)
       (cons 'general target)))
 
 (defun embark--refine-symbol-type (_type target)
@@ -3363,7 +3360,7 @@ its own."
                      (newline-and-indent)))
                (maybe-whitespace ()
                  (if multiline (maybe-newline) (maybe-space)))
-               (insert-string ()
+               (ins-string ()
                  (save-excursion
                    (insert string)
                    (maybe-whitespace)
@@ -3371,8 +3368,8 @@ its own."
                  (maybe-whitespace)))
       (if buffer-read-only
           (with-selected-window (other-window-for-scrolling)
-            (insert-string))
-        (insert-string)))))
+            (ins-string))
+        (ins-string)))))
 
 (define-obsolete-function-alias
   'embark-save