Merge pull request #770 from ar1a/highlight-numbers

Highlight-numbers on every prog-mode

core/core-ui.el

@@ -234,6 +234,10 @@ DEFAULT is non-nil, set the default mode-line for all buffers."
 (add-hook 'completion-list-mode-hook #'hide-mode-line-mode)
 (add-hook 'Man-mode-hook #'hide-mode-line-mode)
 
+;; `highlight-numbers-mode' -- better number literal fontification in code
+(setq highlight-numbers-generic-regexp "\\_<[[:digit:]]+.*\\_>")
+(add-hook 'prog-mode-hook #'highlight-numbers-mode)
+
 ;; `rainbow-delimiters' Helps us distinguish stacked delimiter pairs. Especially
 ;; in parentheses-drunk languages like Lisp.
 (def-package! rainbow-delimiters

modules/lang/cc/config.el

@@ -79,8 +79,7 @@ compilation database is present in the project.")
   ;;; Better fontification (also see `modern-cpp-font-lock')
   (add-hook 'c-mode-common-hook #'rainbow-delimiters-mode)
   (add-hook! '(c-mode-hook c++-mode-hook)
-    #'(highlight-numbers-mode
+    #'(+cc|fontify-constants))
-       +cc|fontify-constants))
 
   ;; Custom style, based off of linux
   (unless (assoc "doom" c-style-alist)

modules/lang/emacs-lisp/config.el

@@ -45,7 +45,7 @@
     #'(;; 3rd-party functionality
        auto-compile-on-save-mode doom|enable-delete-trailing-whitespace
        ;; fontification
-       rainbow-delimiters-mode highlight-quoted-mode highlight-numbers-mode +emacs-lisp|extra-fontification
+       rainbow-delimiters-mode highlight-quoted-mode +emacs-lisp|extra-fontification
        ;; initialization
        +emacs-lisp|init-imenu +emacs-lisp|disable-flycheck-maybe))
 

modules/lang/python/config.el

@@ -22,8 +22,6 @@ is loaded.")
         python-indent-guess-indent-offset-verbose nil
         python-shell-interpreter "python")
   :config
-  (add-hook 'python-mode-hook #'highlight-numbers-mode)
-
   (set-env! "PYTHONPATH" "PYENV_ROOT")
   (set-electric! 'python-mode :chars '(?:))
   (set-repl-handler! 'python-mode #'+python/repl)

modules/lang/sh/config.el

@@ -15,7 +15,6 @@
   :mode ("\\.zunit\\'" . sh-mode)
   :mode ("/bspwmrc\\'" . sh-mode)
   :config
-  (add-hook 'sh-mode-hook #'highlight-numbers-mode)
   (set-electric! 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
   (set-repl-handler! 'sh-mode #'+sh/repl)
 

modules/lang/web/+css.el

@@ -17,7 +17,6 @@
 (add-hook! (css-mode sass-mode stylus-mode)
   #'(yas-minor-mode-on
      flycheck-mode
-     highlight-numbers-mode
      rainbow-mode))