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

[Stefan Monnier]

Index: emacs/lisp/progmodes/simula.el
diff -c emacs/lisp/progmodes/simula.el:1.29 emacs/lisp/progmodes/simula.el:1.30
*** emacs/lisp/progmodes/simula.el:1.29 Tue Feb 11 16:19:36 2003
--- emacs/lisp/progmodes/simula.el      Mon Feb 24 20:45:55 2003
***************
*** 399,409 ****
          (font-lock-syntactic-keywords . simula-font-lock-syntactic-keywords)))
    (abbrev-mode 1))
  
- (if simula-abbrev-file
-     (read-abbrev-file simula-abbrev-file))
- (let (abbrevs-changed)
-   (simula-install-standard-abbrevs))
- 
  (defun simula-indent-exp ()
    "Indent SIMULA expression following point."
    (interactive)
--- 399,404 ----
***************
*** 1378,1385 ****
    "Define Simula keywords, procedures and classes in local abbrev table."
    ;; procedure and class names are as of the SIMULA 87 standard.
    (interactive)
!   (mapcar (function (lambda (args)
!                     (apply 'define-abbrev simula-mode-abbrev-table args)))
          '(("abs" "Abs" simula-expand-stdproc)
            ("accum" "Accum" simula-expand-stdproc)
            ("activate" "ACTIVATE" simula-expand-keyword)
--- 1373,1379 ----
    "Define Simula keywords, procedures and classes in local abbrev table."
    ;; procedure and class names are as of the SIMULA 87 standard.
    (interactive)
!   (dolist (args
          '(("abs" "Abs" simula-expand-stdproc)
            ("accum" "Accum" simula-expand-stdproc)
            ("activate" "ACTIVATE" simula-expand-keyword)
***************
*** 1609,1615 ****
            ("virtual" "VIRTUAL" simula-expand-keyword)
            ("wait" "Wait" simula-expand-stdproc)
            ("when" "WHEN" simula-electric-keyword)
!           ("while" "WHILE" simula-expand-keyword))))
  
  ;; Hilit mode support.
  (if (and (fboundp 'hilit-set-mode-patterns)
--- 1603,1616 ----
            ("virtual" "VIRTUAL" simula-expand-keyword)
            ("wait" "Wait" simula-expand-stdproc)
            ("when" "WHEN" simula-electric-keyword)
!           ("while" "WHILE" simula-expand-keyword)))
!     (define-abbrev simula-mode-abbrev-table
!       (nth 0 args) (nth 1 args) (nth 2 args) nil 'system)))
! 
! (if simula-abbrev-file
!     (read-abbrev-file simula-abbrev-file))
! (let (abbrevs-changed)
!   (simula-install-standard-abbrevs))
  
  ;; Hilit mode support.
  (if (and (fboundp 'hilit-set-mode-patterns)