From 5c3188afd5fe67b919a03136ac42bc1c789cbbe2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 2 Apr 2019 00:51:29 -0400 Subject: [PATCH] editor/format: fix +format/region-or-buffer The `r` interactive spec barfs an error if no mark is active, preventing this function from ever calling `+format/buffer`. Reported by @amosbird --- modules/editor/format/autoload/format.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el index 8152cdcd6..8cea65a04 100644 --- a/modules/editor/format/autoload/format.el +++ b/modules/editor/format/autoload/format.el @@ -204,13 +204,14 @@ snippets or single lines." (+format/buffer arg)))) ;;;###autoload -(defun +format/region-or-buffer (beg end &optional arg) +(defun +format/region-or-buffer () "Runs the active formatter on the selected region (or whole buffer, if nothing is selected)." - (interactive "rP") - (if (use-region-p) - (+format/region beg end arg) - (call-interactively #'+format/buffer))) + (interactive) + (call-interactively + (if (use-region-p) + #'+format/region + #'+format/buffer))) ;;