update packages and add valign

lisp/swiper/swiper-pkg.el

@@ -1,11 +1,11 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "swiper" "20250329.1401"
+(define-package "swiper" "20260101.2125"
   "Isearch with an overview.  Oh, man!."
   '((emacs "24.5")
     (ivy   "0.15.1"))
   :url "https://github.com/abo-abo/swiper"
-  :commit "e33b028ed4b1258a211c87fd5fe801bed25de429"
-  :revdesc "e33b028ed4b1"
+  :commit "d489b4f0d48fd215119261d92de103c5b5580895"
+  :revdesc "d489b4f0d48f"
   :keywords '("matching")
   :authors '(("Oleh Krehel" . "ohwoeowho@gmail.com"))
   :maintainers '(("Basil L. Contovounesios" . "basil@contovou.net")))

lisp/swiper/swiper.el

@@ -1,12 +1,12 @@
 ;;; swiper.el --- Isearch with an overview.  Oh, man! -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2026 Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; Maintainer: Basil L. Contovounesios <basil@contovou.net>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20250329.1401
-;; Package-Revision: e33b028ed4b1
+;; Package-Version: 20260101.2125
+;; Package-Revision: d489b4f0d48f
 ;; Package-Requires: ((emacs "24.5") (ivy "0.15.1"))
 ;; Keywords: matching
 
@@ -153,6 +153,7 @@ If the input is empty, select the previous history element instead."
   (if (string= ivy-text "")
       (ivy-previous-history-element 1)
     (ivy-next-line arg)))
+(ivy--no-M-x #'swiper-C-s #'ivy--minibuffer-p)
 
 (defvar swiper-map
   (let ((map (make-sparse-keymap)))
@@ -160,10 +161,11 @@ If the input is empty, select the previous history element instead."
     (define-key map (kbd "M-q") #'swiper-query-replace)
     (define-key map (kbd "C-l") #'swiper-recenter-top-bottom)
     (define-key map (kbd "C-'") #'swiper-avy)
+    (define-key map [remap ivy-avy] #'swiper-avy)
     (define-key map (kbd "C-7") #'swiper-mc)
     (define-key map (kbd "C-c C-f") #'swiper-toggle-face-matching)
     map)
-  "Keymap for swiper.")
+  "Keymap for `swiper'.")
 
 (defvar swiper--query-replace-overlays nil)
 
@@ -245,10 +247,10 @@ If the input is empty, select the previous history element instead."
                        (perform-replace from to
                                         t t nil))))))
            (swiper--query-replace-cleanup)))))
+(ivy--no-M-x #'swiper-query-replace #'ivy--minibuffer-p)
 
 (ivy-configure 'swiper-query-replace
   :update-fn #'swiper--query-replace-updatefn)
-(function-put #'swiper-query-replace 'no-counsel-M-x t)
 
 (defvar inhibit-message)
 
@@ -273,7 +275,7 @@ If the input is empty, select the previous history element instead."
                     (goto-char (point-min))
                     (perform-replace from to t t nil)))
              (set-window-configuration wnd-conf))))))))
-(function-put #'swiper-all-query-replace 'no-counsel-M-x t)
+(ivy--no-M-x #'swiper-all-query-replace #'ivy--minibuffer-p)
 
 (defvar avy-all-windows)
 (defvar avy-style)
@@ -392,6 +394,7 @@ If the input is empty, select the previous history element instead."
        (let ((swiper-min-highlight 1))
          (swiper--update-input-ivy)))))
   (swiper--avy-goto (swiper--avy-candidate)))
+(ivy--no-M-x #'swiper-avy #'ivy--minibuffer-p)
 
 (declare-function mc/create-fake-cursor-at-point "ext:multiple-cursors-core")
 (declare-function multiple-cursors-mode "ext:multiple-cursors-core")
@@ -415,6 +418,7 @@ Make sure `swiper-mc' is on `mc/cmds-to-run-once' list."
              (when cands
                (mc/create-fake-cursor-at-point))))
          (multiple-cursors-mode 1))))))
+(ivy--no-M-x #'swiper-mc #'ivy--minibuffer-p)
 
 (defvar swiper--current-window-start nil
   "Store `window-start' to restore it later.
@@ -427,6 +431,7 @@ such as `scroll-conservatively' are set to a high value.")
   (with-ivy-window
     (recenter-top-bottom arg)
     (setq swiper--current-window-start (window-start))))
+(ivy--no-M-x #'swiper-recenter-top-bottom #'ivy--minibuffer-p t)
 
 (defvar swiper-font-lock-exclude
   '(Man-mode
@@ -870,6 +875,7 @@ When non-nil, INITIAL-INPUT is the initial search pattern."
             nil
           #'swiper--face-matcher))
   (setq ivy--old-re nil))
+(ivy--no-M-x #'swiper-toggle-face-matching #'ivy--minibuffer-p)
 
 (defun swiper--face-matcher (regexp candidates)
   "Return REGEXP matching CANDIDATES.
@@ -1395,10 +1401,9 @@ See `ivy-format-functions-alist' for further information."
 
 (defun swiper-match-usable-p ()
   (or search-invisible
-      (not (cl-find-if
-            (lambda (ov)
-              (invisible-p (overlay-get ov 'invisible)))
-            (overlays-at (point))))))
+      (cl-notany (lambda (ov)
+                   (invisible-p (overlay-get ov 'invisible)))
+                 (overlays-at (point)))))
 
 (defvar swiper--isearch-backward nil
   "Non-nil when performing `swiper-isearch-backward'.")
@@ -1578,6 +1583,7 @@ Like `ivy-insert-current', but tailored for `swiper-isearch'."
   (delete-minibuffer-contents)
   (let ((cur (ivy-state-current ivy-last)))
     (insert (with-ivy-window (swiper--isearch-candidate-string cur)))))
+(ivy--no-M-x #'swiper--isearch-insert-current #'ivy--minibuffer-p)
 
 (defun swiper--isearch-kill-ring-save ()
   "Save the current candidates in the kill ring.
@@ -1588,6 +1594,7 @@ Like `ivy-kill-ring-save', but tailored for `swiper-isearch'."
       (call-interactively #'kill-ring-save)
     (kill-new (with-ivy-window
                 (mapconcat #'swiper--line-at-point ivy--old-cands "\n")))))
+(ivy--no-M-x #'swiper--isearch-kill-ring-save #'ivy--minibuffer-p)
 
 (defun swiper-isearch-thing-at-point ()
   "Insert `symbol-at-point' into the minibuffer of `swiper-isearch'.
@@ -1625,6 +1632,7 @@ When the input is empty, browse the search history instead."
   (if (string= ivy-text "")
       (ivy-reverse-i-search)
     (ivy-previous-line arg)))
+(ivy--no-M-x #'swiper-isearch-C-r #'ivy--minibuffer-p)
 
 (defvar swiper-isearch-map
   (let ((map (make-sparse-keymap)))