From f0affb46b857c62d30de31a678d36e56831b775d Mon Sep 17 00:00:00 2001
From: Gracjan Polak <gracjanpolak@gmail.com>
Date: Sun, 3 Jan 2016 17:52:14 +0100
Subject: [PATCH] Defcustoms should not be autoloaded

According to

https://lists.gnu.org/archive/html/help-gnu-emacs/2007-06/msg00216.html

and

http://comments.gmane.org/gmane.emacs.devel/176796

defcustom cannot be autoloaded because then values get lost.
---
 ghc-core.el                |  2 --
 haskell-align-imports.el   |  1 -
 haskell-cabal.el           |  1 -
 haskell-checkers.el        |  7 -------
 haskell-compile.el         |  4 ----
 haskell-complete-module.el |  2 --
 haskell-customize.el       | 42 --------------------------------------
 haskell-decl-scan.el       |  2 --
 haskell-doc.el             |  7 -------
 haskell-font-lock.el       |  3 ---
 haskell-hoogle.el          |  3 ---
 haskell-indent.el          |  7 -------
 haskell-indentation.el     |  7 -------
 haskell-menu.el            |  1 -
 haskell-mode.el            |  5 -----
 inf-haskell.el             |  8 --------
 w3m-haddock.el             |  1 -
 17 files changed, 103 deletions(-)

diff --git a/ghc-core.el b/ghc-core.el
index 6dbbe0167..34ee781e1 100644
--- a/ghc-core.el
+++ b/ghc-core.el
@@ -39,14 +39,12 @@
   :group 'haskell
   :prefix "ghc-core-")
 
-;;;###autoload
 (defcustom ghc-core-program
   "ghc"
   "Name of the GHC executable (excluding any arguments)."
   :type 'string
   :group 'ghc-core)
 
-;;;###autoload
 (defcustom ghc-core-program-args
   '("-O2")
   "Additional options to be passed to GHC when generating core output.
diff --git a/haskell-align-imports.el b/haskell-align-imports.el
index f688631a8..694ee2592 100644
--- a/haskell-align-imports.el
+++ b/haskell-align-imports.el
@@ -108,7 +108,6 @@
           "\\( -- .*\\)?[ ]*$")
   "Regex used for matching components of an import.")
 
