Skip to content

Fix some comments #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 28, 2015
Merged

Fix some comments #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
790fe36
Remove outdated commentary.
gracjan Jan 26, 2015
7f54f35
Fix incorrect comment.
gracjan Feb 28, 2015
46d5aa0
Remove outdated comment.
gracjan Feb 28, 2015
efcfda9
Improve comment about haskell-doc.
gracjan Feb 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion haskell-bot.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
;;
;; add this to .emacs:
;;
;; (add-hook 'haskell-mode-hook 'turn-on-haskell-bot)
;; (add-hook 'haskell-mode-hook 'haskell-bot-mode)
;;
;;
;; Customisation:
Expand Down
21 changes: 4 additions & 17 deletions haskell-doc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,14 @@
;; checking the word under the cursor and matching it against a list of
;; prelude, library, local and global functions.

;; To show types of global functions, i.e. functions defined in a module
;; imported by the current module, call the function
;; `turn-on-haskell-doc-global-types'. This automatically loads all modules
;; and builds `imenu' tables to get the types of all functions.
;; Note: The modules are loaded recursively, so you might pull in
;; many modules by just turning on global function support.
;; This features is currently not very well supported.

;; This program was inspired by the `eldoc.el' package by Noah Friedman.

;; Installation:

;; One useful way to enable this minor mode is to put the following in your
;; .emacs:
;; Depending on the major mode you use for your Haskell programs add
;; one of the following to your .emacs:
;;
;; (autoload 'turn-on-haskell-doc-mode "haskell-doc" nil t)

;; and depending on the major mode you use for your Haskell programs:
;; (add-hook 'hugs-mode-hook 'turn-on-haskell-doc-mode) ; hugs-mode
;; or
;; (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode) ; haskell-mode
;; (add-hook 'haskell-mode-hook 'haskell-doc-mode)

;; Customisation:

Expand Down Expand Up @@ -84,7 +71,7 @@

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

;; These are the names of the functions that can be called directly by the
;; user (with keybindings in `haskell-mode'):
Expand Down
61 changes: 0 additions & 61 deletions haskell-font-lock.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,67 +23,6 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:

;; Purpose:
;;
;; To support fontification of standard Haskell keywords, symbols,
;; functions, etc. Supports full Haskell 1.4 as well as LaTeX- and
;; Bird-style literate scripts.
;;
;; Installation:
;;
;; To turn font locking on for all Haskell buffers under the Haskell
;; mode of Moss&Thorn, add this to .emacs:
;;
;; (add-hook 'haskell-mode-hook 'turn-on-haskell-font-lock)
;;
;; Otherwise, call `turn-on-haskell-font-lock'.
;;
;;
;; Customisation:
;;
;; The colours and level of font locking may be customised. See the
;; documentation on `turn-on-haskell-font-lock' for more details.
;;
;; Present Limitations/Future Work (contributions are most welcome!):
;;
;; . Debatable whether `()' `[]' `(->)' `(,)' `(,,)' etc. should be
;; highlighted as constructors or not. Should the `->' in
;; `id :: a -> a' be considered a constructor or a keyword? If so,
;; how do we distinguish this from `\x -> x'? What about the `\'?
;;
;; . XEmacs can support both `--' comments and `{- -}' comments
;; simultaneously. If XEmacs is detected, this should be used.
;;
;; . Support for GreenCard?
;;
;;
;; All functions/variables start with
;; `(turn-(on/off)-)haskell-font-lock' or `haskell-fl-'.

;;; Change Log:

;; Version 1.3:
;; From Dave Love:
;; Support for proper behaviour (including with Unicode identifiers)
;; in Emacs 21 only hacked in messily to avoid disturbing the old
;; stuff. Needs integrating more cleanly. Allow literate comment
;; face to be customized. Some support for fontifying definitions.
;; (I'm not convinced the faces should be customizable -- fontlock
;; faces are normally expected to be consistent.)
;;
;; Version 1.2:
;; Added support for LaTeX-style literate scripts. Allow whitespace
;; after backslash to end a line for string continuations.
;;
;; Version 1.1:
;; Use own syntax table. Use backquote (neater). Stop ''' being
;; highlighted as quoted character. Fixed `\"' fontification bug
;; in comments.
;;
;; Version 1.0:
;; Brought over from Haskell mode v1.1.

;;; Code:

Expand Down