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

[Stefan Monnier]

Index: emacs/lisp/progmodes/ada-stmt.el
diff -c emacs/lisp/progmodes/ada-stmt.el:1.10 
emacs/lisp/progmodes/ada-stmt.el:1.11
*** emacs/lisp/progmodes/ada-stmt.el:1.10       Mon Jul 16 03:46:48 2001
--- emacs/lisp/progmodes/ada-stmt.el    Tue Apr  9 14:55:13 2002
***************
*** 1,9 ****
  ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
  
! ;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999
  ;;   Free Software Foundation, Inc.
  
! ;; Ada Core Technologies's version:   $Revision: 1.10 $
  
  ;; This file is part of GNU Emacs.
  
--- 1,9 ----
  ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
  
! ;; Copyright(C) 1987, 93, 94, 96, 97, 98, 99, 2000
  ;;   Free Software Foundation, Inc.
  
! ;; Ada Core Technologies's version:   $Revision: 1.11 $ 
  
  ;; This file is part of GNU Emacs.
  
***************
*** 13,23 ****
  ;; Rolf Ebert's version: 2.26
  
  ;;; Commentary:
! 
! ;;
! ;; put the following statement in your .emacs:
! ;; (require 'ada-stmt)
! ;;
  
  ;;; History:
  
--- 13,20 ----
  ;; Rolf Ebert's version: 2.26
  
  ;;; Commentary:
! ;; This file is now automatically loaded from ada-mode.el, and creates a 
submenu
! ;; in Ada/ on the menu bar.
  
  ;;; History:
  
***************
*** 113,126 ****
                 ["When" ada-when t])))
      (if ada-xemacs
        (funcall (symbol-function 'add-submenu)
!                '("Ada") (append (list "Statements"
                                        :included '(string= mode-name "Ada"))
                                  menu))
  
!       (define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Statements]
        (list 'menu-item
!             "Statements"
!             (easy-menu-create-menu "Statements" menu)
              :visible '(string= mode-name "Ada"))
        t))))
  
--- 110,123 ----
                 ["When" ada-when t])))
      (if ada-xemacs
        (funcall (symbol-function 'add-submenu)
!                '("Ada") (append (list "Templates"
                                        :included '(string= mode-name "Ada"))
                                  menu))
  
!       (define-key-after (lookup-key ada-mode-map [menu-bar Ada]) [Templates]
        (list 'menu-item
!             "Templates"
!             (easy-menu-create-menu "Templates" menu)
              :visible '(string= mode-name "Ada"))
        t))))
  
***************
*** 132,138 ****
    (save-excursion
      (let ((case-fold-search t))
        (if (re-search-backward ada-procedure-start-regexp nil t)
!         (buffer-substring (match-beginning 2) (match-end 2))
        "NAME?"))))
  
  (defvar ada-template-map
--- 129,135 ----
    (save-excursion
      (let ((case-fold-search t))
        (if (re-search-backward ada-procedure-start-regexp nil t)
!         (buffer-substring (match-beginning 3) (match-end 3))
        "NAME?"))))
  
  (defvar ada-template-map
***************
*** 236,242 ****
  (define-skeleton ada-exit
    "Insert an exit statement, prompting for loop name and condition."
    "[name of loop to exit]: "
!   "exit " str & ?\  (ada-exit-1) | -1 ?\;)
  
  ;;;###autoload
  (defun ada-header ()
--- 233,239 ----
  (define-skeleton ada-exit
    "Insert an exit statement, prompting for loop name and condition."
    "[name of loop to exit]: "
!   "exit " str & ?\ (ada-exit-1) | -1 ?\;)
  
  ;;;###autoload
  (defun ada-header ()
***************
*** 532,538 ****
    "[accept name]: "
    > "accept " str
    (ada-get-param)
- ;;;  " (" ("[parameter_specification]: " str "; ") -2 ")"
    " do" \n
    > _ \n
    < "end " str ";" )
--- 529,534 ----
***************
*** 566,572 ****
    > "terminate;")
  
  
- ;; ----
  (defun ada-adjust-case-skeleton ()
    "Adjust the case of the text inserted by a skeleton."
    (save-excursion
--- 562,567 ----