summaryrefslogtreecommitdiff
path: root/module/texinfo.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-12-20 23:18:32 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-21 00:01:49 +0100
commit05c29c5abc79bc1ceb7999176252debf0a6811e4 (patch)
tree2a1bd0e35341c6da42c5f3686b8d9cd80b40aa49 /module/texinfo.scm
parentc165c50d072105c82c9b15059e756a2cba353dbb (diff)
downloadguile-05c29c5abc79bc1ceb7999176252debf0a6811e4.tar.gz
texinfo fixes
* module/texinfo.scm (parser-error): Throw to 'parser-error, as ssax's input-parse does. (texi-command-depth): Fix docstring so as not to confuse emacs. (parse-table-args): Fix parser-error call to include port.
Diffstat (limited to 'module/texinfo.scm')
-rw-r--r--module/texinfo.scm14
1 files changed, 7 insertions, 7 deletions
diff --git a/module/texinfo.scm b/module/texinfo.scm
index 76d79dfab..d792cfa5d 100644
--- a/module/texinfo.scm
+++ b/module/texinfo.scm
@@ -88,7 +88,7 @@
;; Some utilities
(define (parser-error port message . rest)
- (apply error port message rest))
+ (apply throw 'parser-error port message rest))
(define (call-with-file-and-dir filename proc)
"Call the one-argument procedure @var{proc} with an input port that
@@ -377,11 +377,11 @@ lambda. Only present for @code{INLINE-ARGS}, @code{EOL-ARGS},
Examples:
@example
-(texi-command-depth 'chapter 4) @result{} 1
-(texi-command-depth 'top 4) @result{} 0
-(texi-command-depth 'subsection 4) @result{} 3
-(texi-command-depth 'appendixsubsec 4) @result{} 3
-(texi-command-depth 'subsection 2) @result{} #f
+ (texi-command-depth 'chapter 4) @result{} 1
+ (texi-command-depth 'top 4) @result{} 0
+ (texi-command-depth 'subsection 4) @result{} 3
+ (texi-command-depth 'appendixsubsec 4) @result{} 3
+ (texi-command-depth 'subsection 2) @result{} #f
@end example"
(let ((depth (and=> (assq command command-depths) cdr)))
(and depth (<= depth max-depth) depth)))
@@ -628,7 +628,7 @@ Examples:
(parser-error
port "@item formatter must be INLINE" f))
f))
- (parser-error "Invalid @item formatter" line)))
+ (parser-error port "Invalid @item formatter" line)))
(case command
((enumerate)
(if (zero? length)