             (define-key nxml-mode-map "\C-c\C-u" 'uncomment-region)
             (use-package auto-complete-nxml)
             ))
-(when (< emacs-major-version 25)
-  (require 'mz-comment-fix)
-  ;; the following is a hack to fix nested XML commenting in Emacs 24.
-  ;; Note that 'comment-strip-start-length also exists for other modes if needed.
+(use-package mz-comment-fix
+  :if (< emacs-major-version 25)
+  :defines comment-strip-start-length
+  :config
   (add-to-list 'comment-strip-start-length (cons 'nxml-mode 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; yaml-mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

;;;;;;;;;;;;;;;;;;;;;;;;;;;; line-comment-banner ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(use-package line-comment-banner
  :bind ([?\C-c?\C-/] . line-comment-banner)
  :init
  (add-hook 'c-mode-common-hook
            (lambda() (make-local-variable 'comment-fill)

  (setq load-path (cons (concat my/plugins-directory "vlf/")
                        load-path)))
(use-package vlf-setup
  :defines (vlf-tune-enabled vlf-batch-size vlf-tune-enabled)
  :init
  ;; for files over 100MB, only open 100MB at a time
  (setq large-file-warning-threshold 100000000) ;100MB
