Skip to content

Commit 1bde244

Browse files
committedMar 12, 2022
Remove autoloads from face and group definitions
Generally only functions and modes should be autoloaded. add-to-list can also be used cautiously to register modes etc. Faces are usually not autoloaded. To make faces, groups and custom variables available for customization, a package must be loaded.
1 parent f13b6db commit 1bde244

15 files changed

+1
-38
lines changed
 

‎ghc-core.el

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
(require 'haskell-mode)
3333
(require 'haskell-font-lock)
3434

35-
;;;###autoload
3635
(defgroup ghc-core nil
3736
"Major mode for viewing pretty printed GHC Core output."
3837
:link '(custom-manual "(haskell-mode)")

‎haskell-cabal.el

-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ OTHER-WINDOW use `find-file-other-window'."
348348
"help"
349349
"run"))
350350

351-
;;;###autoload
352351
(defgroup haskell-cabal nil
353352
"Haskell cabal files"
354353
:group 'haskell

‎haskell-compile.el

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
(require 'ansi-color)
3535
(eval-when-compile (require 'subr-x))
3636

37-
;;;###autoload
3837
(defgroup haskell-compile nil
3938
"Settings for Haskell compilation mode"
4039
:link '(custom-manual "(haskell-mode)compilation")

‎haskell-completions.el

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
(require 'haskell-process)
4141
(require 'haskell-interactive-mode)
4242

43-
;;;###autoload
4443
(defgroup haskell-completions nil
4544
"Settings for completions provided by `haskell-mode'"
4645
:link '(custom-manual "(haskell-mode)Completion support")

‎haskell-customize.el

-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
:type 'boolean
2929
:group 'haskell-interactive)
3030

31-
;;;###autoload
3231
(defgroup haskell nil
3332
"Major mode for editing Haskell programs."
3433
:link '(custom-manual "(haskell-mode)")
@@ -115,7 +114,6 @@ when showing type information about symbols."
115114
(defvar haskell-process-ended-functions (list 'haskell-process-prompt-restart)
116115
"Hook for when the haskell process ends.")
117116

118-
;;;###autoload
119117
(defgroup haskell-interactive nil
120118
"Settings for REPL interaction via `haskell-interactive-mode'"
121119
:link '(custom-manual "(haskell-mode)haskell-interactive-mode")

‎haskell-debug.el

-7
Original file line numberDiff line numberDiff line change
@@ -28,43 +28,36 @@
2828
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2929
;; Configuration
3030

31-
;;;###autoload
3231
(defgroup haskell-debug nil
3332
"Settings for debugging support."
3433
:link '(custom-manual "(haskell-mode)haskell-debug")
3534
:group 'haskell)
3635

37-
;;;###autoload
3836
(defface haskell-debug-warning-face
3937
'((t :inherit 'compilation-warning))
4038
"Face for warnings."
4139
:group 'haskell-debug)
4240

43-
;;;###autoload
4441
(defface haskell-debug-trace-number-face
4542
'((t :weight bold :background "#f5f5f5"))
4643
"Face for numbers in backtrace."
4744
:group 'haskell-debug)
4845

49-
;;;###autoload
5046
(defface haskell-debug-newline-face
5147
'((t :weight bold :background "#f0f0f0"))
5248
"Face for newlines in trace steps."
5349
:group 'haskell-debug)
5450

55-
;;;###autoload
5651
(defface haskell-debug-keybinding-face
5752
'((t :inherit 'font-lock-type-face :weight bold))
5853
"Face for keybindings."
5954
:group 'haskell-debug)
6055

61-
;;;###autoload
6256
(defface haskell-debug-heading-face
6357
'((t :inherit 'font-lock-keyword-face))
6458
"Face for headings."
6559
:group 'haskell-debug)
6660

67-
;;;###autoload
6861
(defface haskell-debug-muted-face
6962
'((t :foreground "#999"))
7063
"Face for muteds."

‎haskell-decl-scan.el

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
(require 'syntax)
108108
(require 'imenu)
109109

110-
;;;###autoload
111110
(defgroup haskell-decl-scan nil
112111
"Haskell declaration scanning (`imenu' support)."
113112
:link '(custom-manual "(haskell-mode)haskell-decl-scan-mode")

‎haskell-doc.el

-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@
308308
(require 'imenu)
309309
(require 'eldoc)
310310

311-
;;;###autoload
312311
(defgroup haskell-doc nil
313312
"Show Haskell function types in echo area."
314313
:group 'haskell

‎haskell-font-lock.el

-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
(require 'haskell-string)
3232
(require 'font-lock)
3333

34-
;;;###autoload
3534
(defgroup haskell-appearance nil
3635
"Haskell Appearance."
3736
:group 'haskell)
@@ -145,19 +144,16 @@ font faces assigned as if respective mode was enabled."
145144
:group 'haskell-appearance
146145
:type '(repeat (cons string symbol)))
147146

148-
;;;###autoload
149147
(defface haskell-keyword-face
150148
'((t :inherit font-lock-keyword-face))
151149
"Face used to highlight Haskell keywords."
152150
:group 'haskell-appearance)
153151

154-
;;;###autoload
155152
(defface haskell-type-face
156153
'((t :inherit font-lock-type-face))
157154
"Face used to highlight Haskell types"
158155
:group 'haskell-appearance)
159156

160-
;;;###autoload
161157
(defface haskell-constructor-face
162158
'((t :inherit font-lock-type-face))
163159
"Face used to highlight Haskell constructors."
@@ -174,25 +170,21 @@ font faces assigned as if respective mode was enabled."
174170
;; This is probably just wrong, but it used to use
175171
;; `font-lock-function-name-face' with a result that was not consistent with
176172
;; other major modes, so I just exchanged with `haskell-definition-face'.
177-
;;;###autoload
178173
(defface haskell-operator-face
179174
'((t :inherit font-lock-variable-name-face))
180175
"Face used to highlight Haskell operators."
181176
:group 'haskell-appearance)
182177

183-
;;;###autoload
184178
(defface haskell-pragma-face
185179
'((t :inherit font-lock-preprocessor-face))
186180
"Face used to highlight Haskell pragmas ({-# ... #-})."
187181
:group 'haskell-appearance)
188182

189-
;;;###autoload
190183
(defface haskell-liquid-haskell-annotation-face
191184
'((t :inherit haskell-pragma-face))
192185
"Face used to highlight LiquidHaskell annotations ({-@ ... @-})."
193186
:group 'haskell-appearance)
194187

195-
;;;###autoload
196188
(defface haskell-literate-comment-face
197189
'((t :inherit font-lock-doc-face))
198190
"Face with which to fontify literate comments.

‎haskell-indent.el

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292

9393
(defvar haskell-literate)
9494

95-
;;;###autoload
9695
(defgroup haskell-indent nil
9796
"Haskell indentation."
9897
:group 'haskell

‎haskell-indentation.el

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
(require 'cl-lib)
4444
(require 'haskell-lexeme)
4545

46-
;;;###autoload
4746
(defgroup haskell-indentation nil
4847
"Haskell indentation."
4948
:link '(custom-manual "(haskell-mode)Indentation")

‎haskell-interactive-mode.el

-7
Original file line numberDiff line numberDiff line change
@@ -123,40 +123,33 @@ be nil.")
123123
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
124124
;; Faces
125125

126-
;;;###autoload
127126
(defface haskell-interactive-face-prompt
128127
'((t :inherit font-lock-function-name-face))
129128
"Face for the prompt."
130129
:group 'haskell-interactive)
131130

132-
;;;###autoload
133131
(defface haskell-interactive-face-prompt-cont
134132
'((t :inherit font-lock-keyword-face))
135133
"Face for GHCi's prompt-cont in multi-line mode."
136134
:group 'haskell-interactive)
137135

138-
;;;###autoload
139136
(define-obsolete-face-alias 'haskell-interactive-face-prompt2 'haskell-interactive-face-prompt-cont "16.2")
140137

141-
;;;###autoload
142138
(defface haskell-interactive-face-compile-error
143139
'((t :inherit compilation-error))
144140
"Face for compile errors."
145141
:group 'haskell-interactive)
146142

147-
;;;###autoload
148143
(defface haskell-interactive-face-compile-warning
149144
'((t :inherit compilation-warning))
150145
"Face for compiler warnings."
151146
:group 'haskell-interactive)
152147

153-
;;;###autoload
154148
(defface haskell-interactive-face-result
155149
'((t :inherit font-lock-string-face))
156150
"Face for the result."
157151
:group 'haskell-interactive)
158152

159-
;;;###autoload
160153
(defface haskell-interactive-face-garbage
161154
'((t :inherit font-lock-string-face))
162155
"Face for trailing garbage after a command has completed."

‎haskell-load.el

+1-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ actual Emacs buffer of the module being loaded."
130130
process
131131
"Failed, modules loaded: \\(.+\\)\\.$")
132132
nil)
133-
((haskell-process-consume
133+
((haskell-process-consume
134134
process
135135
"Failed, no modules loaded\\.$") ;; for ghc 8.4
136136
nil)
@@ -336,7 +336,6 @@ list of modules where missed IDENT was found."
336336
(modules (and modules-string (split-string modules-string ", "))))
337337
(cons modules modules-string)))
338338

339-
;;;###autoload
340339
(defface haskell-error-face
341340
'((((supports :underline (:style wave)))
342341
:underline (:style wave :color "#dc322f"))
@@ -345,7 +344,6 @@ list of modules where missed IDENT was found."
345344
"Face used for marking error lines."
346345
:group 'haskell-mode)
347346

348-
;;;###autoload
349347
(defface haskell-warning-face
350348
'((((supports :underline (:style wave)))
351349
:underline (:style wave :color "#b58900"))
@@ -354,7 +352,6 @@ list of modules where missed IDENT was found."
354352
"Face used for marking warning lines."
355353
:group 'haskell-mode)
356354

357-
;;;###autoload
358355
(defface haskell-hole-face
359356
'((((supports :underline (:style wave)))
360357
:underline (:style wave :color "#6c71c4"))

‎inf-haskell.el

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
(require 'cl-lib)
4141
(require 'haskell-string)
4242

43-
;;;###autoload
4443
(defgroup inferior-haskell nil
4544
"Settings for REPL interaction via `inferior-haskell-mode'"
4645
:link '(custom-manual "(haskell-mode)inferior-haskell-mode")

‎w3m-haddock.el

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
(add-hook 'w3m-display-hook 'w3m-haddock-display)
3737

38-
;;;###autoload
3938
(defface w3m-haddock-heading-face
4039
'((((class color)) :inherit highlight))
4140
"Face for quarantines."

0 commit comments

Comments
 (0)
Please sign in to comment.