[Emacs-diffs] emacs/lisp ChangeLog epa-file.el

[Daiki Ueno]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Daiki Ueno <ueno>       09/04/18 04:55:52

Modified files:
        lisp           : ChangeLog epa-file.el 

Log message:
        epa-file: fix garble with decode-coding-inserted-region
        
        * epa-file.el (epa-file-decode-and-insert): Use string-to-multibyte
        instead of set-buffer-multibyte.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15599&r2=1.15600
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epa-file.el?cvsroot=emacs&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15599
retrieving revision 1.15600
diff -u -b -r1.15599 -r1.15600
--- ChangeLog   18 Apr 2009 03:44:57 -0000      1.15599
+++ ChangeLog   18 Apr 2009 04:55:50 -0000      1.15600
@@ -1,3 +1,9 @@
+2009-04-18  ARISAWA Akihiro  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * net/rcirc.el (rcirc): Use correct property names (Bug#3037).

Index: epa-file.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-file.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- epa-file.el 5 Jan 2009 03:19:04 -0000       1.17
+++ epa-file.el 18 Apr 2009 04:55:52 -0000      1.18
@@ -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)))))