emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r102760: * lisp/emacs-lisp/rx.el (rx-


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r102760: * lisp/emacs-lisp/rx.el (rx-repeat): Replace CL function.
Date: Tue, 04 Jan 2011 23:04:51 -0800
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 102760
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-01-04 23:04:51 -0800
message:
  * lisp/emacs-lisp/rx.el (rx-repeat): Replace CL function.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/rx.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-05 07:03:21 +0000
+++ b/lisp/ChangeLog    2011-01-05 07:04:51 +0000
@@ -1,3 +1,7 @@
+2011-01-05  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/rx.el (rx-repeat): Replace CL function.
+
 2011-01-04  Ken Manheimer  <address@hidden>
 
        * allout.el: Reconcile with changes in line movement behavior for

=== modified file 'lisp/emacs-lisp/rx.el'
--- a/lisp/emacs-lisp/rx.el     2010-12-30 15:15:34 +0000
+++ b/lisp/emacs-lisp/rx.el     2011-01-05 07:04:51 +0000
@@ -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 <address@hidden>
 ;; 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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]