(regexp-opt-charset): Adjusted for the

change of map-char-table.

(regexp-opt-charset): Adjusted for the
change of map-char-table.
6466bb34 · Kenichi Handa · 47351009 · 6466bb34
Commit 6466bb34 authored Mar 01, 2002 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

lisp/emacs-lisp/regexp-opt.el lisp/emacs-lisp/regexp-opt.el +11 -3

No files found.
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -258,13 +258,21 @@ so we can use character sets rather than grouping parenthesis."
    (map-char-table
     (lambda (c v)
       (when v
-	 (if (= (1- c) end) (setq end c)
-	   (if (> end (+ start 2))
+	 (if (consp c)
+	     (if (= (1- (car c)) end) (setq end (cdr c))
+	       (if (> end (+ start 2))
+		   (setq charset (format "%s%c-%c" charset start end))
+		 (while (>= end start)
+		   (setq charset (format "%s%c" charset start))
+		   (incf start)))
+	       (setq start (car c) end (cdr c)))
+	   (if (= (1- c) end) (setq end c)
+	     (if (> end (+ start 2))
 	       (setq charset (format "%s%c-%c" charset start end))
 	     (while (>= end start)
 	       (setq charset (format "%s%c" charset start))
 	       (incf start)))
-	   (setq start c end c))))
+	     (setq start c end c)))))
     charmap)
    (when (>= end start)
      (if (> end (+ start 2))