aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-04-03 21:20:03 +0000
committerStefan Monnier2005-04-03 21:20:03 +0000
commit4c5113c76b804c4fcd3935e0b2c4858cd503c194 (patch)
tree0624833c0a34c4d04ba1ce3f88c5da1e315bc7bb
parent59bb94103aa6a64da5edfe7aaba79fb9fcb1c1ee (diff)
downloademacs-4c5113c76b804c4fcd3935e0b2c4858cd503c194.tar.gz
emacs-4c5113c76b804c4fcd3935e0b2c4858cd503c194.zip
(tcl-set-font-lock-keywords): Use new \_< ops.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/tcl.el10
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b390bdf0b3..9af0def37ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12005-04-03 Stefan Monnier <monnier@iro.umontreal.ca> 12005-04-03 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * progmodes/tcl.el (tcl-set-font-lock-keywords): Use new \_< ops.
4
3 * pcvs.el (cvs-checkout): Prompt for cvsroot as well. 5 * pcvs.el (cvs-checkout): Prompt for cvsroot as well.
4 6
52005-04-03 Glenn Morris <gmorris@ast.cam.ac.uk> 72005-04-03 Glenn Morris <gmorris@ast.cam.ac.uk>
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 4dba6b61a56..24ae19b0ad4 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -1,6 +1,7 @@
1;;; tcl.el --- Tcl code editing commands for Emacs 1;;; tcl.el --- Tcl code editing commands for Emacs
2 2
3;; Copyright (C) 1994,98,1999,2000,01,02,2003,2004 Free Software Foundation, Inc. 3;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
4;; Free Software Foundation, Inc.
4 5
5;; Maintainer: FSF 6;; Maintainer: FSF
6;; Author: Tom Tromey <tromey@redhat.com> 7;; Author: Tom Tromey <tromey@redhat.com>
@@ -469,10 +470,7 @@ Uses variables `tcl-proc-regexp' and `tcl-keyword-list'."
469 ;; Keywords. Only recognized if surrounded by whitespace. 470 ;; Keywords. Only recognized if surrounded by whitespace.
470 ;; FIXME consider using "not word or symbol", not 471 ;; FIXME consider using "not word or symbol", not
471 ;; "whitespace". 472 ;; "whitespace".
472 (cons (concat "\\(\\s-\\|^\\)" 473 (cons (concat "\\_<" (regexp-opt tcl-keyword-list t) "\\_>")
473 ;; FIXME Use regexp-quote?
474 (regexp-opt tcl-keyword-list t)
475 "\\(\\s-\\|$\\)")
476 2)))) 474 2))))
477 475
478(if tcl-proc-regexp 476(if tcl-proc-regexp
@@ -1507,5 +1505,5 @@ The first line is assumed to look like \"#!.../program ...\"."
1507 1505
1508(provide 'tcl) 1506(provide 'tcl)
1509 1507
1510;;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d 1508;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d
1511;;; tcl.el ends here 1509;;; tcl.el ends here