Merge from emacs--rel--22

[bpt/emacs.git] / lisp / progmodes / dcl-mode.el

diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 81ed778..0f19ea3 100644 (file)
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -1,6 +1,7 @@
 ;;; dcl-mode.el --- major mode for editing DCL command files
 
-;; Copyright (c) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; Free Software Foundation, Inc.
 
 ;; Author: Odd Gripenstam <gripenstamol@decus.se>
 ;; Maintainer: Odd Gripenstam <gripenstamol@decus.se>
@@ -10,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -70,6 +71,8 @@
 
 ;;; Code:
 
+(require 'tempo)
+
 ;;; *** Customization *****************************************************
 
 
@@ -78,7 +81,7 @@
 (defvar dcl-font-lock-keywords
   '(("\\<\\(if\\|then\\|else\\|endif\\)\\>"
      1 font-lock-keyword-face)
-    ("\\<f[$][a-z]+\\>"
+    ("\\<f[$][a-z_]+\\>"
      0 font-lock-builtin-face)
     ("[.]\\(eq\\|not\\|or\\|and\\|lt\\|gt\\|le\\|ge\\|eqs\\|nes\\)[.]"
      0 font-lock-builtin-face))
@@ -94,6 +97,7 @@ Presently this includes some syntax, .OP.erators, and \"f$\" lexicals.")
 
 (defgroup dcl nil
   "Major mode for editing DCL command files."
+  :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
   :group 'languages)
 
 (defcustom dcl-basic-offset 4
@@ -641,7 +645,7 @@ There is some minimal font-lock support (see vars
   (setq mode-name "DCL")
   (use-local-map dcl-mode-map)
   (tempo-use-tag-list 'dcl-tempo-tags)
-  (run-hooks 'dcl-mode-hook))
+  (run-mode-hooks 'dcl-mode-hook))
 
 
 ;;; *** Movement commands ***************************************************
@@ -1933,8 +1937,6 @@ section at the end of the current buffer."
 ;; standard Emacs.  I would have liked something closer to the functionality
 ;; of LSE templates...
 
-
-(require 'tempo)
 (defvar dcl-tempo-tags nil
   "Tempo tags for DCL mode.")
 
@@ -2199,6 +2201,7 @@ otherwise return nil."
           ()
         (equal start (match-end 0))))))
 
+(declare-function imenu-default-create-index-function "imenu" ())
 
 ;;;-------------------------------------------------------------------------
 (defun dcl-imenu-create-index-function ()