[BACK]Return to gforth.el CVS log [TXT] [DIR] Up to [gforth] / gforth

Diff for /gforth/gforth.el between versions 1.58 and 1.59

version 1.58, 2002/01/19 17:43:28 version 1.59, 2002/01/26 13:05:26
Line 33 Line 33
 ;; Changes by David  ;; Changes by David
 ;; Added a syntax-hilighting engine, rewrote auto-indentation engine.  ;; Added a syntax-hilighting engine, rewrote auto-indentation engine.
 ;; Added support for block files.  ;; Added support for block files.
   ;; Tested with Emacs 19.34, 20.5, 21.1 and XEmacs 21.1
     
 ;;-------------------------------------------------------------------  ;;-------------------------------------------------------------------
 ;; A Forth indentation, documentation search and interaction library  ;; A Forth indentation, documentation search and interaction library
Line 49 Line 50
   
 ;;; Code:  ;;; Code:
   
 (setq debug-on-error t)  ;(setq debug-on-error t)
   
 ;; Code ripped from `version.el' for compatability with Emacs versions  ;; Code ripped from `version.el' for compatability with Emacs versions
 ;; prior to 19.23.  ;; prior to 19.23.
Line 90 Line 91
   (set-face-foreground font-lock-warning-face "red")    (set-face-foreground font-lock-warning-face "red")
   (make-face-bold font-lock-warning-face))    (make-face-bold font-lock-warning-face))
   
   ;; define `font-lock-constant-face' in XEmacs (just copy
   ;; `font-lock-preprocessor-face')
   (unless (boundp 'font-lock-constant-face)
     (copy-face font-lock-preprocessor-face 'font-lock-constant-face)
     (defvar font-lock-constant-face 'font-lock-comment-face))
   
 ;; define `regexp-opt' in emacs versions prior to 20.1   ;; define `regexp-opt' in emacs versions prior to 20.1 
 ;; (this implementation is extremely inefficient, though)  ;; (this implementation is extremely inefficient, though)
 (unless (boundp 'regexp-opt)  (eval-and-compile (forth-require 'regexp-opt))
   (unless (memq 'regexp-opt features)
   (message (concat     (message (concat 
             "Warning: your Emacs version doesn't support `regexp-opt'. "              "Warning: your Emacs version doesn't support `regexp-opt'. "
             "Hilighting will be slow."))              "Hilighting will be slow."))
Line 102 Line 110
   (defun regexp-opt-depth (re)    (defun regexp-opt-depth (re)
     (if (string= (substring re 0 2) "\\(") 1 0)))      (if (string= (substring re 0 2) "\\(") 1 0)))
   
     
 ; todo:  ; todo:
 ;  ;
   
Line 432  End:\" construct).") Line 439  End:\" construct).")
 ;; Helper function for `forth-compile-word': translate one entry from   ;; Helper function for `forth-compile-word': translate one entry from 
 ;; `forth-words' into the form  (regexp regexp-depth word-description)  ;; `forth-words' into the form  (regexp regexp-depth word-description)
 (defun forth-compile-words-mapper (word)  (defun forth-compile-words-mapper (word)
     ;; warning: we cannot rely on regexp-opt's PAREN argument, since
     ;; XEmacs will use shy parens by default :-(
   (let* ((matcher (car word))    (let* ((matcher (car word))
          (regexp (if (stringp matcher) (concat "\\(" matcher "\\)")           (regexp 
                    (if (listp matcher) (regexp-opt matcher t)            (concat "\\(" (cond ((stringp matcher) matcher)
                      (error "Invalid matcher (stringp or listp expected `%s'"                                 ((listp matcher) (regexp-opt matcher))
                             matcher))))                                (t (error "Invalid matcher `%s'")))
                     "\\)"))
          (depth (regexp-opt-depth regexp))           (depth (regexp-opt-depth regexp))
          (description (cdr word)))           (description (cdr word)))
     (list regexp depth description)))      (list regexp depth description)))
Line 542  End:\" construct).") Line 552  End:\" construct).")
 ;; expression that matched. (used for identifying branches "a\\|b\\|c...")  ;; expression that matched. (used for identifying branches "a\\|b\\|c...")
 (defun forth-get-regexp-branch ()  (defun forth-get-regexp-branch ()
   (let ((count 2))    (let ((count 2))
     (while (not (match-beginning count))      (while (not (condition-case err (match-beginning count)
                     (args-out-of-range t)))  ; XEmacs requires error handling
       (setq count (1+ count)))        (setq count (1+ count)))
     count))      count))
   
Line 1059  exceeds 64 characters." Line 1070  exceeds 64 characters."
 ;setup for C-h C-i to work  ;setup for C-h C-i to work
 (eval-and-compile (forth-require 'info-look))  (eval-and-compile (forth-require 'info-look))
 (when (memq 'info-look features)  (when (memq 'info-look features)
   (info-lookup-add-help    ;; info-lookup-add-help not supported in XEmacs :-(
    :topic 'symbol    (defvar forth-info-lookup '(symbol (forth-mode "\\w+" t 
    :mode 'forth-mode                                                    (("(gforth)Word Index"))
    :regexp "[^                                                      "\\w+")))
 ]+"    (unless (memq forth-info-lookup info-lookup-alist)
    :ignore-case t      (setq info-lookup-alist (cons forth-info-lookup info-lookup-alist))))
    :doc-spec '(("(gforth)Name Index" nil "`" "'  "))))  
   ;;   (info-lookup-add-help
   ;;    :topic 'symbol
   ;;    :mode 'forth-mode
   ;;    :regexp "[^       
   ;; ]+"
   ;;    :ignore-case t
   ;;    :doc-spec '(("(gforth)Name Index" nil "`" "'  "))))
   
 (require 'etags)  (require 'etags)
   
Removed from v.1.58  
changed lines
  Added in v.1.59

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>