summaryrefslogtreecommitdiff
path: root/lisp/international/mule.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-12-20 22:07:48 +0100
committerAndrea Corallo <akrl@sdf.org>2020-12-20 22:08:42 +0100
commitf244c2190259875d095be8508a959a61339263b8 (patch)
tree4e32bd399f4abe168bf3f18086cd36acfbca3df8 /lisp/international/mule.el
parent72c1a41573a96a39482a001bfeb3230c471a5681 (diff)
parent1a7033f1f3de4ad8c1bfd68b54e6c9d8444a3bcc (diff)
downloademacs-f244c2190259875d095be8508a959a61339263b8.tar.gz
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/international/mule.el')
-rw-r--r--lisp/international/mule.el9
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 66abc98bfe7..ef468927c07 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -307,12 +307,9 @@ Return t if file exists."
(and (null noerror)
(signal 'file-error (list "Cannot open load file" file)))
;; Read file with code conversion, and then eval.
- (let* ((buffer
- ;; We can't use `generate-new-buffer' because files.el
- ;; is not yet loaded.
- (get-buffer-create (generate-new-buffer-name " *load*")))
- (load-in-progress t)
- (source (save-match-data (string-match "\\.el\\'" fullname))))
+ (let ((buffer (generate-new-buffer " *load*"))
+ (load-in-progress t)
+ (source (string-suffix-p ".el" fullname)))
(unless nomessage
(if source
(message "Loading %s (source)..." file)