# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1014948096 0
# Node ID 8eba780a3a36feb246eb91130f40b557a6d61458
# Parent  014f40eb1c88002ee96adf6136bcc0b98438b545
(regexp-opt-charset): Adjusted for the
change of map-char-table.

diff -r 014f40eb1c88 -r 8eba780a3a36 lisp/emacs-lisp/regexp-opt.el
--- a/lisp/emacs-lisp/regexp-opt.el	Fri Mar 01 02:00:58 2002 +0000
+++ b/lisp/emacs-lisp/regexp-opt.el	Fri Mar 01 02:01:36 2002 +0000
@@ -258,13 +258,21 @@
     (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))