diff options
| author | Glenn Morris | 2002-12-12 01:06:54 +0000 |
|---|---|---|
| committer | Glenn Morris | 2002-12-12 01:06:54 +0000 |
| commit | 6f9a4ce206ef613263e8978a270b78d2744bea49 (patch) | |
| tree | 56e885c3f2a7000d589580c08ba9ad628fb651c9 | |
| parent | 1169bd863a0a7a8c9a49039e4dd1a9860845cf1d (diff) | |
| download | emacs-6f9a4ce206ef613263e8978a270b78d2744bea49.tar.gz emacs-6f9a4ce206ef613263e8978a270b78d2744bea49.zip | |
(fortran-mode-abbrev-table): Handle `define-abbrev' with either 5
or 6 arguments.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/fortran.el | 131 |
2 files changed, 75 insertions, 61 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 59736b5d272..c4f6c795ad5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-12-12 Glenn Morris <gmorris@ast.cam.ac.uk> | ||
| 2 | |||
| 3 | * progmodes/fortran.el (fortran-mode-abbrev-table): Handle | ||
| 4 | `define-abbrev' with either 5 or 6 arguments. | ||
| 5 | |||
| 1 | 2002-12-12 Markus Rost <rost@math.ohio-state.edu> | 6 | 2002-12-12 Markus Rost <rost@math.ohio-state.edu> |
| 2 | 7 | ||
| 3 | * international/mule-cmds.el (current-language-environment): Fix | 8 | * international/mule-cmds.el (current-language-environment): Fix |
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index af9f9d1fb18..93a25636657 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el | |||
| @@ -486,67 +486,76 @@ These get fixed-format comments fontified.") | |||
| 486 | "Keymap used in Fortran mode.") | 486 | "Keymap used in Fortran mode.") |
| 487 | 487 | ||
| 488 | (defvar fortran-mode-abbrev-table | 488 | (defvar fortran-mode-abbrev-table |
| 489 | (let ((ac abbrevs-changed)) | 489 | (let (abbrevs-changed) |
| 490 | (define-abbrev-table 'fortran-mode-abbrev-table ()) | 490 | (define-abbrev-table 'fortran-mode-abbrev-table nil) |
| 491 | (define-abbrev fortran-mode-abbrev-table ";au" "automatic" nil 0 t) | 491 | ;; Use the 6th arg (SYSTEM-FLAG) of define-abbrev if possible. |
| 492 | (define-abbrev fortran-mode-abbrev-table ";b" "byte" nil 0 t) | 492 | ;; Only use `apply' to quieten the byte-compiler. |
| 493 | (define-abbrev fortran-mode-abbrev-table ";bd" "block data" nil 0 t) | 493 | (mapcar |
| 494 | (define-abbrev fortran-mode-abbrev-table ";ch" "character" nil 0 t) | 494 | (function (lambda (element) |
| 495 | (define-abbrev fortran-mode-abbrev-table ";cl" "close" nil 0 t) | 495 | (condition-case nil |
| 496 | (define-abbrev fortran-mode-abbrev-table ";c" "continue" nil 0 t) | 496 | (apply 'define-abbrev fortran-mode-abbrev-table |
| 497 | (define-abbrev fortran-mode-abbrev-table ";cm" "common" nil 0 t) | 497 | (append element '(nil 0 t))) |
| 498 | (define-abbrev fortran-mode-abbrev-table ";cx" "complex" nil 0 t) | 498 | (wrong-number-of-arguments |
| 499 | (define-abbrev fortran-mode-abbrev-table ";df" "define" nil 0 t) | 499 | (apply 'define-abbrev fortran-mode-abbrev-table |
| 500 | (define-abbrev fortran-mode-abbrev-table ";di" "dimension" nil 0 t) | 500 | (append element '(nil 0))))))) |
| 501 | (define-abbrev fortran-mode-abbrev-table ";do" "double" nil 0 t) | 501 | '((";au" "automatic" ) |
| 502 | (define-abbrev fortran-mode-abbrev-table ";dc" "double complex" nil 0 t) | 502 | (";b" "byte" ) |
| 503 | (define-abbrev fortran-mode-abbrev-table ";dp" "double precision" nil 0 t) | 503 | (";bd" "block data" ) |
| 504 | (define-abbrev fortran-mode-abbrev-table ";dw" "do while" nil 0 t) | 504 | (";ch" "character" ) |
| 505 | (define-abbrev fortran-mode-abbrev-table ";e" "else" nil 0 t) | 505 | (";cl" "close" ) |
| 506 | (define-abbrev fortran-mode-abbrev-table ";ed" "enddo" nil 0 t) | 506 | (";c" "continue" ) |
| 507 | (define-abbrev fortran-mode-abbrev-table ";el" "elseif" nil 0 t) | 507 | (";cm" "common" ) |
| 508 | (define-abbrev fortran-mode-abbrev-table ";en" "endif" nil 0 t) | 508 | (";cx" "complex" ) |
| 509 | (define-abbrev fortran-mode-abbrev-table ";eq" "equivalence" nil 0 t) | 509 | (";df" "define" ) |
| 510 | (define-abbrev fortran-mode-abbrev-table ";ew" "endwhere" nil 0 t) | 510 | (";di" "dimension" ) |
| 511 | (define-abbrev fortran-mode-abbrev-table ";ex" "external" nil 0 t) | 511 | (";do" "double" ) |
| 512 | (define-abbrev fortran-mode-abbrev-table ";ey" "entry" nil 0 t) | 512 | (";dc" "double complex" ) |
| 513 | (define-abbrev fortran-mode-abbrev-table ";f" "format" nil 0 t) | 513 | (";dp" "double precision" ) |
| 514 | (define-abbrev fortran-mode-abbrev-table ";fa" ".false." nil 0 t) | 514 | (";dw" "do while" ) |
| 515 | (define-abbrev fortran-mode-abbrev-table ";fu" "function" nil 0 t) | 515 | (";e" "else" ) |
| 516 | (define-abbrev fortran-mode-abbrev-table ";g" "goto" nil 0 t) | 516 | (";ed" "enddo" ) |
| 517 | (define-abbrev fortran-mode-abbrev-table ";im" "implicit" nil 0 t) | 517 | (";el" "elseif" ) |
| 518 | (define-abbrev fortran-mode-abbrev-table ";ib" "implicit byte" nil 0 t) | 518 | (";en" "endif" ) |
| 519 | (define-abbrev fortran-mode-abbrev-table ";ic" "implicit complex" nil 0 t) | 519 | (";eq" "equivalence" ) |
| 520 | (define-abbrev fortran-mode-abbrev-table ";ich" "implicit character" nil 0 t) | 520 | (";ew" "endwhere" ) |
| 521 | (define-abbrev fortran-mode-abbrev-table ";ii" "implicit integer" nil 0 t) | 521 | (";ex" "external" ) |
| 522 | (define-abbrev fortran-mode-abbrev-table ";il" "implicit logical" nil 0 t) | 522 | (";ey" "entry" ) |
| 523 | (define-abbrev fortran-mode-abbrev-table ";ir" "implicit real" nil 0 t) | 523 | (";f" "format" ) |
| 524 | (define-abbrev fortran-mode-abbrev-table ";inc" "include" nil 0 t) | 524 | (";fa" ".false." ) |
| 525 | (define-abbrev fortran-mode-abbrev-table ";in" "integer" nil 0 t) | 525 | (";fu" "function" ) |
| 526 | (define-abbrev fortran-mode-abbrev-table ";intr" "intrinsic" nil 0 t) | 526 | (";g" "goto" ) |
| 527 | (define-abbrev fortran-mode-abbrev-table ";l" "logical" nil 0 t) | 527 | (";im" "implicit" ) |
| 528 | (define-abbrev fortran-mode-abbrev-table ";n" "namelist" nil 0 t) | 528 | (";ib" "implicit byte" ) |
| 529 | (define-abbrev fortran-mode-abbrev-table ";o" "open" nil 0 t) ; was ;op | 529 | (";ic" "implicit complex" ) |
| 530 | (define-abbrev fortran-mode-abbrev-table ";pa" "parameter" nil 0 t) | 530 | (";ich" "implicit character") |
| 531 | (define-abbrev fortran-mode-abbrev-table ";pr" "program" nil 0 t) | 531 | (";ii" "implicit integer" ) |
| 532 | (define-abbrev fortran-mode-abbrev-table ";ps" "pause" nil 0 t) | 532 | (";il" "implicit logical" ) |
| 533 | (define-abbrev fortran-mode-abbrev-table ";p" "print" nil 0 t) | 533 | (";ir" "implicit real" ) |
| 534 | (define-abbrev fortran-mode-abbrev-table ";rc" "record" nil 0 t) | 534 | (";inc" "include" ) |
| 535 | (define-abbrev fortran-mode-abbrev-table ";re" "real" nil 0 t) | 535 | (";in" "integer" ) |
| 536 | (define-abbrev fortran-mode-abbrev-table ";r" "read" nil 0 t) | 536 | (";intr" "intrinsic" ) |
| 537 | (define-abbrev fortran-mode-abbrev-table ";rt" "return" nil 0 t) | 537 | (";l" "logical" ) |
| 538 | (define-abbrev fortran-mode-abbrev-table ";rw" "rewind" nil 0 t) | 538 | (";n" "namelist" ) |
| 539 | (define-abbrev fortran-mode-abbrev-table ";s" "stop" nil 0 t) | 539 | (";o" "open" ) ; was ;op |
| 540 | (define-abbrev fortran-mode-abbrev-table ";sa" "save" nil 0 t) | 540 | (";pa" "parameter" ) |
| 541 | (define-abbrev fortran-mode-abbrev-table ";st" "structure" nil 0 t) | 541 | (";pr" "program" ) |
| 542 | (define-abbrev fortran-mode-abbrev-table ";sc" "static" nil 0 t) | 542 | (";ps" "pause" ) |
| 543 | (define-abbrev fortran-mode-abbrev-table ";su" "subroutine" nil 0 t) | 543 | (";p" "print" ) |
| 544 | (define-abbrev fortran-mode-abbrev-table ";tr" ".true." nil 0 t) | 544 | (";rc" "record" ) |
| 545 | (define-abbrev fortran-mode-abbrev-table ";ty" "type" nil 0 t) | 545 | (";re" "real" ) |
| 546 | (define-abbrev fortran-mode-abbrev-table ";vo" "volatile" nil 0 t) | 546 | (";r" "read" ) |
| 547 | (define-abbrev fortran-mode-abbrev-table ";w" "write" nil 0 t) | 547 | (";rt" "return" ) |
| 548 | (define-abbrev fortran-mode-abbrev-table ";wh" "where" nil 0 t) | 548 | (";rw" "rewind" ) |
| 549 | (setq abbrevs-changed ac) | 549 | (";s" "stop" ) |
| 550 | (";sa" "save" ) | ||
| 551 | (";st" "structure" ) | ||
| 552 | (";sc" "static" ) | ||
| 553 | (";su" "subroutine" ) | ||
| 554 | (";tr" ".true." ) | ||
| 555 | (";ty" "type" ) | ||
| 556 | (";vo" "volatile" ) | ||
| 557 | (";w" "write" ) | ||
| 558 | (";wh" "where" ))) | ||
| 550 | fortran-mode-abbrev-table)) | 559 | fortran-mode-abbrev-table)) |
| 551 | 560 | ||
| 552 | (eval-when-compile ; silence compiler | 561 | (eval-when-compile ; silence compiler |