emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/obsolete/hilit19.el


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/obsolete/hilit19.el
Date: Fri, 04 Apr 2003 01:22:43 -0500

Index: emacs/lisp/obsolete/hilit19.el
diff -c emacs/lisp/obsolete/hilit19.el:1.5 emacs/lisp/obsolete/hilit19.el:1.6
*** emacs/lisp/obsolete/hilit19.el:1.5  Wed Aug 14 20:48:20 2002
--- emacs/lisp/obsolete/hilit19.el      Tue Feb  4 08:18:33 2003
***************
*** 30,36 ****
  ;; not only source code highlighting, but also Info, RMAIL, VM, gnus...
  ;; Hilit19 knows (or thinks it knows) how to highlight emacs buffers in
  ;; about 25 different modes.
! ;; 
  ;; WHERE TO GET THE LATEST VERSIONS OF HILIT19.EL (beta and release):
  ;;
  ;;      http://hackvan.com/pub/stig/src/elisp/
--- 30,36 ----
  ;; not only source code highlighting, but also Info, RMAIL, VM, gnus...
  ;; Hilit19 knows (or thinks it knows) how to highlight emacs buffers in
  ;; about 25 different modes.
! ;;
  ;; WHERE TO GET THE LATEST VERSIONS OF HILIT19.EL (beta and release):
  ;;
  ;;      http://hackvan.com/pub/stig/src/elisp/
***************
*** 55,61 ****
  ;; GENERAL OVERVIEW
  ;;
  ;;      This package installs numerous hooks to colorfully highlight your
! ;;      source code buffers as well as mail and news buffers.  Most 
  ;;      programming languages have predefined highlighting patterns.
  ;;    Just load hilit19 and files will be automatically highlighted as
  ;;      they're loaded.
--- 55,61 ----
  ;; GENERAL OVERVIEW
  ;;
  ;;      This package installs numerous hooks to colorfully highlight your
! ;;      source code buffers as well as mail and news buffers.  Most
  ;;      programming languages have predefined highlighting patterns.
  ;;    Just load hilit19 and files will be automatically highlighted as
  ;;      they're loaded.
***************
*** 69,95 ****
  ;;
  ;;      Hilit19 can build faces by examining the names that you give to them
  ;;    For example, green/black-bold-italic-underline would be created as
! ;;    a face with a green foreground, and a black background, using a 
  ;;    bold-italic font...with underlining for good measure.
  ;;
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;
  ;; SETUP -- In your .emacs:
  ;;
! ;; 
  ;; (cond (window-system
  ;;        (setq hilit-mode-enable-list  '(not text-mode)
  ;;              hilit-background-mode   'light
  ;;              hilit-inhibit-hooks     nil
  ;;              hilit-inhibit-rebinding nil)
! ;; 
  ;;        (require 'hilit19)
  ;;        ))
! ;; 
  ;; If you like font-lock-mode and want to use both packages, then you can
  ;; disable hilit for the modes in which you want to use font-lock by listing
  ;; said modes in hilit-mode-enable-list.
! ;; 
  ;;      (hilit-translate type     'RoyalBlue   ; enable highlighting in C/C++
  ;;                     string   nil)         ; disable string highlighting
  ;;
--- 69,95 ----
  ;;
  ;;      Hilit19 can build faces by examining the names that you give to them
  ;;    For example, green/black-bold-italic-underline would be created as
! ;;    a face with a green foreground, and a black background, using a
  ;;    bold-italic font...with underlining for good measure.
  ;;
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;
  ;; SETUP -- In your .emacs:
  ;;
! ;;
  ;; (cond (window-system
  ;;        (setq hilit-mode-enable-list  '(not text-mode)
  ;;              hilit-background-mode   'light
  ;;              hilit-inhibit-hooks     nil
  ;;              hilit-inhibit-rebinding nil)
! ;;
  ;;        (require 'hilit19)
  ;;        ))
! ;;
  ;; If you like font-lock-mode and want to use both packages, then you can
  ;; disable hilit for the modes in which you want to use font-lock by listing
  ;; said modes in hilit-mode-enable-list.
! ;;
  ;;      (hilit-translate type     'RoyalBlue   ; enable highlighting in C/C++
  ;;                     string   nil)         ; disable string highlighting
  ;;
***************
*** 293,299 ****
  ;;
  
  ;;;;;; AND THIS CAN BE APPLIED TO VM 5.33L_19
! ;; 
  ;; *** ../site/vm5.33L_19/vm-summary.el    Fri Jun  4 22:17:11 1993
  ;; --- ./vm-summary.el     Tue Jun 22 16:39:30 1993
  ;; ***************
--- 293,299 ----
  ;;
  
  ;;;;;; AND THIS CAN BE APPLIED TO VM 5.33L_19
! ;;
  ;; *** ../site/vm5.33L_19/vm-summary.el    Fri Jun  4 22:17:11 1993
  ;; --- ./vm-summary.el     Tue Jun 22 16:39:30 1993
  ;; ***************
***************
*** 303,309 ****
  ;;                   (forward-char -2)
  ;; !                 (and w vm-auto-center-summary (vm-auto-center-summary))))
  ;;             (and old-window (select-window old-window)))))))
