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

General & minor refactoring

Browse source
This commit is contained in:
Henrik Lissner 2018-08-28 13:36:44 +02:00
parent ed0cbc1323
commit 2b560a6a0e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
6 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

43
modules/editor/format/autoload/format.el
View file

@ -144,27 +144,28 @@ Advanced examples:
;; format a region rather than the whole buffer.
(require 'format-all)
(save-restriction
(let* ((beg (save-excursion (goto-char beg) (line-beginning-position)))
(end (save-excursion (goto-char end)
(if (bolp) (backward-char))
(line-end-position)))
(file buffer-file-name)
(dir default-directory)
(mode major-mode)
(input (buffer-substring-no-properties beg end))
(leading-indent 0)
final-output)
(with-temp-buffer
(with-silent-modifications
(setq buffer-file-name file
default-directory dir)
(delay-mode-hooks (funcall mode))
(save-excursion (insert input))
(setq leading-indent (current-indentation))
(indent-rigidly (point-min) (point-max) (- leading-indent))
;; From `format-all-buffer'
(cl-destructuring-bind (formatter mode-result) (format-all-probe)
(unless formatter (error "Don't know how to format %S code" major-mode))
(cl-destructuring-bind (formatter mode-result) (format-all-probe)
(unless formatter
(user-error "Don't know how to format %S code" major-mode))
(let* ((beg (save-excursion (goto-char beg) (line-beginning-position)))
(end (save-excursion (goto-char end)
(if (bolp) (backward-char))
(line-end-position)))
(file buffer-file-name)
(dir default-directory)
(mode major-mode)
(input (buffer-substring-no-properties beg end))
(leading-indent 0)
final-output)
(with-temp-buffer
(with-silent-modifications
(setq buffer-file-name file
default-directory dir)
(delay-mode-hooks (funcall mode))
(save-excursion (insert input))
(setq leading-indent (current-indentation))
(indent-rigidly (point-min) (point-max) (- leading-indent))
;; From `format-all-buffer'
(let ((f-function (gethash formatter format-all-format-table))
(executable (format-all-formatter-executable formatter)))
(cl-destructuring-bind (output errput first-diff)

2
modules/feature/evil/config.el
View file

@ -328,7 +328,7 @@ line with a linewise comment.")
evilmi-outer-text-object evilmi-inner-text-object)
:config (global-evil-matchit-mode 1)
:init
(define-key! 'global [remap evil-jump-item] #'evilmi-jump-items)
(global-set-key [remap evil-jump-item] #'evilmi-jump-items)
(define-key evil-inner-text-objects-map "%" #'evilmi-inner-text-object)
(define-key evil-outer-text-objects-map "%" #'evilmi-outer-text-object)
:config

5
modules/tools/magit/config.el
View file

@ -46,7 +46,6 @@ available.")
(add-hook 'magit-post-refresh-hook #'+magit|update-vc))
(def-package! magit-todos
:hook (magit-mode . magit-todos-mode)
:config
@ -102,5 +101,5 @@ available.")
(evil-define-key* evil-magit-state git-rebase-mode-map
"gj" #'git-rebase-move-line-down
"gk" #'git-rebase-move-line-up))
(map! :map (magit-mode-map magit-blame-read-only-mode-map)
doom-leader-key nil))
(define-key! (magit-mode-map magit-blame-read-only-mode-map)
(kbd doom-leader-key) nil))