[Emacs-diffs] Changes to emacs/lisp/progmodes/icon.el

[Miles Bader]

Index: emacs/lisp/progmodes/icon.el
diff -c emacs/lisp/progmodes/icon.el:1.25 emacs/lisp/progmodes/icon.el:1.26
*** emacs/lisp/progmodes/icon.el:1.25   Fri Nov  3 18:05:16 2000
--- emacs/lisp/progmodes/icon.el        Tue Feb  4 08:24:35 2003
***************
*** 46,52 ****
      (define-key icon-mode-map "\e\C-e" 'end-of-icon-defun)
      (define-key icon-mode-map "\e\C-q" 'indent-icon-exp)
      (define-key icon-mode-map "\177" 'backward-delete-char-untabify)
!   
      (define-key icon-mode-map [menu-bar] (make-sparse-keymap "Icon"))
      (define-key icon-mode-map [menu-bar icon]
        (cons "Icon" map))
--- 46,52 ----
      (define-key icon-mode-map "\e\C-e" 'end-of-icon-defun)
      (define-key icon-mode-map "\e\C-q" 'indent-icon-exp)
      (define-key icon-mode-map "\177" 'backward-delete-char-untabify)
! 
      (define-key icon-mode-map [menu-bar] (make-sparse-keymap "Icon"))
      (define-key icon-mode-map [menu-bar icon]
        (cons "Icon" map))
***************
*** 188,194 ****
    (setq comment-indent-function 'icon-comment-indent)
    (set (make-local-variable 'indent-line-function) 'icon-indent-line)
    ;; font-lock support
!   (setq font-lock-defaults  
        '((icon-font-lock-keywords
           icon-font-lock-keywords-1 icon-font-lock-keywords-2)
          nil nil ((?_ . "w")) beginning-of-defun
--- 188,194 ----
    (setq comment-indent-function 'icon-comment-indent)
    (set (make-local-variable 'indent-line-function) 'icon-indent-line)
    ;; font-lock support
!   (setq font-lock-defaults
        '((icon-font-lock-keywords
           icon-font-lock-keywords-1 icon-font-lock-keywords-2)
          nil nil ((?_ . "w")) beginning-of-defun
***************
*** 202,208 ****
    ;; we start from the assertion that `hs-special-modes-alist' is autoloaded.
    (unless (assq 'icon-mode hs-special-modes-alist)
      (setq hs-special-modes-alist
!         (cons '(icon-mode  "\\<procedure\\>" "\\<end\\>" nil 
                             icon-forward-sexp-function)
                hs-special-modes-alist)))
    (run-hooks 'icon-mode-hook))
--- 202,208 ----
    ;; we start from the assertion that `hs-special-modes-alist' is autoloaded.
    (unless (assq 'icon-mode hs-special-modes-alist)
      (setq hs-special-modes-alist
!         (cons '(icon-mode  "\\<procedure\\>" "\\<end\\>" nil
                             icon-forward-sexp-function)
                hs-special-modes-alist)))
    (run-hooks 'icon-mode-hook))
***************
*** 613,619 ****
    "Subdued level highlighting for Icon mode.")
  
  (defconst icon-font-lock-keywords-2
!   (append 
     icon-font-lock-keywords-1
     (eval-when-compile
       (list
--- 613,619 ----
    "Subdued level highlighting for Icon mode.")
  
  (defconst icon-font-lock-keywords-2
!   (append
     icon-font-lock-keywords-1
     (eval-when-compile
       (list
***************
*** 624,654 ****
         'font-lock-type-face)
        ;; Fontify all keywords.
        ;;
!       (cons 
!        (regexp-opt 
!       '("break" "do" "next" "repeat" "to" "by" "else" "if" "not" "return" 
!         "until" "case" "of" "while" "create" "every" "suspend" "default" 
          "fail" "record" "then") 'words)
         'font-lock-keyword-face)
!       ;; "end" "initial" 
        (cons (regexp-opt '("end" "initial") 'words)
            'font-lock-builtin-face)
        ;; Fontify all system variables.
!       (cons 
!        (regexp-opt 
!       '("&allocated" "&ascii" "&clock" "&col" "&collections" "&column" 
          "&control" "&cset" "&current" "&date" "&dateline" "&digits" "&dump"
!         "&e" "&error" "&errornumber" "&errortext" "&errorvalue" "&errout" 
!         "&eventcode" "&eventsource" "&eventvalue" "&fail" "&features" 
!         "&file" "&host" "&input" "&interval" "&lcase" "&ldrag" "&letters" 
!         "&level" "&line" "&lpress" "&lrelease" "&main" "&mdrag" "&meta" 
!         "&mpress" "&mrelease" "&null" "&output" "&phi" "&pi" "&pos" 
!         "&progname" "&random" "&rdrag" "&regions" "&resize" "&row" 
!         "&rpress" "&rrelease" "&shift" "&source" "&storage" "&subject" 
          "&time" "&trace" "&ucase" "&version" "&window" "&x" "&y") t)
         'font-lock-constant-face)
        (cons      ;; global local static declarations and link files
!        (concat 
        "^[ \t]*"
        (regexp-opt '("global" "link" "local" "static") t)
        "\\(\\sw+\\>\\)*")
--- 624,654 ----
         'font-lock-type-face)
        ;; Fontify all keywords.
        ;;
!       (cons
!        (regexp-opt
!       '("break" "do" "next" "repeat" "to" "by" "else" "if" "not" "return"
!         "until" "case" "of" "while" "create" "every" "suspend" "default"
          "fail" "record" "then") 'words)
         'font-lock-keyword-face)
!       ;; "end" "initial"
        (cons (regexp-opt '("end" "initial") 'words)
            'font-lock-builtin-face)
        ;; Fontify all system variables.
!       (cons
!        (regexp-opt
!       '("&allocated" "&ascii" "&clock" "&col" "&collections" "&column"
          "&control" "&cset" "&current" "&date" "&dateline" "&digits" "&dump"
!         "&e" "&error" "&errornumber" "&errortext" "&errorvalue" "&errout"
!         "&eventcode" "&eventsource" "&eventvalue" "&fail" "&features"
!         "&file" "&host" "&input" "&interval" "&lcase" "&ldrag" "&letters"
!         "&level" "&line" "&lpress" "&lrelease" "&main" "&mdrag" "&meta"
!         "&mpress" "&mrelease" "&null" "&output" "&phi" "&pi" "&pos"
!         "&progname" "&random" "&rdrag" "&regions" "&resize" "&row"
!         "&rpress" "&rrelease" "&shift" "&source" "&storage" "&subject"
          "&time" "&trace" "&ucase" "&version" "&window" "&x" "&y") t)
         'font-lock-constant-face)
        (cons      ;; global local static declarations and link files
!        (concat
        "^[ \t]*"
        (regexp-opt '("global" "link" "local" "static") t)
        "\\(\\sw+\\>\\)*")
***************
*** 660,672 ****
               font-lock-variable-name-face)))))
  
        (cons      ;; $define $elif $ifdef $ifndef $undef
!        (concat "^" 
               (regexp-opt'("$define" "$elif" "$ifdef" "$ifndef" "$undef") t)
               "\\>[ \t]*\\([^ \t\n]+\\)?")
!           '((1 font-lock-builtin-face) 
              (4 font-lock-variable-name-face nil t)))
!       (cons      ;; $dump $endif $else $include 
!        (concat 
        "^" (regexp-opt'("$dump" "$endif" "$else" "$include") t) "\\>" )
         'font-lock-builtin-face)
        (cons      ;; $warning $error
--- 660,672 ----
               font-lock-variable-name-face)))))
  
        (cons      ;; $define $elif $ifdef $ifndef $undef
!        (concat "^"
               (regexp-opt'("$define" "$elif" "$ifdef" "$ifndef" "$undef") t)
               "\\>[ \t]*\\([^ \t\n]+\\)?")
!           '((1 font-lock-builtin-face)
              (4 font-lock-variable-name-face nil t)))
!       (cons      ;; $dump $endif $else $include
!        (concat
        "^" (regexp-opt'("$dump" "$endif" "$else" "$include") t) "\\>" )
         'font-lock-builtin-face)
        (cons      ;; $warning $error