! ;;   
  ;;   (defun vm-mark-for-display-update (message)
  ;; --- 152,159 ----
  ;;                   (insert "->")
--- 303,309 ----
  ;;                   (forward-char -2)
  ;; !                 (and w vm-auto-center-summary (vm-auto-center-summary))))
  ;;             (and old-window (select-window old-window)))))))
! ;;
  ;;   (defun vm-mark-for-display-update (message)
  ;; --- 152,159 ----
  ;;                   (insert "->")
***************
*** 312,320 ****
  ;; !                 (and w vm-auto-center-summary (vm-auto-center-summary))
  ;; !                 (run-hooks 'vm-summary-pointer-hook)))
  ;;             (and old-window (select-window old-window)))))))
! ;;   
  ;;   (defun vm-mark-for-display-update (message)
! ;; 
  ;;;;;;
  
  ;;; Code:
--- 312,320 ----
  ;; !                 (and w vm-auto-center-summary (vm-auto-center-summary))
  ;; !                 (run-hooks 'vm-summary-pointer-hook)))
  ;;             (and old-window (select-window old-window)))))))
! ;;
  ;;   (defun vm-mark-for-display-update (message)
! ;;
  ;;;;;;
  
  ;;; Code:
***************
*** 468,483 ****
      (keyword  RoyalBlue           cyan               bold-italic)
      (label    red-underline       orange-underlined  underline)
      (string   grey40              orange             underline)
!     
      ;; some further faces for Ada
      (struct     black-bold        white-bold         bold)
      (glob-struct  magenta         Plum1              default-bold-underline)
      (named-param  DarkGoldenrod           Goldenrod          underline)
!       
      ;; and another one for LaTeX
      (crossref   DarkGoldenrod     Goldenrod          underline)
      (formula    Goldenrod         DarkGoldenrod      underline)
!  
      ;; compilation buffers
      (active-error default/pink-bold  default/DeepPink-bold  default-underline)
      (error      red-bold           yellow            bold)
--- 468,483 ----
      (keyword  RoyalBlue           cyan               bold-italic)
      (label    red-underline       orange-underlined  underline)
      (string   grey40              orange             underline)
! 
      ;; some further faces for Ada
      (struct     black-bold        white-bold         bold)
      (glob-struct  magenta         Plum1              default-bold-underline)
      (named-param  DarkGoldenrod           Goldenrod          underline)
! 
      ;; and another one for LaTeX
      (crossref   DarkGoldenrod     Goldenrod          underline)
      (formula    Goldenrod         DarkGoldenrod      underline)
! 
      ;; compilation buffers
      (active-error default/pink-bold  default/DeepPink-bold  default-underline)
      (error      red-bold           yellow            bold)
***************
*** 485,491 ****
  
      ;; Makefiles (some faces borrowed from C/C++ too)
      (rule       blue-bold-underline cyan-underline   default-bold-underline)
!     
      ;; VM, GNUS and Text mode
      (msg-subject    blue-bold       yellow             bold)
      (msg-from     purple-bold     green              bold)
--- 485,491 ----
  
      ;; Makefiles (some faces borrowed from C/C++ too)
      (rule       blue-bold-underline cyan-underline   default-bold-underline)
! 
      ;; VM, GNUS and Text mode
      (msg-subject    blue-bold       yellow             bold)
      (msg-from     purple-bold     green              bold)
***************
*** 512,518 ****
      (dired-ignored   ForestGreen       moccasin              nil)
      (dired-deleted   red-bold-italic   orange        bold-italic)
      (dired-marked    purple          Plum1           nil)
!       
      ;; Info-mode, and jargon-mode.el and prep.ai.mit.edu:/pub/gnu/jargon*
      (jargon-entry    blue-bold               cyan            bold)
      (jargon-xref     purple-bold       Plum1         italic)
--- 512,518 ----
      (dired-ignored   ForestGreen       moccasin              nil)
      (dired-deleted   red-bold-italic   orange        bold-italic)
      (dired-marked    purple          Plum1           nil)
! 
      ;; Info-mode, and jargon-mode.el and prep.ai.mit.edu:/pub/gnu/jargon*
      (jargon-entry    blue-bold               cyan            bold)
      (jargon-xref     purple-bold       Plum1         italic)
***************
*** 557,565 ****
                       cmdl)))
      (cons 'progn cmdl)))
  
! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
  ;; This function actually translates and then creates the faces...
! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
  
  (defun hilit-lookup-face-create (face &optional force)
    "Get a FACE, or create it if it doesn't exist.  In order for it to
--- 557,565 ----
                       cmdl)))
      (cons 'progn cmdl)))
  
! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; This function actually translates and then creates the faces...
! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (defun hilit-lookup-face-create (face &optional force)
    "Get a FACE, or create it if it doesn't exist.  In order for it to
***************
*** 589,595 ****
         (basefont (cdr (assq 'font (frame-parameters frame))))
         error fgcolor bgcolor)
      (cond
!      ((or (null face)                 
          (memq face hilit-predefined-face-list))
        ;; do nothing if the face is nil or if it's predefined.
        )
--- 589,595 ----
         (basefont (cdr (assq 'font (frame-parameters frame))))
         error fgcolor bgcolor)
      (cond
!      ((or (null face)
          (memq face hilit-predefined-face-list))
        ;; do nothing if the face is nil or if it's predefined.
        )
***************
*** 616,625 ****
                         (and (match-beginning 1) "#")
                         (substring fn (match-beginning 2) (match-end 2)))
                fn (substring fn (match-end 0))))
!       
        (and (string= "default" fgcolor) (setq fgcolor nil))
        (and (string= "default" bgcolor) (setq bgcolor nil))
!       
        ;; catch errors if we can't allocate the color(s)
        (condition-case nil
          (progn (and fgcolor (set-face-foreground 'scratch-face fgcolor))
--- 616,625 ----
                         (and (match-beginning 1) "#")
                         (substring fn (match-beginning 2) (match-end 2)))
                fn (substring fn (match-end 0))))
! 
        (and (string= "default" fgcolor) (setq fgcolor nil))
        (and (string= "default" bgcolor) (setq bgcolor nil))
! 
        ;; catch errors if we can't allocate the color(s)
        (condition-case nil
          (progn (and fgcolor (set-face-foreground 'scratch-face fgcolor))
***************
*** 705,711 ****
    (cond ((null patterns)
         (setq patterns (cdr (assq major-mode hilit-patterns-alist))))
        ((symbolp patterns)
!        (setq patterns (cdr (assq patterns hilit-patterns-alist)))))  
    ;; txt prop: (setq patterns (reverse patterns))
    (let ((case-fold-search (car patterns))
        (prio (1- (length patterns)))
--- 705,711 ----
    (cond ((null patterns)
         (setq patterns (cdr (assq major-mode hilit-patterns-alist))))
        ((symbolp patterns)
!        (setq patterns (cdr (assq patterns hilit-patterns-alist)))))
    ;; txt prop: (setq patterns (reverse patterns))
    (let ((case-fold-search (car patterns))
        (prio (1- (length patterns)))
***************
*** 725,735 ****
          (if (not face)                ; skipped if nil
              nil
            (or quietly hilit-quietly
!               (message "highlighting %d: %s%s" prio pstart 
                         (if (stringp pend) (concat " ... " pend) "")))
            (goto-char (point-min))
            (condition-case msg
!               (cond 
                      ((symbolp pstart)
                       ;; inner loop -- special function to find pattern
                       (let (region)
--- 725,735 ----
          (if (not face)                ; skipped if nil
              nil
            (or quietly hilit-quietly
!               (message "highlighting %d: %s%s" prio pstart
                         (if (stringp pend) (concat " ... " pend) "")))
            (goto-char (point-min))
            (condition-case msg
!               (cond
                      ((symbolp pstart)
                       ;; inner loop -- special function to find pattern
                       (let (region)
***************
*** 799,805 ****
  
  ;; Well, I want to remove this function...there's one sure way to find out if
  ;; anyone uses it or not...and that's to comment it out.
! ;; 
  ;; (defun hilit-toggle-highlight (arg)
  ;;   "Locally toggle highlighting.  With arg, forces highlighting off."
  ;;   (interactive "P")
--- 799,805 ----
  
  ;; Well, I want to remove this function...there's one sure way to find out if
  ;; anyone uses it or not...and that's to comment it out.
! ;;
  ;; (defun hilit-toggle-highlight (arg)
  ;;   "Locally toggle highlighting.  With arg, forces highlighting off."
  ;;   (interactive "P")
***************
*** 835,841 ****
  \t^U \\[hilit-repaint-command]\trepaint entire buffer
  \t^U - \\[hilit-repaint-command]\trepaint visible portion of buffer
  \t^U n \\[hilit-repaint-command]\trepaint n lines to either side of point"
!   (interactive "P") 
    (let (st en quietly)
      (or arg (setq arg hilit-auto-rehighlight))
      (cond ((or (eq  arg 'visible) (eq arg '-))
--- 835,841 ----
  \t^U \\[hilit-repaint-command]\trepaint entire buffer
  \t^U - \\[hilit-repaint-command]\trepaint visible portion of buffer
  \t^U n \\[hilit-repaint-command]\trepaint n lines to either side of point"
!   (interactive "P")
    (let (st en quietly)
      (or arg (setq arg hilit-auto-rehighlight))
      (cond ((or (eq  arg 'visible) (eq arg '-))
***************
*** 878,884 ****
  
  ;;; this line highlighting stuff is untested.  play with it only if you feel
  ;;; adventurous...don't ask me to fix it...though you're welcome to.  -- Stig
! ;; 
  ;; (defun hilit-rehighlight-line-quietly (&rest args)
  ;;   "Quietly rehighlight just this line.
  ;; Useful as an after change hook in VM/gnus summary buffers and dired 
buffers.
--- 878,884 ----
  
  ;;; this line highlighting stuff is untested.  play with it only if you feel
  ;;; adventurous...don't ask me to fix it...though you're welcome to.  -- Stig
! ;;
  ;; (defun hilit-rehighlight-line-quietly (&rest args)
  ;;   "Quietly rehighlight just this line.
  ;; Useful as an after change hook in VM/gnus summary buffers and dired 
buffers.
***************
*** 887,893 ****
  ;;     (push-mark nil t)
  ;;     (hilit-rehighlight-yank-region)
  ;;     (and orig-achange-function (apply orig-achange-function args))))
! ;; 
  ;; (defun hilit-install-line-hooks ()
  ;;   (make-variable-buffer-local 'after-change-function)
  ;;   (make-local-variable 'orig-achange-function)
--- 887,893 ----
  ;;     (push-mark nil t)
  ;;     (hilit-rehighlight-yank-region)
  ;;     (and orig-achange-function (apply orig-achange-function args))))
! ;;
  ;; (defun hilit-install-line-hooks ()
  ;;   (make-variable-buffer-local 'after-change-function)
  ;;   (make-local-variable 'orig-achange-function)
***************
*** 897,907 ****
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Wysiwyg Stuff...  take it away and build a whole package around it!
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;; 
  ;; ; For the Jargon-impaired, WYSIWYG === What You See Is What You Get
  ;; ; Sure, it sucks to type.  Oh, well.
  ;; (defun hilit-wysiwyg-replace ()
! ;;   "Replace overstruck text with normal text that's been overlaid with the 
  ;; appropriate text attribute.  Suitable for a find-file hook."
  ;;   (save-excursion
  ;;     (goto-char (point-min))
--- 897,907 ----
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Wysiwyg Stuff...  take it away and build a whole package around it!
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;;
  ;; ; For the Jargon-impaired, WYSIWYG === What You See Is What You Get
  ;; ; Sure, it sucks to type.  Oh, well.
  ;; (defun hilit-wysiwyg-replace ()
! ;;   "Replace overstruck text with normal text that's been overlaid with the
  ;; appropriate text attribute.  Suitable for a find-file hook."
  ;;   (save-excursion
  ;;     (goto-char (point-min))
***************
*** 918,924 ****
  ;;        (replace-match "") (forward-char))
  ;;      ))
  ;;       (set-buffer-modified-p bmod))))
! ;; 
  ;; ; is this more appropriate as a write-file-hook or a write-contents-hook?
  ;; (defun hilit-wysiwyg-write-repair ()
  ;;   "Replace wysiwyg overlays with overstrike text."
--- 918,924 ----
  ;;        (replace-match "") (forward-char))
  ;;      ))
  ;;       (set-buffer-modified-p bmod))))
! ;;
  ;; ; is this more appropriate as a write-file-hook or a write-contents-hook?
  ;; (defun hilit-wysiwyg-write-repair ()
  ;;   "Replace wysiwyg overlays with overstrike text."
***************
*** 942,952 ****
  ;;  nil)
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;; Initialization.  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (and (not hilit-inhibit-rebinding)
!      (progn 
         (substitute-key-definition 'yank     'hilit-yank
                                  (current-global-map))
         (substitute-key-definition 'yank-pop 'hilit-yank-pop
--- 942,952 ----
  ;;  nil)
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;; Initialization.
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (and (not hilit-inhibit-rebinding)
!      (progn
         (substitute-key-definition 'yank     'hilit-yank
                                  (current-global-map))
         (substitute-key-definition 'yank-pop 'hilit-yank-pop
***************
*** 977,983 ****
                     vm-show-message-hook
  
                     rmail-show-message-hook
!                    mail-setup-hook 
                     mh-show-mode-hook
  
                     dired-after-readin-hook
--- 977,983 ----
                     vm-show-message-hook
  
                     rmail-show-message-hook
!                    mail-setup-hook
                     mh-show-mode-hook
  
                     dired-after-readin-hook
***************
*** 994,1000 ****
  ;;; inappropriate, but I don't know why I wanted hilit-patterns-alist to be
  ;;; reset on every reload...
  
! (setq hilit-patterns-alist nil) 
  
  (defun hilit-associate (alist key val)
    "creates, or destructively replaces, the pair (key . val) in alist"
--- 994,1000 ----
  ;;; inappropriate, but I don't know why I wanted hilit-patterns-alist to be
  ;;; reset on every reload...
  
! (setq hilit-patterns-alist nil)
  
  (defun hilit-associate (alist key val)
    "creates, or destructively replaces, the pair (key . val) in alist"
***************
*** 1002,1008 ****
      (if oldentry
        (setcdr oldentry val)
        (set alist (cons (cons key val) (eval alist))))))
!   
  (defun hilit-set-mode-patterns (modelist patterns
                                         &optional parse-fn case-fold)
    "Sets the default highlighting patterns for MODE to PATTERNS.
--- 1002,1008 ----
      (if oldentry
        (setcdr oldentry val)
        (set alist (cons (cons key val) (eval alist))))))
! 
  (defun hilit-set-mode-patterns (modelist patterns
                                         &optional parse-fn case-fold)
    "Sets the default highlighting patterns for MODE to PATTERNS.
***************
*** 1016,1022 ****
                           (setcar (cdr p) 0))))
          patterns)
    (setq patterns (cons case-fold patterns))
!   
    (or (consp modelist) (setq modelist (list modelist)))
    (let (ok (flip (eq (car hilit-mode-enable-list) 'not)))
      (mapcar (function
--- 1016,1022 ----
                           (setcar (cdr p) 0))))
          patterns)
    (setq patterns (cons case-fold patterns))
! 
    (or (consp modelist) (setq modelist (list modelist)))
    (let (ok (flip (eq (car hilit-mode-enable-list) 'not)))
      (mapcar (function
***************
*** 1046,1052 ****
           (hilit-set-mode-patterns mode (list new-pat)))
          (first
           (setcdr old-patterns (cons new-pat (cdr old-patterns))))
!         (t 
           (nconc old-patterns (list new-pat)))))
    (and (interactive-p) (hilit-rehighlight-buffer)))
  
--- 1046,1052 ----
           (hilit-set-mode-patterns mode (list new-pat)))
          (first
           (setcdr old-patterns (cons new-pat (cdr old-patterns))))
!         (t
           (nconc old-patterns (list new-pat)))))
    (and (interactive-p) (hilit-rehighlight-buffer)))
  
***************
*** 1066,1082 ****
                  (skip-chars-backward "\\\\")
                  (forward-char 1)
                  (not (zerop (% (- en (point)) 2))))))
!     (and en (cons st en))))    
  
  ;; return types on same line...
  ;; ("^[a-zA-z].*\\(\\w\\|[$_]\\)+\\s *\\(\\(\\w\\|[$_]\\)+\\s 
*((\\|(\\)[^)]*)+" nil defun)
  
  ;; On another note, a working pattern for grabbing function definitions for C 
is
! ;; 
  ;; ("^[a-zA-Z_]+.*[;{]$" nil ForestGreen)  ; global defns ( start at col 1 )
  ;; ("^[a-zA-Z_]+.*(" ")" defun)
  ;; ; defuns assumed to start at col 1, not with # or {
! ;; 
  ;; this will make external declarations/definitions green, and function
  ;; definitions the defun face.  Hmmm - seems to work for me anyway.
  
--- 1066,1082 ----
                  (skip-chars-backward "\\\\")
                  (forward-char 1)
                  (not (zerop (% (- en (point)) 2))))))
!     (and en (cons st en))))
  
  ;; return types on same line...
  ;; ("^[a-zA-z].*\\(\\w\\|[$_]\\)+\\s *\\(\\(\\w\\|[$_]\\)+\\s 
*((\\|(\\)[^)]*)+" nil defun)
  
  ;; On another note, a working pattern for grabbing function definitions for C 
is
! ;;
  ;; ("^[a-zA-Z_]+.*[;{]$" nil ForestGreen)  ; global defns ( start at col 1 )
  ;; ("^[a-zA-Z_]+.*(" ")" defun)
  ;; ; defuns assumed to start at col 1, not with # or {
! ;;
  ;; this will make external declarations/definitions green, and function
  ;; definitions the defun face.  Hmmm - seems to work for me anyway.
  
***************
*** 1179,1185 ****
     ("\\(^[ \t]*[0-9]+\\|[ \t]continue[ \t\n]\\|format\\)" nil define)
     ("[ \t]\\(do\\|do[ \t]*[0-9]+\\|go[ \t]*to[ \t]*[0-9]+\\|end[ 
\t]*do\\|if\\|else[ \t]*if\\|then\\|else\\|end[ \t]*if\\)[ \t\n(]" nil define)
     ("[ 
\t]\\(call\\|program\\|subroutine\\|function\\|stop\\|return\\|end\\|include\\)[
 \t\n]" nil include)
!    ("[ \t]\\(parameter[\t\n ]*([^)]*)\\|data\\|save\\|common[ 
\t\n]*/[^/]*/\\)" 
      nil decl)
     ("^     ." nil type)
     ("implicit[ \t]*none" nil decl)
--- 1179,1185 ----
     ("\\(^[ \t]*[0-9]+\\|[ \t]continue[ \t\n]\\|format\\)" nil define)
     ("[ \t]\\(do\\|do[ \t]*[0-9]+\\|go[ \t]*to[ \t]*[0-9]+\\|end[ 
\t]*do\\|if\\|else[ \t]*if\\|then\\|else\\|end[ \t]*if\\)[ \t\n(]" nil define)
     ("[ 
\t]\\(call\\|program\\|subroutine\\|function\\|stop\\|return\\|end\\|include\\)[
 \t\n]" nil include)
!    ("[ \t]\\(parameter[\t\n ]*([^)]*)\\|data\\|save\\|common[ 
\t\n]*/[^/]*/\\)"
      nil decl)
     ("^     ." nil type)
     ("implicit[ \t]*none" nil decl)
***************
*** 1249,1255 ****
     ("[^\\]\\\\("  "\\\\)" formula)                   ; \( \)
     ("[^\\]\\\\\\[" "\\\\\\]" formula)                ; \[ \]
     ("[^\\$]\\(\\$\\(\\$[^$]*\\$\\|[^$]*\\)\\$\\)" 1 formula) ; '$...$' or 
'$$...$$'
!    
     ;; things that bring in external files
     ("\\\\\\(include\\|input\\|bibliography\\){" "}" include)
  
--- 1249,1255 ----
     ("[^\\]\\\\("  "\\\\)" formula)                   ; \( \)
     ("[^\\]\\\\\\[" "\\\\\\]" formula)                ; \[ \]
     ("[^\\$]\\(\\$\\(\\$[^$]*\\$\\|[^$]*\\)\\$\\)" 1 formula) ; '$...$' or 
'$$...$$'
! 
     ;; things that bring in external files
     ("\\\\\\(include\\|input\\|bibliography\\){" "}" include)
  
***************
*** 1334,1340 ****
   '(
     (";.*" nil comment)
  
! ;;; This almost works...but I think I'll stick with the parser function 
  ;;;("[^?]\\(\"\\(\"\\||\\([^\"]+\\|[\\]\\([\\][\\]\\)*\"\\)*\"\\)\\)" 1 
string)
     (hilit-string-find ?\\ string)
  
--- 1334,1340 ----
   '(
     (";.*" nil comment)
  
! ;;; This almost works...but I think I'll stick with the parser function
  ;;;("[^?]\\(\"\\(\"\\||\\([^\"]+\\|[\\]\\([\\][\\]\\)*\"\\)*\"\\)\\)" 1 
string)
     (hilit-string-find ?\\ string)
  
***************
*** 1352,1358 ****
   '(
     (";.*" nil comment)
     ("#|" "|#" comment)
! ;;; This almost works...but I think I'll stick with the parser function 
  ;;;("[^?]\\(\"\\(\"\\||\\([^\"]+\\|[\\]\\([\\][\\]\\)*\"\\)*\"\\)\\)" 1 
string)
     (hilit-string-find ?\\ string)
  
--- 1352,1358 ----
   '(
     (";.*" nil comment)
     ("#|" "|#" comment)
! ;;; This almost works...but I think I'll stick with the parser function
  ;;;("[^?]\\(\"\\(\"\\||\\([^\"]+\\|[\\]\\([\\][\\]\\)*\"\\)*\"\\)\\)" 1 
string)
     (hilit-string-find ?\\ string)
  
***************
*** 1490,1496 ****
  ;; Pascal, strings are delimited with ' and an embedded quote is doubled,
  ;; thus string syntax would be extremely simple. However, if a string
  ;; occurs within a comment, the following text is considered a string.
! ;; 
  ;; In Icon, strings are similar to C ones, but there are also charsets,
  ;; delimited with simple quotes. I could not manage to use both regexps at
  ;; the same time.
--- 1490,1496 ----
  ;; Pascal, strings are delimited with ' and an embedded quote is doubled,
  ;; thus string syntax would be extremely simple. However, if a string
  ;; occurs within a comment, the following text is considered a string.
! ;;
  ;; In Icon, strings are similar to C ones, but there are also charsets,
  ;; delimited with simple quotes. I could not manage to use both regexps at
  ;; the same time.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]