Skip to content

Commit 7b6d7b0

Browse files
committed
Merge pull request #559 from gracjan/pr-fix-some-comments
Fix some comments
2 parents 0e2d1f2 + efcfda9 commit 7b6d7b0

File tree

3 files changed

+5
-79
lines changed

3 files changed

+5
-79
lines changed

haskell-bot.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
;;
5151
;; add this to .emacs:
5252
;;
53-
;; (add-hook 'haskell-mode-hook 'turn-on-haskell-bot)
53+
;; (add-hook 'haskell-mode-hook 'haskell-bot-mode)
5454
;;
5555
;;
5656
;; Customisation:

haskell-doc.el

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,14 @@
3131
;; checking the word under the cursor and matching it against a list of
3232
;; prelude, library, local and global functions.
3333

34-
;; To show types of global functions, i.e. functions defined in a module
35-
;; imported by the current module, call the function
36-
;; `turn-on-haskell-doc-global-types'. This automatically loads all modules
37-
;; and builds `imenu' tables to get the types of all functions.
38-
;; Note: The modules are loaded recursively, so you might pull in
39-
;; many modules by just turning on global function support.
40-
;; This features is currently not very well supported.
41-
4234
;; This program was inspired by the `eldoc.el' package by Noah Friedman.
4335

4436
;; Installation:
4537

46-
;; One useful way to enable this minor mode is to put the following in your
47-
;; .emacs:
38+
;; Depending on the major mode you use for your Haskell programs add
39+
;; one of the following to your .emacs:
4840
;;
49-
;; (autoload 'turn-on-haskell-doc-mode "haskell-doc" nil t)
50-
51-
;; and depending on the major mode you use for your Haskell programs:
52-
;; (add-hook 'hugs-mode-hook 'turn-on-haskell-doc-mode) ; hugs-mode
53-
;; or
54-
;; (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode) ; haskell-mode
41+
;; (add-hook 'haskell-mode-hook 'haskell-doc-mode)
5542

5643
;; Customisation:
5744

@@ -84,7 +71,7 @@
8471

8572
;; `haskell-doc-mode' is implemented as a minor-mode. So, you can combine it
8673
;; with any other mode. To enable it just type
87-
;; M-x turn-on-haskell-doc-mode
74+
;; M-x haskell-doc-mode
8875

8976
;; These are the names of the functions that can be called directly by the
9077
;; user (with keybindings in `haskell-mode'):

haskell-font-lock.el

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -23,67 +23,6 @@
2323
;; You should have received a copy of the GNU General Public License
2424
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
2525

26-
;;; Commentary:
27-
28-
;; Purpose:
29-
;;
30-
;; To support fontification of standard Haskell keywords, symbols,
31-
;; functions, etc. Supports full Haskell 1.4 as well as LaTeX- and
32-
;; Bird-style literate scripts.
33-
;;
34-
;; Installation:
35-
;;
36-
;; To turn font locking on for all Haskell buffers under the Haskell
37-
;; mode of Moss&Thorn, add this to .emacs:
38-
;;
39-
;; (add-hook 'haskell-mode-hook 'turn-on-haskell-font-lock)
40-
;;
41-
;; Otherwise, call `turn-on-haskell-font-lock'.
42-
;;
43-
;;
44-
;; Customisation:
45-
;;
46-
;; The colours and level of font locking may be customised. See the
47-
;; documentation on `turn-on-haskell-font-lock' for more details.
48-
;;
49-
;; Present Limitations/Future Work (contributions are most welcome!):
50-
;;
51-
;; . Debatable whether `()' `[]' `(->)' `(,)' `(,,)' etc. should be
52-
;; highlighted as constructors or not. Should the `->' in
53-
;; `id :: a -> a' be considered a constructor or a keyword? If so,
54-
;; how do we distinguish this from `\x -> x'? What about the `\'?
55-
;;
56-
;; . XEmacs can support both `--' comments and `{- -}' comments
57-
;; simultaneously. If XEmacs is detected, this should be used.
58-
;;
59-
;; . Support for GreenCard?
60-
;;
61-
;;
62-
;; All functions/variables start with
63-
;; `(turn-(on/off)-)haskell-font-lock' or `haskell-fl-'.
64-
65-
;;; Change Log:
66-
67-
;; Version 1.3:
68-
;; From Dave Love:
69-
;; Support for proper behaviour (including with Unicode identifiers)
70-
;; in Emacs 21 only hacked in messily to avoid disturbing the old
71-
;; stuff. Needs integrating more cleanly. Allow literate comment
72-
;; face to be customized. Some support for fontifying definitions.
73-
;; (I'm not convinced the faces should be customizable -- fontlock
74-
;; faces are normally expected to be consistent.)
75-
;;
76-
;; Version 1.2:
77-
;; Added support for LaTeX-style literate scripts. Allow whitespace
78-
;; after backslash to end a line for string continuations.
79-
;;
80-
;; Version 1.1:
81-
;; Use own syntax table. Use backquote (neater). Stop ''' being
82-
;; highlighted as quoted character. Fixed `\"' fontification bug
83-
;; in comments.
84-
;;
85-
;; Version 1.0:
86-
;; Brought over from Haskell mode v1.1.
8726

8827
;;; Code:
8928

0 commit comments

Comments
 (0)