Commit 6f9a4ce2 authored by Glenn Morris's avatar Glenn Morris
Browse files

(fortran-mode-abbrev-table): Handle `define-abbrev' with either 5

or 6 arguments.
parent 1169bd86
2002-12-12 Glenn Morris <gmorris@ast.cam.ac.uk>
* progmodes/fortran.el (fortran-mode-abbrev-table): Handle
`define-abbrev' with either 5 or 6 arguments.
2002-12-12 Markus Rost <rost@math.ohio-state.edu> 2002-12-12 Markus Rost <rost@math.ohio-state.edu>
   
* international/mule-cmds.el (current-language-environment): Fix * international/mule-cmds.el (current-language-environment): Fix
......
...@@ -486,67 +486,76 @@ These get fixed-format comments fontified.") ...@@ -486,67 +486,76 @@ These get fixed-format comments fontified.")
"Keymap used in Fortran mode.") "Keymap used in Fortran mode.")
(defvar fortran-mode-abbrev-table (defvar fortran-mode-abbrev-table
(let ((ac abbrevs-changed)) (let (abbrevs-changed)
(define-abbrev-table 'fortran-mode-abbrev-table ()) (define-abbrev-table 'fortran-mode-abbrev-table nil)
(define-abbrev fortran-mode-abbrev-table ";au" "automatic" nil 0 t) ;; Use the 6th arg (SYSTEM-FLAG) of define-abbrev if possible.
(define-abbrev fortran-mode-abbrev-table ";b" "byte" nil 0 t) ;; Only use `apply' to quieten the byte-compiler.
(define-abbrev fortran-mode-abbrev-table ";bd" "block data" nil 0 t) (mapcar
(define-abbrev fortran-mode-abbrev-table ";ch" "character" nil 0 t) (function (lambda (element)
(define-abbrev fortran-mode-abbrev-table ";cl" "close" nil 0 t) (condition-case nil
(define-abbrev fortran-mode-abbrev-table ";c" "continue" nil 0 t) (apply 'define-abbrev fortran-mode-abbrev-table
(define-abbrev fortran-mode-abbrev-table ";cm" "common" nil 0 t) (append element '(nil 0 t)))
(define-abbrev fortran-mode-abbrev-table ";cx" "complex" nil 0 t) (wrong-number-of-arguments
(define-abbrev fortran-mode-abbrev-table ";df" "define" nil 0 t) (apply 'define-abbrev fortran-mode-abbrev-table
(define-abbrev fortran-mode-abbrev-table ";di" "dimension" nil 0 t) (append element '(nil 0)))))))
(define-abbrev fortran-mode-abbrev-table ";do" "double" nil 0 t) '((";au" "automatic" )
(define-abbrev fortran-mode-abbrev-table ";dc" "double complex" nil 0 t) (";b" "byte" )
(define-abbrev fortran-mode-abbrev-table ";dp" "double precision" nil 0 t) (";bd" "block data" )
(define-abbrev fortran-mode-abbrev-table ";dw" "do while" nil 0 t) (";ch" "character" )
(define-abbrev fortran-mode-abbrev-table ";e" "else" nil 0 t) (";cl" "close" )
(define-abbrev fortran-mode-abbrev-table ";ed" "enddo" nil 0 t) (";c" "continue" )
(define-abbrev fortran-mode-abbrev-table ";el" "elseif" nil 0 t) (";cm" "common" )
(define-abbrev fortran-mode-abbrev-table ";en" "endif" nil 0 t) (";cx" "complex" )
(define-abbrev fortran-mode-abbrev-table ";eq" "equivalence" nil 0 t) (";df" "define" )
(define-abbrev fortran-mode-abbrev-table ";ew" "endwhere" nil 0 t) (";di" "dimension" )
(define-abbrev fortran-mode-abbrev-table ";ex" "external" nil 0 t) (";do" "double" )
(define-abbrev fortran-mode-abbrev-table ";ey" "entry" nil 0 t) (";dc" "double complex" )
(define-abbrev fortran-mode-abbrev-table ";f" "format" nil 0 t) (";dp" "double precision" )
(define-abbrev fortran-mode-abbrev-table ";fa" ".false." nil 0 t) (";dw" "do while" )
(define-abbrev fortran-mode-abbrev-table ";fu" "function" nil 0 t) (";e" "else" )
(define-abbrev fortran-mode-abbrev-table ";g" "goto" nil 0 t) (";ed" "enddo" )
(define-abbrev fortran-mode-abbrev-table ";im" "implicit" nil 0 t) (";el" "elseif" )
(define-abbrev fortran-mode-abbrev-table ";ib" "implicit byte" nil 0 t) (";en" "endif" )
(define-abbrev fortran-mode-abbrev-table ";ic" "implicit complex" nil 0 t) (";eq" "equivalence" )
(define-abbrev fortran-mode-abbrev-table ";ich" "implicit character" nil 0 t) (";ew" "endwhere" )
(define-abbrev fortran-mode-abbrev-table ";ii" "implicit integer" nil 0 t) (";ex" "external" )
(define-abbrev fortran-mode-abbrev-table ";il" "implicit logical" nil 0 t) (";ey" "entry" )
(define-abbrev fortran-mode-abbrev-table ";ir" "implicit real" nil 0 t) (";f" "format" )
(define-abbrev fortran-mode-abbrev-table ";inc" "include" nil 0 t) (";fa" ".false." )
(define-abbrev fortran-mode-abbrev-table ";in" "integer" nil 0 t) (";fu" "function" )
(define-abbrev fortran-mode-abbrev-table ";intr" "intrinsic" nil 0 t) (";g" "goto" )
(define-abbrev fortran-mode-abbrev-table ";l" "logical" nil 0 t) (";im" "implicit" )
(define-abbrev fortran-mode-abbrev-table ";n" "namelist" nil 0 t) (";ib" "implicit byte" )
(define-abbrev fortran-mode-abbrev-table ";o" "open" nil 0 t) ; was ;op (";ic" "implicit complex" )
(define-abbrev fortran-mode-abbrev-table ";pa" "parameter" nil 0 t) (";ich" "implicit character")
(define-abbrev fortran-mode-abbrev-table ";pr" "program" nil 0 t) (";ii" "implicit integer" )
(define-abbrev fortran-mode-abbrev-table ";ps" "pause" nil 0 t) (";il" "implicit logical" )
(define-abbrev fortran-mode-abbrev-table ";p" "print" nil 0 t) (";ir" "implicit real" )
(define-abbrev fortran-mode-abbrev-table ";rc" "record" nil 0 t) (";inc" "include" )
(define-abbrev fortran-mode-abbrev-table ";re" "real" nil 0 t) (";in" "integer" )
(define-abbrev fortran-mode-abbrev-table ";r" "read" nil 0 t) (";intr" "intrinsic" )
(define-abbrev fortran-mode-abbrev-table ";rt" "return" nil 0 t) (";l" "logical" )
(define-abbrev fortran-mode-abbrev-table ";rw" "rewind" nil 0 t) (";n" "namelist" )
(define-abbrev fortran-mode-abbrev-table ";s" "stop" nil 0 t) (";o" "open" ) ; was ;op
(define-abbrev fortran-mode-abbrev-table ";sa" "save" nil 0 t) (";pa" "parameter" )
(define-abbrev fortran-mode-abbrev-table ";st" "structure" nil 0 t) (";pr" "program" )
(define-abbrev fortran-mode-abbrev-table ";sc" "static" nil 0 t) (";ps" "pause" )
(define-abbrev fortran-mode-abbrev-table ";su" "subroutine" nil 0 t) (";p" "print" )
(define-abbrev fortran-mode-abbrev-table ";tr" ".true." nil 0 t) (";rc" "record" )
(define-abbrev fortran-mode-abbrev-table ";ty" "type" nil 0 t) (";re" "real" )
(define-abbrev fortran-mode-abbrev-table ";vo" "volatile" nil 0 t) (";r" "read" )
(define-abbrev fortran-mode-abbrev-table ";w" "write" nil 0 t) (";rt" "return" )
(define-abbrev fortran-mode-abbrev-table ";wh" "where" nil 0 t) (";rw" "rewind" )
(setq abbrevs-changed ac) (";s" "stop" )
(";sa" "save" )
(";st" "structure" )
(";sc" "static" )
(";su" "subroutine" )
(";tr" ".true." )
(";ty" "type" )
(";vo" "volatile" )
(";w" "write" )
(";wh" "where" )))
fortran-mode-abbrev-table)) fortran-mode-abbrev-table))
(eval-when-compile ; silence compiler (eval-when-compile ; silence compiler
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment