1 files changed, 6 insertions, 15 deletions

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 93286f3..c2c9c0e 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -137,13 +137,6 @@ MODE1 is enabled and vice-versa."
 
 ;;;; Functions
 
-(defun oni:before-save-func ()
-  "Function for `before-save-hook'."
-  (if (eq major-mode 'html-mode)
-      (oni:replace-html-special-chars))
-  (if (not (eq major-mode 'markdown-mode))
-      (delete-trailing-whitespace)))
-
 (defun oni:c-mode-func ()
   "Function for `c-mode-hook'."
   (local-set-key [f9] 'compile))
@@ -429,13 +422,6 @@ use.  If MODE is not nil, open a new buffer with the name
   (interactive)
   (revert-buffer nil t nil))
 
-(defun oni:replace-html-special-chars ()
-  "Replace special characters with HTML escaped entities."
-  (oni:replace-occurrences "é" "é")
-  (oni:replace-occurrences "’" "’")
-  (oni:replace-occurrences "‘" "‘")
-  (oni:replace-occurrences "ë" "ë"))
-
 (defun oni:replace-occurrences (from to)
   "Replace all occurrences of FROM with TO in the current buffer."
   (save-excursion
@@ -1067,7 +1053,12 @@ If no direction is given, don't split."
 (add-hook 'after-save-hook
           'executable-make-buffer-file-executable-if-script-p :append)
 
-(add-hook 'before-save-hook 'oni:before-save-func)
+;; Delete tailing whitespace except in Markdown mode buffers.
+(add-hook 'before-save-hook 'oni:delete-trailing-whitespace-unless-markdown)
+
+;; Replace certain characters with html entities in HTML mode buffers.
+(add-hook 'before-save-hook 'oni:replace-html-special-chars-in-html-mode)
+
 (add-hook 'css-mode-hook #'rainbow-mode)
 (add-hook 'diary-display-hook 'oni:diary-display-func)
 (add-hook 'git-commit-mode-hook #'oni:set-ispell-local-en-dict)