From: Simon Marshall <simon@gnu.org>
Date: Fri, 27 Jun 1997 07:22:37 +0000 (+0000)
Subject: simplify.
X-Git-Tag: emacs-20.1~1481
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b51ba9e8a6d852e67d1a07fdfd9cd9e233501bc;p=emacs.git

simplify.
---

diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 140fd8005dd..f8b733041e2 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -4,7 +4,7 @@
 
 ;; Author: Simon Marshall <simon@gnu.ai.mit.edu>
 ;; Keywords: strings, regexps
-;; Version: 1.05
+;; Version: 1.05.01
 
 ;; This file is part of GNU Emacs.
 
@@ -220,14 +220,14 @@ in REGEXP."
 	 (aset charmap char t))))
     ;;
     ;; Make a character set from the map using ranges where applicable.
-    (dotimes (elt charwidth)
-      (when (aref charmap elt)
-	(let ((start elt))
-	  (while (and (< elt charwidth) (aref charmap elt))
-	    (incf elt))
-	  (if (> (- elt start) 3)
-	      (setq charset (format "%s%c-%c" charset start (1- elt)))
-	    (setq charset (format "%s%c" charset (setq elt start)))))))
+    (dotimes (char charwidth)
+      (let ((start char))
+	(while (and (< char charwidth) (aref charmap char))
+	  (incf char))
+	(cond ((> char (+ start 3))
+	       (setq charset (format "%s%c-%c" charset start (1- char))))
+	      ((> char start)
+	       (setq charset (format "%s%c" charset (setq char start)))))))
     ;;
     ;; Make sure a caret is not first and a dash is first or last.
     (if (and (string-equal charset "") (string-equal bracket ""))