(regexp-opt-charset): Adjusted for the

change of map-char-table.

1 files changed, 11 insertions, 3 deletions

diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index e46ad2ca3e5..63253ed0e67 100644
--- 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))