ui/popup: use old alist use-case for set-popup-rule!

This paradigm has been long since abandoned.
This commit is contained in:
Henrik Lissner 2019-10-21 06:12:57 -04:00
parent b3a0fb9fc7
commit 74cad2632b
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -15,38 +15,27 @@
;;;###autoload ;;;###autoload
(defun +popup--make (predicate plist) (defun +popup--make (predicate plist)
(cond ((and plist (not (keywordp (car plist)))) (if (plist-get plist :ignore)
;; FIXME deprecated popup rule support (list predicate nil)
(message "Warning: the old usage of `set-popup-rule!' is deprecated; update the rule for '%s'" (let* ((plist (append plist +popup-defaults))
predicate) (alist
(cl-destructuring-bind (condition &optional alist parameters) `((actions . ,(plist-get plist :actions))
(list predicate (car plist) (cadr plist)) (side . ,(plist-get plist :side))
(if (eq alist :ignore) (size . ,(plist-get plist :size))
(list condition nil) (window-width . ,(plist-get plist :width))
`(,condition (+popup-buffer) (window-height . ,(plist-get plist :height))
,@alist (slot . ,(plist-get plist :slot))
(window-parameters ,@parameters))))) (vslot . ,(plist-get plist :vslot))))
((plist-get plist :ignore) (params
(list predicate nil)) `((ttl . ,(plist-get plist :ttl))
((let* ((plist (append plist +popup-defaults)) (quit . ,(plist-get plist :quit))
(alist (select . ,(plist-get plist :select))
`((actions . ,(plist-get plist :actions)) (modeline . ,(plist-get plist :modeline))
(side . ,(plist-get plist :side)) (autosave . ,(plist-get plist :autosave))
(size . ,(plist-get plist :size)) ,@(plist-get plist :parameters))))
(window-width . ,(plist-get plist :width)) `(,predicate (+popup-buffer)
(window-height . ,(plist-get plist :height)) ,@alist
(slot . ,(plist-get plist :slot)) (window-parameters ,@params)))))
(vslot . ,(plist-get plist :vslot))))
(params
`((ttl . ,(plist-get plist :ttl))
(quit . ,(plist-get plist :quit))
(select . ,(plist-get plist :select))
(modeline . ,(plist-get plist :modeline))
(autosave . ,(plist-get plist :autosave))
,@(plist-get plist :parameters))))
`(,predicate (+popup-buffer)
,@alist
(window-parameters ,@params))))))
;;;###autodef ;;;###autodef
(defun set-popup-rule! (predicate &rest plist) (defun set-popup-rule! (predicate &rest plist)