[Emacs-diffs] trunk r113229: Fix bug #14755 which prevented autoloads from being computed.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113229
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14755
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-30 17:27:07 +0300
message:
  Fix bug #14755 which prevented autoloads from being computed.
  
   lisp/international/mule-cmds.el (select-safe-coding-system): Handle
   the case of FROM being a string correctly.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/international/mule-cmds.el 
mulecmds.el-20091113204419-o5vbwnq5f7feedwu-1043

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-30 13:11:41 +0000
+++ b/lisp/ChangeLog    2013-06-30 14:27:07 +0000
@@ -1,3 +1,8 @@
+2013-06-30  Eli Zaretskii  <address@hidden>
+
+       * international/mule-cmds.el (select-safe-coding-system): Handle
+       the case of FROM being a string correctly.  (Bug#14755)
+
 2013-06-30  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/shr.el (shr-make-table-1): Add a sanity check that allows

=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el   2013-06-28 14:42:55 +0000
+++ b/lisp/international/mule-cmds.el   2013-06-30 14:27:07 +0000
@@ -1031,7 +1031,10 @@
        (error "Canceled because the buffer was modified"))
       (if (and (eq (coding-system-type coding-system) 'undecided)
               (coding-system-get coding-system :prefer-utf-8)
-              (< (- to from) (- (position-bytes to) (position-bytes from))))
+              (or (multibyte-string-p from)
+                  (and (number-or-marker-p from)
+                       (< (- to from)
+                          (- (position-bytes to) (position-bytes from))))))
          (setq coding-system
                (coding-system-change-text-conversion coding-system 'utf-8)))
       coding-system)))