emacs: lisp/progmodes/ada-mode.el comparison

comparison lisp/progmodes/ada-mode.el @ 38446:f63fbebe03fb

(ada-mode): Avoid unneeded version checks. Don't change compile-auto-highlight globally. Don't bother with `font-lock-defaults' property since XEmacs also understands the `font-lock-defaults' variable. Use make-local-variable rather than make-variable-buffer-local. Don't `defconst' comment-indent-function: keep the default. Call easy-menu-add unconditionally. (ada-create-keymap): Use [(shift tab)] so it works on both Emacsen. (ada-create-menu): Use :included for Emacs as well.

author	Stefan Monnier <monnier@iro.umontreal.ca>
date	Mon, 16 Jul 2001 15:12:19 +0000
parents	7a94f1c588c4
children	39ee7e7e2200

comparison

equal deleted inserted replaced

-:d91aa21f1e78
+:f63fbebe03fb
 ;; Author: Rolf Ebert      <ebert@inf.enst.fr>
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Emmanuel Briot <briot@gnat.com>
-;; Ada Core Technologies's version:   $Revision: 1.41 $
+;; Ada Core Technologies's version:   $Revision: 1.42 $
 ;; Keywords: languages ada
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;;; This is a major rewrite of the file packaged with Emacs-20.  The
 ;;; ada-mode is composed of four lisp file, ada-mode.el, ada-xref.el,
 ;;; ada-prj.el and ada-stmt.el. Only this file (ada-mode.el) is
 ;;; completely independent from the GNU Ada compiler Gnat, distributed
 ;;; by Ada Core Technologies. All the other files rely heavily on
-;;; features provides only by Gnat.
+;;; features provided only by Gnat.
 ;;;
 ;;; Note: this mode will not work with Emacs 19. If you are on a VMS
 ;;; system, where the latest version of Emacs is 19.28, you will need
 ;;; another file, called ada-vms.el, that provides some required
 ;;; functions.
 (set (make-local-variable 'comment-column) 40)
 ;;  Emacs 20.3 defines a comment-padding to insert spaces between
 ;;  the comment and the text. We do not want any, this is already
 ;;  included in comment-start
-(unless ada-xemacs
+(set (make-local-variable 'comment-padding) 0)
-(progn
+(set (make-local-variable 'parse-sexp-ignore-comments) t)
-(if (ada-check-emacs-version 20 3)
+(set (make-local-variable 'parse-sexp-lookup-properties) t)
-(progn
-(set (make-local-variable 'parse-sexp-ignore-comments) t)
-(set (make-local-variable 'comment-padding) 0)))
-(set (make-local-variable 'parse-sexp-lookup-properties) t)
-))
 (setq case-fold-search t)
-(if (boundp 'imenu-case-fold-search)
+(setq imenu-case-fold-search t)
-(setq imenu-case-fold-search t))
 (set (make-local-variable 'fill-paragraph-function)
 'ada-fill-comment-paragraph)
 (set (make-local-variable 'imenu-generic-expression)
 ;;  Support for compile.el
 ;;  We just substitute our own functions to go to the error.
 (add-hook 'compilation-mode-hook
 (lambda()
-	      (setq compile-auto-highlight 40)
+	      (set (make-local-variable 'compile-auto-highlight) 40)
+	      ;; FIXME: This has global impact!  -stef
 	      (define-key compilation-minor-mode-map [mouse-2]
 		'ada-compile-mouse-goto-error)
 	      (define-key compilation-minor-mode-map "\C-c\C-c"
 		'ada-compile-goto-error)
 	      (define-key compilation-minor-mode-map "\C-m"
-		'ada-compile-goto-error)
+		'ada-compile-goto-error)))
-	      ))
+;;  font-lock support
-;;  font-lock support :
+(set (make-local-variable 'font-lock-defaults)
-;;  We need to set some properties for XEmacs, and define some variables
+'(ada-font-lock-keywords
-;;  for Emacs
+	 nil t
+	 ((?\_ . "w") (?# . "."))
-(if ada-xemacs
+	 beginning-of-line
-;;  XEmacs
+	 (font-lock-syntactic-keywords . ada-font-lock-syntactic-keywords)))
-(put 'ada-mode 'font-lock-defaults
-'(ada-font-lock-keywords
-nil t ((?\_ . "w") (?# . ".")) beginning-of-line))
-;;  Emacs
-(set (make-local-variable 'font-lock-defaults)
-'(ada-font-lock-keywords
-nil t
-((?\_ . "w") (?# . "."))
-beginning-of-line
-(font-lock-syntactic-keywords . ada-font-lock-syntactic-keywords)))
-)
 ;; Set up support for find-file.el.
-(set (make-variable-buffer-local 'ff-other-file-alist)
+(set (make-local-variable 'ff-other-file-alist)
 'ada-other-file-alist)
-(set (make-variable-buffer-local 'ff-search-directories)
+(set (make-local-variable 'ff-search-directories)
 'ada-search-directories)
 (setq ff-post-load-hooks    'ada-set-point-accordingly
 ff-file-created-hooks 'ada-make-body)
 (add-hook 'ff-pre-load-hooks 'ada-which-function-are-we-in)
 (define-abbrev-table 'ada-mode-abbrev-table ())
 (setq local-abbrev-table ada-mode-abbrev-table)
 ;;  Support for indent-new-comment-line (Especially for XEmacs)
 (setq comment-multi-line nil)
-(defconst comment-indent-function (lambda () comment-column))
 (setq major-mode 'ada-mode)
 (setq mode-name "Ada")
 (use-local-map ada-mode-map)
-(if ada-xemacs
+(easy-menu-add ada-mode-menu ada-mode-map)
-(funcall (symbol-function 'easy-menu-add)
-ada-mode-menu ada-mode-map))
 (set-syntax-table ada-mode-syntax-table)
 (if ada-clean-buffer-before-saving
 (progn
 ;;  Run this after the hook to give the users a chance to activate
 ;;  font-lock-mode
 (unless ada-xemacs
-(progn
+(ada-initialize-properties)
-(ada-initialize-properties)
+(make-local-hook 'font-lock-mode-hook)
-(make-local-hook 'font-lock-mode-hook)
+(add-hook 'font-lock-mode-hook 'ada-deactivate-properties nil t))
-(add-hook 'font-lock-mode-hook 'ada-deactivate-properties nil t)))
 ;; the following has to be done after running the ada-mode-hook
 ;; because users might want to set the values of these variable
 ;; inside the hook (MH)
 (define-key ada-mode-map "\C-j"     'ada-indent-newline-indent-conditional)
 (define-key ada-mode-map "\C-m"     'ada-indent-newline-indent-conditional)
 (define-key ada-mode-map "\t"       'ada-tab)
 (define-key ada-mode-map "\C-c\t"   'ada-justified-indent-current)
 (define-key ada-mode-map "\C-c\C-l" 'ada-indent-region)
-(if ada-xemacs
+(define-key ada-mode-map [(shift tab)]    'ada-untab)
-(define-key ada-mode-map '(shift tab)    'ada-untab)
-(define-key ada-mode-map [S-tab]    'ada-untab))
 (define-key ada-mode-map "\C-c\C-f" 'ada-format-paramlist)
 ;; We don't want to make meta-characters case-specific.
 ;; Movement
 (define-key ada-mode-map "\M-\C-e"  'ada-next-procedure)
 ["Make body for subprogram" ada-make-subprogram-body t]))
 )
 ;; Option menu present only if in Ada mode
-(setq m (append m (list (append (list "Options"
+(setq m (append m (list (append '("Options"
-(if ada-xemacs :included  :visible)
+				      :included (eq major-mode 'ada-mode))
-'(string= mode-name "Ada"))
 option))))
 ;; Customize menu always present
-(setq m (append m '(["Customize" (customize-group 'ada)
+(when (fboundp 'customize-group)
-(>= emacs-major-version 20)])))
+(setq m (append m '(["Customize" (customize-group 'ada)]))))
 ;; Goto and Edit menus present only if in Ada mode
-(setq m (append m (list (append (list "Goto"
+(setq m (append m (list (append '("Goto"
-(if ada-xemacs :included :visible)
+				      :included (eq major-mode 'ada-mode))
-'(string= mode-name "Ada"))
 goto)
-(append (list "Edit"
+(append '("Edit"
-(if ada-xemacs :included :visible)
+				      :included (eq major-mode 'ada-mode))
-'(string= mode-name "Ada"))
 edit))))
 (easy-menu-define ada-mode-menu ada-mode-map "Menu keymap for Ada mode" m)
-(if ada-xemacs
+(easy-menu-add ada-mode-menu ada-mode-map)
-(progn
+(when ada-xemacs
-(easy-menu-add ada-mode-menu ada-mode-map)
+;; This looks bogus to me!   -stef
 (define-key ada-mode-map [menu-bar] ada-mode-menu)
-(setq mode-popup-menu (cons "Ada mode" ada-mode-menu)))
+(setq mode-popup-menu (cons "Ada mode" ada-mode-menu)))))
-)
-))
 ;; -------------------------------------------------------
 ;;     Commenting/Uncommenting code
 ;;  The following two calls are provided to enhance the standard

Mercurial > emacs

comparison lisp/progmodes/ada-mode.el @ 38446:f63fbebe03fb