Skip to content

Commit 387a891

Browse files
committed
Remove old rusty emacs21 stuff.
1 parent 2b90202 commit 387a891

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

haskell-font-lock.el

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@ Inherit from `default' to avoid fontification of them."
217217
(defvar haskell-default-face 'haskell-default-face)
218218
(defvar haskell-literate-comment-face 'haskell-literate-comment-face)
219219

220-
(defconst haskell-emacs21-features (string-match "[[:alpha:]]" "x")
221-
"Non-nil if we have regexp char classes.
222-
Assume this means we have other useful features from Emacs 21.")
223-
224220
(defun haskell-font-lock-compose-symbol (alist)
225221
"Compose a sequence of ascii chars into a symbol.
226222
Regexp match data 0 points to the chars."
@@ -379,15 +375,7 @@ Returns keywords suitable for `font-lock-keywords'."
379375
("^=======" 0 'font-lock-warning-face t)
380376
("^>>>>>>> .*$" 0 'font-lock-warning-face t)
381377
("^#.*$" 0 'font-lock-preprocessor-face t)
382-
,@(unless haskell-emacs21-features ;Supports nested comments?
383-
;; Expensive.
384-
`((,string-and-char 1 font-lock-string-face)))
385-
386-
;; This was originally at the very end (and needs to be after
387-
;; all the comment/string/doc highlighting) but it seemed to
388-
;; trigger a bug in Emacs-21.3 which caused the compositions to
389-
;; be "randomly" dropped. Moving it earlier seemed to reduce
390-
;; the occurrence of the bug.
378+
391379
,@(haskell-font-lock-symbols-keywords)
392380

393381
(,reservedid 1 haskell-keyword-face)
@@ -457,8 +445,6 @@ Returns keywords suitable for `font-lock-keywords'."
457445
,@keywords)))))
458446
keywords))
459447

460-
;; The next three aren't used in Emacs 21.
461-
462448
(defvar haskell-fl-latex-cache-pos nil
463449
"Position of cache point used by `haskell-fl-latex-cache-in-comment'.
464450
Should be at the start of a line.")

0 commit comments

Comments
 (0)