aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2003-09-29 02:18:58 +0000
committerKenichi Handa2003-09-29 02:18:58 +0000
commitb69ff51b95b2cdec27dbd286f7620ee62c73519a (patch)
tree796ca775047beb7abd9d5991016d66bbc91a6875
parentf98ddc9986bbd6bce7fc4dab93f3db17998f4c2b (diff)
downloademacs-b69ff51b95b2cdec27dbd286f7620ee62c73519a.tar.gz
emacs-b69ff51b95b2cdec27dbd286f7620ee62c73519a.zip
(decode-coding-inserted-region): Use car
of the return value of find-operation-coding-system.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6428e4f47fc..f21f88cab87 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-09-29 SAITO Takuya <tabmore@rivo.mediatti.net> (tiny change)
2
3 * international/mule.el (decode-coding-inserted-region): Use car
4 of the return value of find-operation-coding-system.
5
12003-09-29 Kenichi Handa <handa@m17n.org> 62003-09-29 Kenichi Handa <handa@m17n.org>
2 7
3 * descr-text.el (describe-char): Fix previous change. 8 * descr-text.el (describe-char): Fix previous change.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 12419ee4681..a82ead3999a 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1850,9 +1850,9 @@ of the function `insert-file-contents'."
1850 (setq coding (funcall set-auto-coding-function 1850 (setq coding (funcall set-auto-coding-function
1851 filename (- (point-max) (point-min))))) 1851 filename (- (point-max) (point-min)))))
1852 (or coding 1852 (or coding
1853 (setq coding (find-operation-coding-system 1853 (setq coding (car (find-operation-coding-system
1854 'insert-file-contents 1854 'insert-file-contents
1855 filename visit beg end replace))) 1855 filename visit beg end replace))))
1856 (if (coding-system-p coding) 1856 (if (coding-system-p coding)
1857 (or enable-multibyte-characters 1857 (or enable-multibyte-characters
1858 (setq coding 1858 (setq coding