Skip to content

Commit 6f0ffed

Browse files
committed
Update docs for Emacs22 mode conventions
1 parent 9f43a93 commit 6f0ffed

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

doc/haskell-mode.texi

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,13 @@ trade-offs:
265265

266266
@ftable @code
267267

268-
@item turn-on-haskell-simple-indent
268+
@item haskell-simple-indent-mode
269269

270270
A very simple indentation scheme; In this scheme, @key{TAB} will now
271271
move the cursor to the next indent point in the previous non-blank line.
272272
An indent point is a non-whitespace character following whitespace.
273273

274-
@item turn-on-haskell-indent
274+
@item haskell-indent-mode
275275

276276
Intelligent semi-automatic indentation for Haskell's layout rule. The
277277
basic idea is to have @key{TAB} cycle through possibilities indentation
@@ -282,28 +282,28 @@ detail in the article @cite{Dynamic tabbing for automatic indentation
282282
with the layout rule} published in the Journal of Functional Programming
283283
8.5 (1998).
284284

285-
@item turn-on-haskell-indentation
285+
@item haskell-indentation-mode
286286

287-
Improved variation of @code{turn-on-haskell-indent} indentation
287+
Improved variation of @code{haskell-indent-mode} indentation
288288
mode. Rebinds @key{RET} and @key{DEL}, so that indentations can be set
289289
and deleted as if they were real tabs.
290290

291291
@end ftable
292292

293293
To enable one of these three mutually exclusive indentation schemes, you
294-
just need call one (and only one!) of the @code{turn-on-*} commands
294+
just need call one (and only one!) of the @code{*-mode} commands
295295
while in the buffer you want the indentation scheme to be activated for.
296296

297-
The recommended way is to add one of @code{turn-on-*} commands to
297+
The recommended way is to add one of @code{*-mode} commands to
298298
@code{haskell-mode-hook}. This can be done either by using @kbd{M-x
299299
customize-variable @key{RET} haskell-mode-hook} which provides a
300300
convenient user interface or by adding @emph{one} of the following three
301301
lines to your @file{.emacs} file:
302302

303303
@lisp
304-
(add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent)
305-
(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
306-
(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
304+
(add-hook 'haskell-mode-hook 'haskell-simple-indent-mode)
305+
(add-hook 'haskell-mode-hook 'haskell-indent-mode)
306+
(add-hook 'haskell-mode-hook 'haskell-indentation-mode)
307307
@end lisp
308308

309309
@section Interactive Block Indentation
@@ -351,7 +351,6 @@ selection mode (without redefining @kbd{C-x},@kbd{C-c},@kbd{C-v}, and
351351
@node Declaration scanning
352352
@chapter Declaration scannning
353353

354-
@findex turn-on-haskell-decl-scan
355354
@findex haskell-decl-scan-mode
356355
@vindex haskell-decl-scan-mode-hook
357356

@@ -391,11 +390,11 @@ Lock,,,emacs}) as @code{haskell-decl-scan-mode} ignores text highlighted
391390
with @code{font-lock-comment-face}.
392391

393392
As usual, in order to activate @code{haskell-decl-scan-mode}
394-
automatically for Haskell buffers, add @code{turn-on-haskell-decl-scan}
393+
automatically for Haskell buffers, add @code{haskell-decl-scan-mode}
395394
to @code{haskell-mode-hook}:
396395

397396
@lisp
398-
(add-hook 'haskell-mode-hook 'turn-on-haskell-decl-scan)
397+
(add-hook 'haskell-mode-hook 'haskell-decl-scan-mode)
399398
@end lisp
400399

401400
@code{haskell-decl-scan-mode} enables the use of features that build

0 commit comments

Comments
 (0)