aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2004-03-27 11:52:07 +0000
committerEli Zaretskii2004-03-27 11:52:07 +0000
commit05ec033b10d89c6c2b4b1139ff2907c83bf4adb6 (patch)
tree68645f4f5b610e32527ec2099905279baf2cadd0
parent2f9da07b590a46fe2b64fdc47137b6e2bc09ced0 (diff)
downloademacs-05ec033b10d89c6c2b4b1139ff2907c83bf4adb6.tar.gz
emacs-05ec033b10d89c6c2b4b1139ff2907c83bf4adb6.zip
(rx): Work at compile time, not run time.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/rx.el6
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b77d8ddacc3..9c258b77a1f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12004-03-27 Dave Love <fx@gnu.org> 12004-03-27 Dave Love <fx@gnu.org>
2 2
3 * emacs-lisp/rx.el (rx): Work at compile time, not run time.
4
3 * strokes.el (strokes-global-set-stroke-string): New function. 5 * strokes.el (strokes-global-set-stroke-string): New function.
4 (strokes-list-strokes): Cope with strings, not just commands. Set 6 (strokes-list-strokes): Cope with strings, not just commands. Set
5 foreground colour of image. 7 foreground colour of image.
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index b94ac57eca1..6656cf5ed3c 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -1,6 +1,6 @@
1;;; rx.el --- sexp notation for regular expressions 1;;; rx.el --- sexp notation for regular expressions
2 2
3;; Copyright (C) 2001, 03, 2004 Free Software Foundation, Inc. 3;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
4 4
5;; Author: Gerd Moellmann <gerd@gnu.org> 5;; Author: Gerd Moellmann <gerd@gnu.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
@@ -802,6 +802,9 @@ CHAR
802`(backref N)' 802`(backref N)'
803 matches what was matched previously by submatch N. 803 matches what was matched previously by submatch N.
804 804
805`(backref N)'
806 matches what was matched previously by submatch N.
807
805`(eval FORM)' 808`(eval FORM)'
806 evaluate FORM and insert result. If result is a string, 809 evaluate FORM and insert result. If result is a string,
807 `regexp-quote' it. 810 `regexp-quote' it.
@@ -811,7 +814,6 @@ CHAR
811 814
812 (rx-to-string regexp)) 815 (rx-to-string regexp))
813 816
814
815(provide 'rx) 817(provide 'rx)
816 818
817;;; arch-tag: 12d01a63-0008-42bb-ab8c-1c7d63be370b 819;;; arch-tag: 12d01a63-0008-42bb-ab8c-1c7d63be370b