]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix when calling prettify-symbols-mode more than once
authorLars Ingebrigtsen <larsi@gnus.org>
Sun, 28 Jul 2019 20:14:30 +0000 (22:14 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Sun, 28 Jul 2019 20:14:36 +0000 (22:14 +0200)
* lisp/progmodes/prog-mode.el (prettify-symbols-mode): Allow
calling this mode several times without the earlier symbol alist
shadowing the newer (bug#23255).

lisp/progmodes/prog-mode.el

index 2b057356b1048c674b8ec227816e8e9696fcc4a7..79fe56aebbf3f2fb2dbf553b156218fe5290b2c8 100644 (file)
@@ -211,6 +211,9 @@ You can enable this mode locally in desired buffers, or use
 `global-prettify-symbols-mode' to enable it for all modes that
 support it."
   :init-value nil
+  (when prettify-symbols--keywords
+    (font-lock-remove-keywords nil prettify-symbols--keywords)
+    (setq prettify-symbols--keywords nil))
   (if prettify-symbols-mode
       ;; Turn on
       (when (setq prettify-symbols--keywords (prettify-symbols--make-keywords))
@@ -226,9 +229,6 @@ support it."
         (font-lock-flush))
     ;; Turn off
     (remove-hook 'post-command-hook #'prettify-symbols--post-command-hook t)
-    (when prettify-symbols--keywords
-      (font-lock-remove-keywords nil prettify-symbols--keywords)
-      (setq prettify-symbols--keywords nil))
     (when (memq 'composition font-lock-extra-managed-props)
       (setq font-lock-extra-managed-props (delq 'composition
                                                 font-lock-extra-managed-props))