emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Preselect last command in menus; reverse universal arg behavior

Browse source 
+ The universal argument tells a menu to use the last run command, if
  available.
+ If a last run command exists, preselect it in the menu.
This commit is contained in:
Henrik Lissner 2018-03-19 02:02:11 -04:00
parent 46dbf8f490
commit ab180cd51e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

62
core/autoload/menu.el
View file

@ -12,12 +12,12 @@ PROMPT (a string) and COMMAND (a list of command plists; see `def-menu!').")
(defun doom-menu-read-default (prompt commands) (defun doom-menu-read-default (prompt commands)
"Default method for displaying a completion-select prompt." "Default method for displaying a completion-select prompt."
(completing-read prompt (mapcar #'car commands))) (completing-read prompt (mapcar #'car commands) nil nil nil nil (car doom-menu-last-command)))
;;;###autoload ;;;###autoload
(defun doom--menu-read (prompt commands) (defun doom--menu-read (prompt commands)
(if-let* ((choice (funcall doom-menu-display-fn prompt commands))) (if-let* ((choice (funcall doom-menu-display-fn prompt commands)))
(cdr (assoc choice commands)) (assoc choice commands)
(user-error "Aborted"))) (user-error "Aborted")))
;;;###autoload ;;;###autoload
@ -82,37 +82,41 @@ lisp form.
`(cl-sort ,commands #'string-lessp :key #'car) `(cl-sort ,commands #'string-lessp :key #'car)
commands) commands)
,(format "Menu for %s" name)) ,(format "Menu for %s" name))
(defun ,name (arg) (defun ,name (arg command)
,(concat ,(concat
(if (stringp desc) (concat desc "\n\n")) (if (stringp desc) (concat desc "\n\n"))
"This is a command dispatcher. It will rerun the last command on\n" "This is a command dispatcher. It will rerun the last command on\n"
"consecutive executions. If ARG (universal argument) is non-nil\n" "consecutive executions. If ARG (universal argument) is non-nil\n"
"then it always prompt you.") "then it always prompt you.")
(interactive "P") (declare (interactive-only t))
(unless ,commands-var (interactive
(user-error "The '%s' menu is empty" ',name)) (list current-prefix-arg
(progn
(unless ,commands-var
(user-error "The '%s' menu is empty" ',name))
(doom--menu-read
,prop-prompt
(or (cl-remove-if-not
(let ((project-root (doom-project-root)))
(lambda (cmd)
(let ((plist (cdr cmd)))
(and (cond ((not (plist-member plist :region)) t)
((plist-get plist :region) (use-region-p))
(t (not (use-region-p))))
(let ((when (plist-get plist :when))
(unless (plist-get plist :unless))
(project (plist-get plist :project)))
(when (functionp project)
(setq project (funcall project)))
(or (or (not when) (eval when))
(or (not unless) (not (eval unless)))
(and (stringp project)
(file-in-directory-p (or buffer-file-name default-directory)
project-root))))))))
,commands-var)
(user-error "No commands available here"))))))
(doom--menu-exec (doom--menu-exec
(or (unless arg doom-menu-last-command) (cdr (or (when arg doom-menu-last-command)
(setq doom-menu-last-command (setq doom-menu-last-command command)
(doom--menu-read (user-error "No command selected"))))))))
,prop-prompt
(or (cl-remove-if-not
(let ((project-root (doom-project-root)))
(lambda (cmd)
(let ((plist (cdr cmd)))
(and (cond ((not (plist-member plist :region)) t)
((plist-get plist :region) (use-region-p))
(t (not (use-region-p))))
(let ((when (plist-get plist :when))
(unless (plist-get plist :unless))
(project (plist-get plist :project)))
(when (functionp project)
(setq project (funcall project)))
(or (or (not when) (eval when))
(or (not unless) (not (eval unless)))
(and (stringp project)
(file-in-directory-p buffer-file-name project-root))))))))
,commands-var)
(user-error "No commands available here"))))
(user-error "No command selected")))))))