-;;;###autoload
 (defcustom haskell-align-imports-pad-after-name
   nil
   "Pad layout after the module name also."
diff --git a/haskell-cabal.el b/haskell-cabal.el
index 076ba4a0f..cd0957ac1 100644
--- a/haskell-cabal.el
+++ b/haskell-cabal.el
@@ -309,7 +309,6 @@ OTHER-WINDOW use `find-file-other-window'."
   :group 'haskell
 )
 
-;;;###autoload
 (defcustom haskell-cabal-list-comma-position
   'before
   "Where to put the comma in lists"
diff --git a/haskell-checkers.el b/haskell-checkers.el
index edf403ab7..46de6090c 100644
--- a/haskell-checkers.el
+++ b/haskell-checkers.el
@@ -32,43 +32,36 @@
   "Run HLint as inferior of Emacs, parse error messages."
   :group 'haskell)
 
-;;;###autoload
 (defcustom haskell-lint-command "hlint"
   "The default lint command for \\[hlint]."
   :type 'string
   :group 'haskell-checkers)
 
-;;;###autoload
 (defcustom haskell-scan-command "scan"
   "The default scan command for \\[haskell-scan]."
   :type 'string
   :group 'haskell-checkers)
 
-;;;###autoload
 (defcustom haskell-scan-options ""
   "The default options for \\[haskell-scan]."
   :type 'string
   :group 'haskell-checkers)
 
-;;;###autoload
 (defcustom haskell-lint-options ""
   "The default options for \\[hlint]."
   :type 'string
   :group 'haskell-checkers)
 
-;;;###autoload
 (defcustom haskell-checkers-save-files t
   "Save modified files when run checker or not (ask user)"
   :type 'boolean
   :group 'haskell-checkers)
 
-;;;###autoload
 (defcustom haskell-checkers-replace-with-suggestions nil
   "Replace user's code with suggested replacements (hlint only)"
   :type 'boolean
   :group 'haskell-checkers)
 
-;;;###autoload
 (defcustom haskell-checkers-replace-without-ask nil
   "Replace user's code with suggested replacements automatically (hlint only)"
   :type 'boolean
diff --git a/haskell-compile.el b/haskell-compile.el
index 045c81e99..5d8c7b49f 100644
--- a/haskell-compile.el
+++ b/haskell-compile.el
@@ -35,7 +35,6 @@
   :link '(custom-manual "(haskell-mode)compilation")
   :group 'haskell)
 
-;;;###autoload
 (defcustom haskell-compile-cabal-build-command
   "cd %s && cabal build --ghc-option=-ferror-spans"
   "Default build command to use for `haskell-cabal-build' when a cabal file is detected.
@@ -43,7 +42,6 @@ The `%s' placeholder is replaced by the cabal package top folder."
   :group 'haskell-compile
   :type 'string)
 
-;;;###autoload
 (defcustom haskell-compile-cabal-build-alt-command
   "cd %s && cabal clean -s && cabal build --ghc-option=-ferror-spans"
   "Alternative build command to use when `haskell-cabal-build' is called with a negative prefix argument.
@@ -51,7 +49,6 @@ The `%s' placeholder is replaced by the cabal package top folder."
   :group 'haskell-compile
   :type 'string)
 
-;;;###autoload
 (defcustom haskell-compile-command
   "ghc -Wall -ferror-spans -fforce-recomp -c %s"
   "Default build command to use for `haskell-cabal-build' when no cabal file is detected.
@@ -59,7 +56,6 @@ The `%s' placeholder is replaced by the current buffer's filename."
   :group 'haskell-compile
   :type 'string)
 
-;;;###autoload
 (defcustom haskell-compile-ghc-filter-linker-messages
   t
   "Filter out unremarkable \"Loading package...\" linker messages during compilation."
diff --git a/haskell-complete-module.el b/haskell-complete-module.el
index 7c5892b47..ce165348f 100644
--- a/haskell-complete-module.el
+++ b/haskell-complete-module.el
@@ -19,14 +19,12 @@
 
 (require 'cl-lib)
 
-;;;###autoload
 (defcustom haskell-complete-module-preferred
   '()
   "Override ordering of module results by specifying preferred modules."
   :group 'haskell
   :type '(repeat string))
 
-;;;###autoload
 (defcustom haskell-complete-module-max-display
   10
   "Maximum items to display in minibuffer."
diff --git a/haskell-customize.el b/haskell-customize.el
index c28690395..b9c2efc70 100644
--- a/haskell-customize.el
+++ b/haskell-customize.el
@@ -22,7 +22,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Customization variables
 
-;;;###autoload
 (defcustom haskell-process-load-or-reload-prompt nil
   "Nil means there will be no prompts on starting REPL. Defaults will be accepted."
   :type 'boolean
@@ -39,7 +38,6 @@
   "Package base directory of installed `haskell-mode'.
 Used for locating additional package data files.")
 
-;;;###autoload
 (defcustom haskell-completing-read-function 'ido-completing-read
   "Default function to use for completion."
   :group 'haskell
@@ -49,7 +47,6 @@ Used for locating additional package data files.")
           (function-item :tag "completing-read" :value completing-read)
           (function :tag "Custom function")))
 
-;;;###autoload
 (defcustom haskell-process-type
   'auto
   "The inferior Haskell process type to use.
@@ -70,7 +67,6 @@ If none of the above apply, ghci will be used."
   :type '(choice (const auto) (const ghci) (const cabal-repl) (const stack-ghci))
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-wrapper-function
   #'identity
   "Wrap or transform haskell process commands using this function.
@@ -91,7 +87,6 @@ a per-project basis."
           (function-item :tag "None" :value identity)
           (function :tag "Custom function")))
 
