steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'emacs' of http://git.hacks-galore.org/jao/factor

db4
Doug Coleman 2009-02-15 19:29:49 -06:00
parent 5ef7afcbb3 0f6598d95c
commit 63c96cc008
3 changed files with 4 additions and 6 deletions

3
misc/fuel/fuel-edit.el
View File

@ -65,7 +65,6 @@
;;; Editing commands:
(defvar fuel-edit--word-history nil)
(defvar fuel-edit--previous-location nil)
(defun fuel-edit-vocabulary (&optional refresh vocab)
"Visits vocabulary file in Emacs.
@ -129,7 +128,7 @@ was last invoked."
(interactive)
(condition-case nil
(pop-tag-mark)
(error "No previous location for find word or vocab invokation")))
(error "No previous location for find word or vocab invocation")))
(defvar fuel-edit--buffer-history nil)

1
misc/fuel/fuel-font-lock.el
View File

@ -88,7 +88,6 @@
(t 'default))))
((or (char-equal c ?U) (char-equal c ?C))
'factor-font-lock-parsing-word)
((char-equal c ?\() 'factor-font-lock-stack-effect)
((char-equal c ?\") 'factor-font-lock-string)
(t 'factor-font-lock-comment)))))

6
misc/fuel/fuel-syntax.el
View File

@ -136,7 +136,7 @@
(fuel-syntax--second-word-regex '("&:" "SYMBOL:" "VAR:")))
(defconst fuel-syntax--stack-effect-regex
"\\( ( .* )\\)\\|\\( (( .* ))\\)")
"\\( ( [^\n]* )\\)\\|\\( (( [^\n]* ))\\)")
(defconst fuel-syntax--using-lines-regex "^USING: +\\([^;]+\\);")
@ -239,6 +239,8 @@
(modify-syntax-entry ?\r " " table)
(modify-syntax-entry ?\ " " table)
(modify-syntax-entry ?\n " " table)
(modify-syntax-entry ?\( "()" table)
(modify-syntax-entry ?\) ")(" table)
table))
(defconst fuel-syntax--syntactic-keywords
@ -247,8 +249,6 @@
;; Comments:
("\\_<\\(#?!\\) .*\\(\n\\|$\\)" (1 "<") (2 ">"))
("\\_<\\(#?!\\)\\(\n\\|$\\)" (1 "<") (2 ">"))
(" \\((\\)( \\([^\n]*\\) )\\()\\)\\( \\|\n\\)" (1 "<b") (2 "w") (3 ">b"))
(" \\((\\) \\([^\n]*\\) \\()\\)\\( \\|\n\\)" (1 "<b") (2 "w") (3 ">b"))
;; Strings
("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)"
(3 "\"") (5 "\""))