]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix for coding-system completion (bug#23670)
authorGlenn Morris <rgm@gnu.org>
Wed, 1 Mar 2017 21:53:08 +0000 (16:53 -0500)
committerGlenn Morris <rgm@gnu.org>
Wed, 1 Mar 2017 21:53:08 +0000 (16:53 -0500)
* lisp/international/mule.el (read-buffer-file-coding-system):
Ensure that completion-pcm--delim-wild-regex is enclosed in parens,
so that completion-pcm--pattern->regex can append "*?".

lisp/international/mule.el

index 8754f7f27d78858d652d157cc3435ccf9269ea39..fa3ad80e2f7ee5409ef77df0595108ab8e22180e 100644 (file)
@@ -1311,8 +1311,8 @@ Internal use only.")
                                     preferred))))))
          (completion-ignore-case t)
          (completion-pcm--delim-wild-regex ; Let "u8" complete to "utf-8".
-          (concat completion-pcm--delim-wild-regex
-                  "\\|\\([[:alpha:]]\\)[[:digit:]]"))
+          (concat "\\(?:" completion-pcm--delim-wild-regex
+                  "\\|\\([[:alpha:]]\\)[[:digit:]]\\)"))
          (cs (completing-read
               (format "Coding system for saving file (default %s): " default)
               combined-table