Merge commit 'dharmatech/master'

db4
Slava Pestov 2008-01-16 14:21:34 -05:00
commit fcc7d584e6
4 changed files with 8 additions and 4 deletions

View File

@ -1,4 +1,6 @@
USING: help.markup help.syntax multiline ; USING: help.markup help.syntax ;
IN: multiline
HELP: STRING: HELP: STRING:
{ $syntax "STRING: name\nfoo\n;" } { $syntax "STRING: name\nfoo\n;" }

View File

@ -16,7 +16,7 @@ IN: multiline
: STRING: : STRING:
CREATE dup reset-generic CREATE dup reset-generic
parse-here 1quotation define-compound ; parsing parse-here 1quotation define ; parsing
: (parse-multiline-string) ( start-index end-text -- end-index ) : (parse-multiline-string) ( start-index end-text -- end-index )
lexer get line-text 2dup start lexer get line-text 2dup start

View File

@ -1,6 +1,8 @@
! Copyright (C) 2007 Chris Double. ! Copyright (C) 2007 Chris Double.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: help.syntax help.markup odbc threads ; USING: help.syntax help.markup threads ;
IN: odbc
HELP: odbc-init HELP: odbc-init
{ $values { "env" "an ODBC environment handle" } } { $values { "env" "an ODBC environment handle" } }

View File

@ -102,7 +102,7 @@
(setq font-lock-defaults (setq font-lock-defaults
'(factor-font-lock-keywords nil nil nil nil)) '(factor-font-lock-keywords nil nil nil nil))
(set-syntax-table factor-mode-syntax-table) (set-syntax-table factor-mode-syntax-table)
(run-hooks 'factor-mode-hooks)) (run-hooks 'factor-mode-hook))
(add-to-list 'auto-mode-alist '("\\.factor\\'" . factor-mode)) (add-to-list 'auto-mode-alist '("\\.factor\\'" . factor-mode))