mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

Fix bug #14755 which prevented autoloads from being computed.

Browse source 
lisp/international/mule-cmds.el (select-safe-coding-system): Handle
 the case of FROM being a string correctly.
This commit is contained in:
Eli Zaretskii 2013-06-30 17:27:07 +03:00
parent 2fae38e5f9
commit 0865d506b5
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-06-30 Eli Zaretskii <eliz@gnu.org>
* 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 <larsi@gnus.org>
* net/shr.el (shr-make-table-1): Add a sanity check that allows

5
lisp/international/mule-cmds.el
View file

@ -1031,7 +1031,10 @@ and try again)? " coding-system auto-cs))
(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)))