dev: merging from main

modules/ui/neotree/config.el

@@ -15,7 +15,7 @@
         neo-mode-line-type 'none
         neo-window-width 30
         neo-show-updir-line nil
-        neo-theme 'icons
+        neo-theme 'nerd
         neo-banner-message nil
         neo-confirm-create-file #'off-p
         neo-confirm-create-directory #'off-p

modules/ui/popup/autoload/popup.el

@@ -106,7 +106,7 @@ the buffer is visible, then set another timer and try again later."
                   (param (if (memq side '(left right))
                              'window-width
                            'window-height)))
-        (setq list (assq-delete-all 'size alist))
+        (setq alist (assq-delete-all 'size alist))
         (setf (alist-get param alist) size))
       (setf (alist-get 'window-parameters alist)
             parameters)