From f71cdd0709fc7c78a624996416cb56e7d331f14f Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Sat, 2 Nov 2019 16:51:57 +0100
Subject: [PATCH] Emacs: Remove unused prettify-inhibit-p guard.

---
 .emacs.d/.dir-locals.el    |  1 -
 .emacs.d/init.el           |  1 -
 .emacs.d/lisp/functions.el | 27 +++++++++------------------
 3 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 .emacs.d/.dir-locals.el

diff --git a/.emacs.d/.dir-locals.el b/.emacs.d/.dir-locals.el
deleted file mode 100644
index 4ddd5c36..00000000
--- a/.emacs.d/.dir-locals.el
+++ /dev/null
@@ -1 +0,0 @@
-((nil . ((ambrevar/prettify-inhibit-p . nil))))
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index d5cb63ef..aa54920d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -192,7 +192,6 @@
 (with-eval-after-load 'racket-mode (require 'init-racket))
 (setq geiser-repl-history-filename (expand-file-name "geiser_history" user-emacs-directory))
 ;; 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-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.
diff --git a/.emacs.d/lisp/functions.el b/.emacs.d/lisp/functions.el
index f0ce81dc..87494499 100644
--- a/.emacs.d/lisp/functions.el
+++ b/.emacs.d/lisp/functions.el
@@ -69,26 +69,17 @@ TO-STRING."
 Tabify if `indent-tabs-mode' is true, otherwise use spaces.
 Work on buffer or region.
 
-If `ambrevar/prettify-inhibit-p' is non-nil, it does nothing.
-
 Require `ambrevar/tabify-leading'."
   (interactive)
-  (unless ambrevar/prettify-inhibit-p
-    (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)))))
-      (if indent-tabs-mode
-          (ambrevar/tabify-leading)
-        (untabify start end))
-      (indent-region start end)
-      (save-restriction
-        (narrow-to-region start end)
-        (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)
+  (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)))))
+    (if indent-tabs-mode
+        (ambrevar/tabify-leading)
+      (untabify start end))
+    (indent-region start end)
+    (save-restriction
+      (narrow-to-region start end)
+      (delete-trailing-whitespace))))
 
 (defun ambrevar/flyspell-and-whitespace-mode ()
   "Toggle `flyspell-mode' and `whitespace-mode'."