procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

epa-file: fix garble with decode-coding-inserted-region

Browse source 
* epa-file.el (epa-file-decode-and-insert): Use string-to-multibyte
instead of set-buffer-multibyte.
This commit is contained in:
Daiki Ueno 2009-04-18 04:55:50 +00:00
parent d893706458
commit 68a0d89231
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2009-04-18 ARISAWA Akihiro <ari@mbf.ocn.ne.jp>
* epa-file.el (epa-file-decode-and-insert): Use
string-to-multibyte instead of set-buffer-multibyte.
<http://sourceforge.jp/ticket/browse.php?group_id=2267&tid=15259>
2009-04-18 Yann Hodique <yann.hodique@gmail.com> (tiny change)
* net/rcirc.el (rcirc): Use correct property names (Bug#3037).

9
lisp/epa-file.el
View file

@ -86,14 +86,13 @@
(if (fboundp 'decode-coding-inserted-region)
(save-restriction
(narrow-to-region (point) (point))
(let ((multibyte enable-multibyte-characters))
(set-buffer-multibyte nil)
(insert string)
(set-buffer-multibyte multibyte)
(insert (if enable-multibyte-characters
(string-to-multibyte string)
string))
(decode-coding-inserted-region
(point-min) (point-max)
(substring file 0 (string-match epa-file-name-regexp file))
visit beg end replace)))
visit beg end replace))
(insert (epa-file--decode-coding-string string (or coding-system-for-read
'undecided)))))