jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up prelude-cleanup-buffer code

Browse source 
- Create a macro `with-region-or-buffer` to replace the prelude wrapper
  around `untabify` and `indent-region`
- Remove the function operated on buffers, cause we only need the dwim
  one
This commit is contained in:
toctan 2014-06-25 09:36:23 +08:00
parent 2e8859b936
commit d226fd63f7
3 changed files with 13 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

53
core/prelude-core.el
View file

@ -158,23 +158,6 @@ point reaches the beginning or end of the buffer, stop there."
(global-set-key [remap move-beginning-of-line]
'prelude-move-beginning-of-line)
(defun prelude-indent-buffer ()
"Indent the currently visited buffer."
(interactive)
(indent-region (point-min) (point-max)))
(defun prelude-indent-buffer-or-region ()
"Indent a region if selected, otherwise the whole buffer."
(interactive)
(save-excursion
(if (region-active-p)
(progn
(indent-region (region-beginning) (region-end))
(message "Indented selected region."))
(progn
(prelude-indent-buffer)
(message "Indented buffer.")))))
(defun prelude-indent-defun ()
"Indent the current defun."
(interactive)
@ -286,43 +269,11 @@ there's a region, all lines that region covers will be duplicated."
(cond ((search-forward "<?xml" nil t) (nxml-mode))
((search-forward "<html" nil t) (html-mode)))))
(defun prelude-untabify-buffer ()
"Remove all tabs from the current buffer."
(interactive)
(untabify (point-min) (point-max)))
(defun prelude-untabify-buffer-or-region ()
"Untabify a region if selected, otherwise the whole buffer."
(interactive)
(save-excursion
(if (region-active-p)
(progn
(untabify (region-beginning) (region-end))
(message "Untabify selected region."))
(progn
(prelude-untabify-buffer)
(message "Untabify buffer.")))))
(defun prelude-cleanup-buffer ()
"Perform a bunch of operations on the whitespace content of a buffer."
(interactive)
(prelude-untabify-buffer)
(prelude-indent-buffer)
(whitespace-cleanup))
(defun prelude-cleanup-buffer-or-region ()
"Cleanup a region if selected, otherwise the whole buffer."
(interactive)
(save-excursion
(if (region-active-p)
(progn
(untabify (region-beginning) (region-end))
(indent-region (region-beginning) (region-end))
(message "Cleanup selected region."))
(progn
(prelude-untabify-buffer)
(prelude-indent-buffer)
(message "Cleanup buffer."))))
(call-interactively 'untabify)
(call-interactively 'indent-region)
(whitespace-cleanup))
(defun prelude-eval-and-replace ()