summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-08-06 21:45:44 +0800
committerPo Lu <luangruo@yahoo.com>2023-08-06 21:45:44 +0800
commit7ffc5f86e4636f9837a46ea75bee7475caaf5c04 (patch)
tree4820056bc76fb582d865b04cc811bafe44d63100 /lisp/emacs-lisp
parent7873369338ee0159ca285153fd4592cbcff65d7a (diff)
parent10a7615b5d45bcd909bb03d67423b337dfe93b1e (diff)
downloademacs-7ffc5f86e4636f9837a46ea75bee7475caaf5c04.tar.gz
emacs-7ffc5f86e4636f9837a46ea75bee7475caaf5c04.tar.bz2
emacs-7ffc5f86e4636f9837a46ea75bee7475caaf5c04.zip
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/bytecomp.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index f0656628236..f6ba6ff9ea0 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1976,7 +1976,9 @@ also be compiled."
(let ((directories (list default-directory))
(default-directory default-directory)
(ignore-files-regexp
- (mapconcat #'identity byte-compile-ignore-files "\\|"))
+ (if byte-compile-ignore-files
+ (mapconcat #'identity byte-compile-ignore-files "\\|")
+ regexp-unmatchable))
(skip-count 0)
(fail-count 0)
(file-count 0)