From ac91a5c16a37e4d1d1ba81c13403d9bffcffc3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= Date: Sun, 15 Dec 2019 21:13:41 +0100 Subject: [PATCH] handle nil returned from helm on C-g --- init.el | 14 ++++++++------ old-go.el | 7 ++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/init.el b/init.el index 0592f93..cbc98ec 100644 --- a/init.el +++ b/init.el @@ -587,9 +587,10 @@ inserted between the braces between the braces." (defun my-godoc-package () "Display godoc for given package (with completion)." (interactive) - (godoc (helm :sources (helm-build-sync-source "Go packages" - :candidates (go-packages)) - :buffer "*godoc packages*"))) + (godoc (or (helm :sources (helm-build-sync-source "Go packages" + :candidates (go-packages)) + :buffer "*godoc packages*") + (signal 'quit nil)))) (use-package go-guru :after go-mode) @@ -939,9 +940,10 @@ inserted between the braces between the braces." (defun my-browse-url (&rest args) "Select the prefered browser from a helm menu before opening the URL." (interactive) - (let ((browser (helm :sources (helm-build-sync-source "WWW browsers" - :candidates (mapcar 'car my-browsers)) - :buffer "*my browsers*"))) + (let ((browser (or (helm :sources (helm-build-sync-source "WWW browsers" + :candidates (mapcar 'car my-browsers)) + :buffer "*my browsers*") + (signal 'quit nil)))) (apply (cdr (assoc browser my-browsers)) args))) (setq browse-url-browser-function #'my-browse-url) diff --git a/old-go.el b/old-go.el index 6ecb1d1..22477b4 100644 --- a/old-go.el +++ b/old-go.el @@ -44,9 +44,10 @@ inserted between the braces between the braces." (defun my-godoc-package () "Display godoc for given package (with completion)." (interactive) - (godoc (helm :sources (helm-build-sync-source "Go packages" - :candidates (go-packages)) - :buffer "*godoc packages*"))) + (godoc (or (helm :sources (helm-build-sync-source "Go packages" + :candidates (go-packages)) + :buffer "*godoc packages*") + (signal 'quit nil)))) (use-package flycheck :defer)