-;;;###autoload
 (defcustom haskell-ask-also-kill-buffers
   t
   "Ask whether to kill all associated buffers when a session
@@ -102,7 +97,6 @@ a per-project basis."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Configuration
 
-;;;###autoload
 (defcustom haskell-doc-prettify-types t
   "Replace some parts of types with Unicode characters like \"∷\"
 when showing type information about symbols."
@@ -119,35 +113,30 @@ when showing type information about symbols."
   :link '(custom-manual "(haskell-mode)haskell-interactive-mode")
   :group 'haskell)
 
-;;;###autoload
 (defcustom haskell-process-path-ghci
   "ghci"
   "The path for starting ghci."
   :group 'haskell-interactive
   :type '(choice string (repeat string)))
 
-;;;###autoload
 (defcustom haskell-process-path-cabal
   "cabal"
   "Path to the `cabal' executable."
   :group 'haskell-interactive
   :type '(choice string (repeat string)))
 
-;;;###autoload
 (defcustom haskell-process-path-stack
   "stack"
   "The path for starting stack."
   :group 'haskell-interactive
   :type '(choice string (repeat string)))
 
-;;;###autoload
 (defcustom haskell-process-args-ghci
   '("-ferror-spans")
   "Any arguments for starting ghci."
   :group 'haskell-interactive
   :type '(repeat (string :tag "Argument")))
 
-;;;###autoload
 (defcustom haskell-process-args-cabal-repl
   '("--ghc-option=-ferror-spans")
   "Additional arguments for `cabal repl' invocation.
@@ -160,14 +149,12 @@ pass additional flags to `ghc'."
   :group 'haskell-interactive
   :type '(repeat (string :tag "Argument")))
 
-;;;###autoload
 (defcustom haskell-process-args-stack-ghci
   '("--ghc-options=-ferror-spans")
   "Additional arguments for `stack ghci' invocation."
   :group 'haskell-interactive
   :type '(repeat (string :tag "Argument")))
 
-;;;###autoload
 (defcustom haskell-process-do-cabal-format-string
   ":!cd %s && %s"
   "The way to run cabal comands. It takes two arguments -- the directory and the command.
@@ -175,63 +162,54 @@ See `haskell-process-do-cabal' for more details."
   :group 'haskell-interactive
   :type 'string)
 
-;;;###autoload
 (defcustom haskell-process-log
   nil
   "Enable debug logging to \"*haskell-process-log*\" buffer."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-show-debug-tips
   t
   "Show debugging tips when starting the process."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-notify-p
   nil
   "Notify using notifications.el (if loaded)?"
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-no-warn-orphans
   t
   "Suggest adding -fno-warn-orphans pragma to file when getting orphan warnings."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-hoogle-imports
   nil
   "Suggest to add import statements using Hoogle as a backend."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-hayoo-imports
   nil
   "Suggest to add import statements using Hayoo as a backend."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-hayoo-query-url
   "http://hayoo.fh-wedel.de/json/?query=%s"
   "Query url for json hayoo results."
   :type 'string
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-haskell-docs-imports
   nil
   "Suggest to add import statements using haskell-docs as a backend."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-add-package
   t
   "Suggest to add packages to your .cabal file when Cabal says it
@@ -239,28 +217,24 @@ is a member of the hidden package, blah blah."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-language-pragmas
   t
   "Suggest adding LANGUAGE pragmas recommended by GHC."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-remove-import-lines
   nil
   "Suggest removing import lines as warned by GHC."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-overloaded-strings
   t
   "Suggest adding OverloadedStrings pragma to file when getting type mismatches with [Char]."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-check-cabal-config-on-load
   t
   "Check changes cabal config on loading Haskell files and
@@ -268,7 +242,6 @@ restart the GHCi process if changed.."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-prompt-restart-on-cabal-change
   t
   "Ask whether to restart the GHCi process when the Cabal file
@@ -276,14 +249,12 @@ has changed?"
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-auto-import-loaded-modules
   nil
   "Auto import the modules reported by GHC to have been loaded?"
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-reload-with-fbytecode
   nil
   "When using -fobject-code, auto reload with -fbyte-code (and
@@ -292,7 +263,6 @@ imports become available?"
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-use-presentation-mode
   nil
   "Use presentation mode to show things like type info instead of
@@ -300,35 +270,30 @@ imports become available?"
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-process-suggest-restart
   t
   "Suggest restarting the process when it has died"
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-interactive-mode-scroll-to-bottom
   nil
   "Scroll to bottom in the REPL always."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-interactive-popup-errors
   t
   "Popup errors in a separate buffer."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-interactive-mode-collapse
   nil
   "Collapse printed results."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-interactive-types-for-show-ambiguous
   t
   "Show types when there's no Show instance or there's an
@@ -339,28 +304,24 @@ ambiguous class constraint."
 (defvar haskell-interactive-prompt "λ> "
   "The prompt to use.")
 
-;;;###autoload
 (defcustom haskell-interactive-mode-eval-mode
   nil
   "Use the given mode's font-locking to render some text."
   :type '(choice function (const :tag "None" nil))
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-interactive-mode-hide-multi-line-errors
   nil
   "Hide collapsible multi-line compile messages by default."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-interactive-mode-delete-superseded-errors
   t
   "Whether to delete compile messages superseded by recompile/reloads."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-interactive-mode-include-file-name
   t
   "Include the file name of the module being compiled when
@@ -368,7 +329,6 @@ printing compilation messages."
   :type 'boolean
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-import-mapping
   '()
   "Support a mapping from module to import lines.
@@ -389,7 +349,6 @@ when Data.Map is the candidate.
                        (string :tag "Import lines")))
   :group 'haskell-interactive)
 
-;;;###autoload
 (defcustom haskell-language-extensions
   '()
   "Language extensions in use. Should be in format: -XFoo,
@@ -404,7 +363,6 @@ same vein as `haskell-indent-spaces'."
   :group 'haskell
   :type '(repeat 'string))
 
-;;;###autoload
 (defcustom haskell-stylish-on-save nil
   "Whether to run stylish-haskell on the buffer before saving.
 If this is true, `haskell-add-import' will not sort or align the
diff --git a/haskell-decl-scan.el b/haskell-decl-scan.el
index 57c3faaec..e2eaa1302 100644
--- a/haskell-decl-scan.el
+++ b/haskell-decl-scan.el
@@ -112,13 +112,11 @@
   :group 'haskell
   :prefix "haskell-decl-scan-")
 
-;;;###autoload
 (defcustom haskell-decl-scan-bindings-as-variables nil
   "Whether to put top-level value bindings into a \"Variables\" category."
   :group 'haskell-decl-scan
   :type 'boolean)
 
-;;;###autoload
 (defcustom haskell-decl-scan-add-to-menubar t
   "Whether to add a \"Declarations\" menu entry to menu bar."
   :group 'haskell-decl-scan
diff --git a/haskell-doc.el b/haskell-doc.el
index 1ef212d98..3f1150124 100644
--- a/haskell-doc.el
+++ b/haskell-doc.el
@@ -355,7 +355,6 @@ The function `haskell-doc-make-global-fct-index' rebuilds this variables
 This variable is buffer-local.")
 (make-variable-buffer-local 'haskell-doc-index)
 
-;;;###autoload
 (defcustom haskell-doc-show-global-types nil
   "If non-nil, search for the types of global functions by loading the files.
 This variable is buffer-local."
@@ -363,7 +362,6 @@ This variable is buffer-local."
   :type 'boolean)
 (make-variable-buffer-local 'haskell-doc-show-global-types)
 
-;;;###autoload
 (defcustom haskell-doc-show-reserved t
   "If non-nil, show a documentation string for reserved ids.
 This variable is buffer-local."
@@ -371,7 +369,6 @@ This variable is buffer-local."
   :type 'boolean)
 (make-variable-buffer-local 'haskell-doc-show-reserved)
 
-;;;###autoload
 (defcustom haskell-doc-show-prelude t
   "If non-nil, show a documentation string for prelude functions.
 This variable is buffer-local."
@@ -379,7 +376,6 @@ This variable is buffer-local."
   :type 'boolean)
 (make-variable-buffer-local 'haskell-doc-show-prelude)
 
-;;;###autoload
 (defcustom haskell-doc-show-strategy t
   "If non-nil, show a documentation string for strategies.
 This variable is buffer-local."
@@ -387,7 +383,6 @@ This variable is buffer-local."
   :type 'boolean)
 (make-variable-buffer-local 'haskell-doc-show-strategy)
 
-;;;###autoload
 (defcustom haskell-doc-show-user-defined t
   "If non-nil, show a documentation string for user defined ids.
 This variable is buffer-local."
@@ -395,13 +390,11 @@ This variable is buffer-local."
   :type 'boolean)
 (make-variable-buffer-local 'haskell-doc-show-user-defined)
 
-;;;###autoload
 (defcustom haskell-doc-chop-off-context t
   "If non-nil eliminate the context part in a Haskell type."
   :group 'haskell-doc
   :type 'boolean)
 
-;;;###autoload
 (defcustom haskell-doc-chop-off-fctname nil
   "If non-nil omit the function name and show only the type."
   :group 'haskell-doc
diff --git a/haskell-font-lock.el b/haskell-font-lock.el
index 17ce008ba..976273819 100644
--- a/haskell-font-lock.el
+++ b/haskell-font-lock.el
@@ -30,7 +30,6 @@
 (require 'haskell-mode)
 (require 'font-lock)
 
-;;;###autoload
 (defcustom haskell-font-lock-symbols nil
   "Display \\ and -> and such using symbols in fonts.
 
@@ -39,7 +38,6 @@ alignment and can thus lead to nasty surprises with regards to layout."
   :group 'haskell
   :type 'boolean)
 
-;;;###autoload
 (defcustom haskell-font-lock-symbols-alist
   '(("\\" . "λ")
     ("not" . "¬")
@@ -92,7 +90,6 @@ This is the case if the \".\" is part of a \"forall <tvar> . <type>\"."
               (string= " " (string (char-after start)))
               (string= " " (string (char-before start))))))))
 
-;;;###autoload
 (defcustom haskell-font-lock-quasi-quote-modes
   `(("hsx" . xml-mode)
     ("hamlet" . xml-mode)
diff --git a/haskell-hoogle.el b/haskell-hoogle.el
index 42be5626e..e591f4c6b 100644
--- a/haskell-hoogle.el
+++ b/haskell-hoogle.el
@@ -29,7 +29,6 @@
 (require 'haskell-mode)
 
 
-;;;###autoload
 (defcustom haskell-hoogle-command
   (if (executable-find "hoogle") "hoogle")
   "Name of the command to use to query Hoogle.
@@ -38,7 +37,6 @@ If nil, use the Hoogle web-site."
   :type '(choice (const :tag "Use Web-site" nil)
                  string))
 
-;;;###autoload
 (defcustom haskell-hoogle-url "http://haskell.org/hoogle/?q=%s"
   "Default value for hoogle web site."
   :group 'haskell
@@ -120,7 +118,6 @@ is asked to show extra info for the items matching QUERY.."
 
 
 
-;;;###autoload
 (defcustom haskell-hayoo-url "http://hayoo.fh-wedel.de/?query=%s"
   "Default value for hayoo web site."
   :group 'haskell
diff --git a/haskell-indent.el b/haskell-indent.el
index a10885c93..7d3b9a157 100644
--- a/haskell-indent.el
+++ b/haskell-indent.el
@@ -99,21 +99,18 @@
   :link '(custom-manual "(haskell-mode)Indentation")
   :prefix "haskell-indent-")
 
-;;;###autoload
 (defcustom haskell-indent-offset 4
   "Indentation of Haskell statements with respect to containing block."
   :type 'integer
   :safe #'natnump
   :group 'haskell-indent)
 
-;;;###autoload
 (defcustom haskell-indent-literate-Bird-default-offset 1
   "Default number of blanks after > in a Bird style literate script."
   :type 'integer
   :safe #'natnump
   :group 'haskell-indent)
 
-;;;###autoload
 (defcustom haskell-indent-rhs-align-column 0
   "Column on which to align right-hand sides (use 0 for ad-hoc alignment)."
   :type 'integer
@@ -326,7 +323,6 @@ It deals with both Bird style and non Bird-style scripts."
         (insert "\\begin{code}\n")))))
 
 ;;; Start of indentation code
-;;;###autoload
 (defcustom haskell-indent-look-past-empty-line t
   "If nil, indentation engine will not look past an empty line for layout points."
   :group 'haskell-indent
@@ -1022,7 +1018,6 @@ OPEN is the start position of the comment in which point is."
                             (haskell-indent-point-to-col (match-end 0)))
                         (haskell-indent-point-to-col (point))))))))))
 
-;;;###autoload
 (defcustom haskell-indent-thenelse 0
   "If non-nil, \"then\" and \"else\" are indented.
 This is necessary in the \"do\" layout under Haskell-98.
@@ -1054,7 +1049,6 @@ See http://hackage.haskell.org/trac/haskell-prime/wiki/DoAndIfThenElse"
     (list (list (+ (if (memq (char-after) '(?t ?e)) haskell-indent-thenelse 0)
                    (haskell-indent-point-to-col open))))))
 
-;;;###autoload
 (defcustom haskell-indent-after-keywords
   '(("where" 2 0)
     ("of" 2)
@@ -1103,7 +1097,6 @@ is at the end of an otherwise-non-empty line."
     (or (assoc id haskell-indent-after-keywords)
         (car (member id haskell-indent-after-keywords)))))
 
-;;;###autoload
 (defcustom haskell-indent-dont-hang '("(")
   "Lexemes that should never be considered as hanging."
   :group 'haskell-indent
diff --git a/haskell-indentation.el b/haskell-indentation.el
index 91888a551..b07167159 100644
--- a/haskell-indentation.el
+++ b/haskell-indentation.el
@@ -49,7 +49,6 @@
   :group 'haskell
   :prefix "haskell-indentation-")
 
-;;;###autoload
 (defcustom haskell-indentation-indent-leftmost t
   "Indent to the left margin after certain keywords.
 For example after \"let .. in\", \"case .. of\").  If set to t it
@@ -59,37 +58,31 @@ positions are allowed."
   :type 'symbol
   :group 'haskell-indentation)
 
-;;;###autoload
 (defcustom haskell-indentation-layout-offset 2
   "Extra indentation to add before expressions in a Haskell layout list."
   :type 'integer
   :group 'haskell-indentation)
 
-;;;###autoload
 (defcustom haskell-indentation-starter-offset 2
   "Extra indentation after an opening keyword (e.g. \"let\")."
   :type 'integer
   :group 'haskell-indentation)
 
-;;;###autoload
 (defcustom haskell-indentation-left-offset 2
   "Extra indentation after an indentation to the left (e.g. after \"do\")."
   :type 'integer
   :group 'haskell-indentation)
 
-;;;###autoload
 (defcustom  haskell-indentation-ifte-offset 2
   "Extra indentation after the keywords \"if\", \"then\", or \"else\"."
   :type 'integer
   :group 'haskell-indentation)
 
-;;;###autoload
 (defcustom haskell-indentation-where-pre-offset 2
   "Extra indentation before the keyword \"where\"."
   :type 'integer
   :group 'haskell-indentation)
 
-;;;###autoload
 (defcustom haskell-indentation-where-post-offset 2
   "Extra indentation after the keyword \"where\"."
   :type 'integer
diff --git a/haskell-menu.el b/haskell-menu.el
index e565b33b7..b57f604f7 100644
--- a/haskell-menu.el
+++ b/haskell-menu.el
@@ -33,7 +33,6 @@
 (require 'haskell-process)
 (require 'haskell-interactive-mode)
 
-;;;###autoload
 (defcustom haskell-menu-buffer-name "*haskell-menu*"
   "The name of the Haskell session menu buffer"
   :group 'haskell-interactive
diff --git a/haskell-mode.el b/haskell-mode.el
index a1925074c..8ba68728a 100644
--- a/haskell-mode.el
+++ b/haskell-mode.el
@@ -183,7 +183,6 @@ of `haskell-literate-default' is used.")
 (make-variable-buffer-local 'haskell-literate)
 (put 'haskell-literate 'safe-local-variable 'symbolp)
 ;; Default literate style for ambiguous literate buffers.
-;;;###autoload
 (defcustom haskell-literate-default 'bird
   "Default value for `haskell-literate'.
 Used if the style of a literate buffer is ambiguous.  This variable should
@@ -561,7 +560,6 @@ May return a qualified name."
     (delete-indentation arg)))
 
 ;; Various mode variables.
-;;;###autoload
 (defcustom haskell-mode-contextual-import-completion
   t
   "Enable import completion on haskell-mode-contextual-space."
@@ -809,7 +807,6 @@ Note that negative arguments do not work so well."
 (add-to-list 'completion-ignored-extensions ".hi")
 
 
-;;;###autoload
 (defcustom haskell-check-command "hlint"
   "*Command used to check a Haskell file."
   :group 'haskell
@@ -817,7 +814,6 @@ Note that negative arguments do not work so well."
                  (const "ghc -fno-code")
                  (string :tag "Other command")))
 
-;;;###autoload
 (defcustom haskell-tags-on-save nil
   "Generate tags via hasktags after saving."
   :group 'haskell
@@ -826,7 +822,6 @@ Note that negative arguments do not work so well."
 (defvar haskell-saved-check-command nil
   "Internal use.")
 
-;;;###autoload
 (defcustom haskell-indent-spaces 2
   "Number of spaces to indent inwards."
   :group 'haskell)
diff --git a/inf-haskell.el b/inf-haskell.el
index d5fad6c4a..3fb96a4b2 100644
--- a/inf-haskell.el
+++ b/inf-haskell.el
@@ -52,7 +52,6 @@
 
 ;; Here I depart from the inferior-haskell- prefix.
 ;; Not sure if it's a good idea.
-;;;###autoload
 (defcustom haskell-program-name
   ;; Arbitrarily give preference to hugs over ghci.
   (or (cond
@@ -111,7 +110,6 @@ The command can include arguments."
   "Regexps for error messages generated by inferior Haskell processes.
 The format should be the same as for `compilation-error-regexp-alist'.")
 
-;;;###autoload
 (defcustom inferior-haskell-find-project-root t
   "If non-nil, try and find the project root directory of this file.
 This will either look for a Cabal file or a \"module\" statement in the file."
@@ -207,7 +205,6 @@ setting up the inferior-haskell buffer."
   (let ((proc (inferior-haskell-process arg)))
     (pop-to-buffer (process-buffer proc))))
 
-;;;###autoload
 (defcustom inferior-haskell-wait-and-jump nil
   "If non-nil, wait for file loading to terminate and jump to the error."
   :type 'boolean
@@ -588,7 +585,6 @@ The returned info is cached for reuse by `haskell-doc-mode'."
 ;; * Support fetching of local Haddock docs pulled directly from source files.
 ;; * Display docs locally? w3m?
 
-;;;###autoload
 (defcustom inferior-haskell-use-web-docs
   'fallback
   "Whether to use the online documentation.  Possible values:
@@ -602,7 +598,6 @@ regardless of existance of local files.  Default is `fallback'."
                  (const :tag "As fallback" fallback)
                  (const :tag "Always" always)))
 
-;;;###autoload
 (defcustom inferior-haskell-web-docs-base
   "http://haskell.org/ghc/docs/latest/html/libraries/"
   "The base URL of the online libraries documentation.
@@ -611,13 +606,11 @@ is `always' or `fallback'."
   :group 'inferior-haskell
   :type 'string)
 
-;;;###autoload
 (defcustom haskell-package-manager-name "ghc-pkg"
   "Name of the program to consult regarding package details."
   :group 'inferior-haskell
   :type 'string)
 
-;;;###autoload
 (defcustom haskell-package-conf-file
   (condition-case nil
       (with-temp-buffer
@@ -687,7 +680,6 @@ Insert the output into the current buffer."
       (message "Generating module alist... done")
       module-alist)))
 
-;;;###autoload
 (defcustom inferior-haskell-module-alist-file
   ;; (expand-file-name "~/.inf-haskell-module-alist")
   (expand-file-name (concat "inf-haskell-module-alist-"
diff --git a/w3m-haddock.el b/w3m-haddock.el
index f731fc989..d4f5c194d 100644
--- a/w3m-haddock.el
+++ b/w3m-haddock.el
@@ -38,7 +38,6 @@
   "Face for quarantines."
   :group 'haskell)
 
-;;;###autoload
 (defcustom haskell-w3m-haddock-dirs
   '("~/.cabal/share/doc/")
   "The path to your cabal documentation dir. It should contain