diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/international/mule.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/international/mule.el')
| -rw-r--r-- | lisp/international/mule.el | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 52e743e6f3d..9cd38afd8be 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -32,7 +32,7 @@ (defconst mule-version "6.0 (HANACHIRUSATO)" "\ Version number and name of this version of MULE (multilingual environment).") -(make-obsolete-variable 'mule-version nil "28.1") +(make-obsolete-variable 'mule-version 'emacs-version "28.1") (defconst mule-version-date "2003.9.1" "\ Distribution date of this version of MULE (multilingual environment).") @@ -317,8 +317,9 @@ Return t if file exists." (when purify-flag (push (purecopy file) preloaded-file-list)) (unwind-protect - (let ((load-file-name fullname) - (set-auto-coding-for-load t) + (let ((load-true-file-name fullname) + (load-file-name fullname) + (set-auto-coding-for-load t) (inhibit-file-name-operation nil)) (with-current-buffer buffer ;; So that we don't get completely screwed if the @@ -490,27 +491,27 @@ per-character basis, this may not be accurate." (cond ((listp cs-list) (catch 'tag - (mapc #'(lambda (charset) - (if (encode-char char charset) - (throw 'tag charset))) + (mapc (lambda (charset) + (if (encode-char char charset) + (throw 'tag charset))) cs-list) nil)) ((eq cs-list 'iso-2022) (catch 'tag2 - (mapc #'(lambda (charset) - (if (and (plist-get (charset-plist charset) - :iso-final-char) - (encode-char char charset)) - (throw 'tag2 charset))) + (mapc (lambda (charset) + (if (and (plist-get (charset-plist charset) + :iso-final-char) + (encode-char char charset)) + (throw 'tag2 charset))) charset-list) nil)) ((eq cs-list 'emacs-mule) (catch 'tag3 - (mapc #'(lambda (charset) - (if (and (plist-get (charset-plist charset) - :emacs-mule-id) - (encode-char char charset)) - (throw 'tag3 charset))) + (mapc (lambda (charset) + (if (and (plist-get (charset-plist charset) + :emacs-mule-id) + (encode-char char charset)) + (throw 'tag3 charset))) charset-list) nil))))))))))) |