aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2004-03-21 15:34:56 +0000
committerJuanma Barranquero2004-03-21 15:34:56 +0000
commit942269e7b4e1d4c0685ae0a09d9794f1b5b3609d (patch)
tree2969a22d701f8ea1f4dc5cba82846360ee53cddd
parentf7da2617c057bbfaa1e2c6b71fe8129008cb5c6a (diff)
downloademacs-942269e7b4e1d4c0685ae0a09d9794f1b5b3609d.tar.gz
emacs-942269e7b4e1d4c0685ae0a09d9794f1b5b3609d.zip
(rx): Work at compile time, not run time.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/emacs-lisp/rx.el13
2 files changed, 16 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1f7e983120..2c53d1c393b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12004-03-21 Dave Love <fx@gnu.org>
2
3 * progmodes/cfengine.el (cfengine-mode): Set
4 parse-sexp-ignore-comments.
5
6 * emacs-lisp/rx.el (rx): Work at compile time, not run time.
7
12004-03-21 Juanma Barranquero <lektu@terra.es> 82004-03-21 Juanma Barranquero <lektu@terra.es>
2 9
3 * allout.el (allout-mode): Fix docstring. 10 * allout.el (allout-mode): Fix docstring.
@@ -21,7 +28,7 @@
21 (ruler-mode-space): Don't depend on a numeric WIDTH value. 28 (ruler-mode-space): Don't depend on a numeric WIDTH value.
22 (ruler-mode-ruler): Use symbolic display elements for scrollbar, 29 (ruler-mode-ruler): Use symbolic display elements for scrollbar,
23 fringes and margins width. 30 fringes and margins width.
24 (ruler-mode-ruler-function): Default to ruler-mode-ruler 31 (ruler-mode-ruler-function): Default to ruler-mode-ruler.
25 32
262004-03-19 Kim F. Storm <storm@cua.dk> 332004-03-19 Kim F. Storm <storm@cua.dk>
27 34
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 86673441fe7..55886e8b34f 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 Free Software Foundation, Inc. 3;; Copyright (C) 2001, 2003 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
@@ -799,14 +799,17 @@ CHAR
799`(repeat N M SEXP)' 799`(repeat N M SEXP)'
800 matches N to M occurrences of what SEXP matches. 800 matches N to M occurrences of what SEXP matches.
801 801
802`(backref N)'
803 matches what was matched previously by submatch N.
804
802`(eval FORM)' 805`(eval FORM)'
803 evaluate FORM and insert result. If result is a string, 806 evaluate FORM and insert result. If result is a string,
804 `regexp-quote' it. 807 `regexp-quote' it.
805 808
806`(regexp REGEXP)' 809`(regexp REGEXP)'
807 include REGEXP in string notation in the result." 810 include REGEXP in string notation in the result."
808 811
809 `(rx-to-string ',regexp)) 812 (rx-to-string regexp))
810 813
811 814
812(provide 'rx) 815(provide 'rx)