fix: format-all upstream definitions

Upstream renamed definitions in
f3ed09c430 .
This commit is contained in:
argo 2019-06-08 16:46:43 +02:00
parent 56cd92ab3d
commit 12233811a8
4 changed files with 27 additions and 27 deletions

View file

@ -5,7 +5,7 @@
buffer.")
;;;###autoload
(autoload 'format-all-probe "format-all")
(autoload 'format-all--probe "format-all")
(defun +format--delete-whole-line (&optional arg)
"Delete the current line without putting it in the `kill-ring'.
@ -93,7 +93,7 @@ Stolen shamelessly from go-mode"
(defun +format-completing-read ()
(require 'format-all)
(let* ((fmtlist (mapcar #'symbol-name (hash-table-keys format-all-format-table)))
(let* ((fmtlist (mapcar #'symbol-name (hash-table-keys format-all--format-table)))
(fmt (completing-read "Formatter: " fmtlist)))
(if fmt (cons (intern fmt) t))))
@ -122,8 +122,8 @@ See `+format/buffer' for the interactive version of this function, and
`+format|buffer' to use as a `before-save-hook' hook."
(if (not formatter)
'no-formatter
(let ((f-function (gethash formatter format-all-format-table))
(executable (format-all-formatter-executable formatter))
(let ((f-function (gethash formatter format-all--format-table))
(executable (format-all--formatter-executable formatter))
(indent 0))
(pcase-let
((`(,output ,errput ,first-diff)
@ -180,7 +180,7 @@ See `+format/buffer' for the interactive version of this function, and
"Format the source code in the current buffer."
(interactive "P")
(let ((+format-with (or (if arg (+format-completing-read)) +format-with)))
(pcase-let ((`(,formatter ,mode-result) (format-all-probe)))
(pcase-let ((`(,formatter ,mode-result) (format-all--probe)))
(pcase
(+format-buffer
formatter mode-result