ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-13 21:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: more tweaks to the interactive spec of `yas/reload-all'

Browse Source
This commit is contained in:
João Távora 2012-05-29 21:23:15 +01:00
parent 490389e1e1
commit bcb3cd30aa
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yasnippet.el
View File

@ -1673,7 +1673,7 @@ Optional USE-JIT use jit-loading of snippets."
(call-interactively 'yas/load-directory)) (call-interactively 'yas/load-directory))
errors)) errors))
(defun yas/reload-all (&optional no-jit) (defun yas/reload-all (&optional interactive)
"Reload all snippets and rebuild the YASnippet menu." "Reload all snippets and rebuild the YASnippet menu."
(interactive "P") (interactive "P")
(catch 'abort (catch 'abort
@ -1685,11 +1685,15 @@ Optional USE-JIT use jit-loading of snippets."
;; Warn if there are buffers visiting snippets, since reloading will break ;; Warn if there are buffers visiting snippets, since reloading will break
;; any on-line editing of those buffers. ;; any on-line editing of those buffers.
;; ;;
(if snippet-editing-buffers (when snippet-editing-buffers
(if interactive
(if (y-or-n-p "Some buffers editing live snippets, close them and proceed with reload?") (if (y-or-n-p "Some buffers editing live snippets, close them and proceed with reload?")
(mapcar #'kill-buffer snippet-editing-buffers) (mapcar #'kill-buffer snippet-editing-buffers)
(yas/message 1 "Aborted reload...") (yas/message 1 "Aborted reload...")
(throw 'abort nil))) (throw 'abort nil))
;; in a non-interactive use, at least set
;; `yas/editing-template' to nil, make it guess it next time around
(mapc #'(lambda (buffer) (setq yas/editing-template nil)) (buffer-list))))
;; Empty all snippet tables, parenting info and all menu tables ;; Empty all snippet tables, parenting info and all menu tables
;; ;;
@ -1710,7 +1714,7 @@ Optional USE-JIT use jit-loading of snippets."
;; Reload the directories listed in `yas/snippet-dirs' or prompt ;; Reload the directories listed in `yas/snippet-dirs' or prompt
;; the user to select one. ;; the user to select one.
;; ;;
(setq errors (yas/load-snippet-dirs no-jit)) (setq errors (yas/load-snippet-dirs interactive))
;; Reload the direct keybindings ;; Reload the direct keybindings
;; ;;
(yas/direct-keymaps-reload) (yas/direct-keymaps-reload)