mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

* lisp/emacs-lisp/rx.el (rx-repeat): Replace CL function.

Browse Source
This commit is contained in:
Glenn Morris 2011-01-04 23:04:51 -08:00
parent 4896e8fc5e
commit 1f6f772201
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -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> 2011-01-04 Ken Manheimer <ken.manheimer@gmail.com>
* allout.el: Reconcile with changes in line movement behavior for * allout.el: Reconcile with changes in line movement behavior for

9
lisp/emacs-lisp/rx.el
View File

@ -1,7 +1,7 @@
;;; rx.el --- sexp notation for regular expressions ;;; rx.el --- sexp notation for regular expressions
;; Copyright (C) 2001, 2002, 2003, 2004, 2005, ;; 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> ;; Author: Gerd Moellmann <gerd@gnu.org>
;; Maintainer: FSF ;; Maintainer: FSF
@ -412,7 +412,7 @@ Only both edges of each range is checked."
(setcdr m (1- char))))) (setcdr m (1- char)))))
ranges)) ranges))
(defun rx-any-condense-range (args) (defun rx-any-condense-range (args)
"Condense by side effect ARGS as range for Rx `any'." "Condense by side effect ARGS as range for Rx `any'."
(let (str (let (str
@ -575,7 +575,7 @@ ARG is optional."
(condition-case nil (condition-case nil
(rx-form arg) (rx-form arg)
(error "")))) (error ""))))
(eq arg 'word-boundary) (eq arg 'word-boundary)
(and (consp arg) (and (consp arg)
(memq (car arg) '(not any in syntax category)))) (memq (car arg) '(not any in syntax category))))
(error "rx `not' syntax error: %s" arg)) (error "rx `not' syntax error: %s" arg))
@ -664,7 +664,7 @@ FORM is either `(repeat N FORM1)' or `(repeat N M FORMS...)'."
(if (> (length form) 4) (if (> (length form) 4)
(setq form (rx-trans-forms form 2))) (setq form (rx-trans-forms form 2)))
(if (null (nth 2 form)) (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) (cond ((= (length form) 3)
(unless (and (integerp (nth 1 form)) (unless (and (integerp (nth 1 form))
(> (nth 1 form) 0)) (> (nth 1 form) 0))
@ -1161,5 +1161,4 @@ enclosed in `(and ...)'.
(provide 'rx) (provide 'rx)
;; arch-tag: 12d01a63-0008-42bb-ab8c-1c7d63be370b
;;; rx.el ends here ;;; rx.el ends here