(tcl-set-font-lock-keywords): Use new \_< ops.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b390bdf0b36c06bdf3c7848eb9fe883ba51aa82..9af0def37ec791c49fff2521c14fe1be3ad2a66a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2005-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/tcl.el (tcl-set-font-lock-keywords): Use new \_< ops.
+
        * pcvs.el (cvs-checkout): Prompt for cvsroot as well.
 
 2005-04-03  Glenn Morris  <gmorris@ast.cam.ac.uk>

diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 4dba6b61a569d5b37416af038a32f159bb483029..24ae19b0ad473b6e0551ded04e5951bc4f5dd028 100644 (file)
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -1,6 +1,7 @@
 ;;; tcl.el --- Tcl code editing commands for Emacs
 
-;; Copyright (C) 1994,98,1999,2000,01,02,2003,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;;           Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Author: Tom Tromey <tromey@redhat.com>
@@ -469,10 +470,7 @@ Uses variables `tcl-proc-regexp' and `tcl-keyword-list'."
         ;; Keywords.  Only recognized if surrounded by whitespace.
         ;; FIXME consider using "not word or symbol", not
         ;; "whitespace".
-        (cons (concat "\\(\\s-\\|^\\)"
-                      ;; FIXME Use regexp-quote?
-                      (regexp-opt tcl-keyword-list t)
-                      "\\(\\s-\\|$\\)")
+        (cons (concat "\\_<" (regexp-opt tcl-keyword-list t) "\\_>")
               2))))
 
 (if tcl-proc-regexp
@@ -1507,5 +1505,5 @@ The first line is assumed to look like \"#!.../program ...\"."
 
 (provide 'tcl)
 
-;;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d
+;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d
 ;;; tcl.el ends here