comparison lisp/progmodes/ada-stmt.el @ 73933:f047602e0a17

(ada-func-or-proc-name): Match changes to ada-procedure-start-regexp. (ada-or-accept, ada-or-delay, ada-or-terminate): Improve doc string.
author Juanma Barranquero <lekktu@gmail.com>
date Sun, 12 Nov 2006 16:56:53 +0000
parents 0058ef19e376
children e3694f1cb928 c71725faff1a dbe3f29e61d6
comparison
equal deleted inserted replaced
73932:242a56e8b2c0 73933:f047602e0a17
65 (defun ada-func-or-proc-name () 65 (defun ada-func-or-proc-name ()
66 "Return the name of the current function or procedure." 66 "Return the name of the current function or procedure."
67 (save-excursion 67 (save-excursion
68 (let ((case-fold-search t)) 68 (let ((case-fold-search t))
69 (if (re-search-backward ada-procedure-start-regexp nil t) 69 (if (re-search-backward ada-procedure-start-regexp nil t)
70 (buffer-substring (match-beginning 3) (match-end 3)) 70 (match-string 5)
71 "NAME?")))) 71 "NAME?"))))
72 72
73 ;;; ---- statement skeletons ------------------------------------------ 73 ;;; ---- statement skeletons ------------------------------------------
74 74
75 (define-skeleton ada-array 75 (define-skeleton ada-array
443 > (ada-accept-1) & " =>\n" 443 > (ada-accept-1) & " =>\n"
444 (ada-accept-2)) 444 (ada-accept-2))
445 445
446 446
447 (define-skeleton ada-or-accept 447 (define-skeleton ada-or-accept
448 "Insert an or statement, prompting for the condition name." 448 "Insert an accept alternative, prompting for the condition name."
449 () 449 ()
450 < "or\n" 450 < "or\n"
451 (ada-accept)) 451 (ada-accept))
452 452
453 453
454 (define-skeleton ada-or-delay 454 (define-skeleton ada-or-delay
455 "Insert a delay statement, prompting for the delay value." 455 "Insert a delay alternative, prompting for the delay value."
456 "[delay value]: " 456 "[delay value]: "
457 < "or\n" 457 < "or\n"
458 > "delay " str ";") 458 > "delay " str ";")
459 459
460 460
461 (define-skeleton ada-or-terminate 461 (define-skeleton ada-or-terminate
462 "Insert a terminate statement." 462 "Insert a terminate alternative."
463 () 463 ()
464 < "or\n" 464 < "or\n"
465 > "terminate;") 465 > "terminate;")
466 466
467 467