[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el, v [EMACS_22_BASE]

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juanma Barranquero <lektu>      08/01/10 01:55:25

Index: mule-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.310.2.9
retrieving revision 1.310.2.10
diff -u -b -r1.310.2.9 -r1.310.2.10
--- mule-cmds.el        7 Jan 2008 01:26:04 -0000       1.310.2.9
+++ mule-cmds.el        10 Jan 2008 01:55:24 -0000      1.310.2.10
@@ -966,6 +966,7 @@
 
     (let ((codings (find-coding-systems-region from to))
          (coding-system nil)
+         (tick (if (not (stringp from)) (buffer-modified-tick)))
          safe rejected unsafe)
       (if (eq (car codings) 'undecided)
          ;; Any coding system is ok.
@@ -1030,6 +1031,8 @@
 %s specified by file contents.  Really save (else edit coding cookies \
 and try again)? " coding-system auto-cs))
              (error "Save aborted"))))
+      (when (and tick (/= tick (buffer-modified-tick)))
+       (error "Cancelled because the buffer was modified"))
       coding-system)))
 
 (setq select-safe-coding-system-function 'select-safe-coding-system)