Emacs: Remove unused prettify-inhibit-p guard.

master
Pierre Neidhardt 2019-11-02 16:51:57 +01:00
parent 95bc305917
commit f71cdd0709
3 changed files with 9 additions and 20 deletions

View File

@ -1 +0,0 @@
((nil . ((ambrevar/prettify-inhibit-p . nil))))

View File

@ -192,7 +192,6 @@
(with-eval-after-load 'racket-mode (require 'init-racket)) (with-eval-after-load 'racket-mode (require 'init-racket))
(setq geiser-repl-history-filename (expand-file-name "geiser_history" user-emacs-directory)) (setq geiser-repl-history-filename (expand-file-name "geiser_history" user-emacs-directory))
;; Emacs Lisp ;; Emacs Lisp
(add-hook 'emacs-lisp-mode-hook 'ambrevar/turn-on-prettify-before-save)
(add-hook 'emacs-lisp-mode-hook 'ambrevar/turn-on-complete-filename) (add-hook 'emacs-lisp-mode-hook 'ambrevar/turn-on-complete-filename)
(add-hook 'emacs-lisp-mode-hook 'ambrevar/turn-on-tab-width-to-8) ; Because some existing code uses tabs. (add-hook 'emacs-lisp-mode-hook 'ambrevar/turn-on-tab-width-to-8) ; Because some existing code uses tabs.
(add-hook 'emacs-lisp-mode-hook 'ambrevar/turn-off-indent-tabs) ; Should not use tabs. (add-hook 'emacs-lisp-mode-hook 'ambrevar/turn-off-indent-tabs) ; Should not use tabs.

View File

@ -69,26 +69,17 @@ TO-STRING."
Tabify if `indent-tabs-mode' is true, otherwise use spaces. Tabify if `indent-tabs-mode' is true, otherwise use spaces.
Work on buffer or region. Work on buffer or region.
If `ambrevar/prettify-inhibit-p' is non-nil, it does nothing.
Require `ambrevar/tabify-leading'." Require `ambrevar/tabify-leading'."
(interactive) (interactive)
(unless ambrevar/prettify-inhibit-p (let ((start (set-marker (make-marker) (if (use-region-p) (region-beginning) (point-min))))
(let ((start (set-marker (make-marker) (if (use-region-p) (region-beginning) (point-min)))) (end (set-marker (make-marker) (if (use-region-p) (region-end) (point-max)))))
(end (set-marker (make-marker) (if (use-region-p) (region-end) (point-max))))) (if indent-tabs-mode
(if indent-tabs-mode (ambrevar/tabify-leading)
(ambrevar/tabify-leading) (untabify start end))
(untabify start end)) (indent-region start end)
(indent-region start end) (save-restriction
(save-restriction (narrow-to-region start end)
(narrow-to-region start end) (delete-trailing-whitespace))))
(delete-trailing-whitespace)))))
(defcustom ambrevar/prettify-inhibit-p t
"Do not run `ambrevar/prettify' if non-nil.
As this is not friendly to foreign projects, `ambrevar/prettify' should be run
selectively."
:safe 'booleanp)
(defun ambrevar/flyspell-and-whitespace-mode () (defun ambrevar/flyspell-and-whitespace-mode ()
"Toggle `flyspell-mode' and `whitespace-mode'." "Toggle `flyspell-mode' and `whitespace-mode'."