Mercurial > emacs
changeset 112122:a28fc1581b94
* lisp/emacs-lisp/rx.el (rx-repeat): Replace CL function.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 04 Jan 2011 23:04:51 -0800 |
| parents | a51d791afefe |
| children | 5e63c33ad48c |
| files | lisp/ChangeLog lisp/emacs-lisp/rx.el |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 04 23:03:21 2011 -0800 +++ b/lisp/ChangeLog Tue Jan 04 23:04:51 2011 -0800 @@ -1,3 +1,7 @@ +2011-01-05 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/rx.el (rx-repeat): Replace CL function. + 2011-01-04 Ken Manheimer <ken.manheimer@gmail.com> * allout.el: Reconcile with changes in line movement behavior for
--- a/lisp/emacs-lisp/rx.el Tue Jan 04 23:03:21 2011 -0800 +++ b/lisp/emacs-lisp/rx.el Tue Jan 04 23:04:51 2011 -0800 @@ -1,7 +1,7 @@ ;;; rx.el --- sexp notation for regular expressions ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: FSF @@ -412,7 +412,7 @@ (setcdr m (1- char))))) ranges)) - + (defun rx-any-condense-range (args) "Condense by side effect ARGS as range for Rx `any'." (let (str @@ -575,7 +575,7 @@ (condition-case nil (rx-form arg) (error "")))) - (eq arg 'word-boundary) + (eq arg 'word-boundary) (and (consp arg) (memq (car arg) '(not any in syntax category)))) (error "rx `not' syntax error: %s" arg)) @@ -664,7 +664,7 @@ (if (> (length form) 4) (setq form (rx-trans-forms form 2))) (if (null (nth 2 form)) - (setq form (list* (nth 0 form) (nth 1 form) (nthcdr 3 form)))) + (setq form (cons (nth 0 form) (cons (nth 1 form) (nthcdr 3 form))))) (cond ((= (length form) 3) (unless (and (integerp (nth 1 form)) (> (nth 1 form) 0)) @@ -1161,5 +1161,4 @@ (provide 'rx) -;; arch-tag: 12d01a63-0008-42bb-ab8c-1c7d63be370b ;;; rx.el ends here