[Emacs-diffs] Changes to emacs/lisp/international/mule.el

[Richard M . Stallman]

Index: emacs/lisp/international/mule.el
diff -c emacs/lisp/international/mule.el:1.206 
emacs/lisp/international/mule.el:1.207
*** emacs/lisp/international/mule.el:1.206      Thu Nov 11 21:39:41 2004
--- emacs/lisp/international/mule.el    Tue Nov 16 17:18:39 2004
***************
*** 1135,1141 ****
    (setq coding-system-alist (cons (list (symbol-name symbol))
                                  coding-system-alist)))
  
! (defun set-buffer-file-coding-system (coding-system &optional force)
    "Set the file coding-system of the current buffer to CODING-SYSTEM.
  This means that when you save the buffer, it will be converted
  according to CODING-SYSTEM.  For a list of possible values of CODING-SYSTEM,
--- 1135,1141 ----
    (setq coding-system-alist (cons (list (symbol-name symbol))
                                  coding-system-alist)))
  
! (defun set-buffer-file-coding-system (coding-system &optional force nomodify)
    "Set the file coding-system of the current buffer to CODING-SYSTEM.
  This means that when you save the buffer, it will be converted
  according to CODING-SYSTEM.  For a list of possible values of CODING-SYSTEM,
***************
*** 1149,1156 ****
  
  This marks the buffer modified so that the succeeding \\[save-buffer]
  surely saves the buffer with CODING-SYSTEM.  From a program, if you
! don't want to mark the buffer modified, just set the variable
! `buffer-file-coding-system' directly."
    (interactive "zCoding system for saving file (default, nil): \nP")
    (check-coding-system coding-system)
    (if (and coding-system buffer-file-coding-system (null force))
--- 1149,1157 ----
  
  This marks the buffer modified so that the succeeding \\[save-buffer]
  surely saves the buffer with CODING-SYSTEM.  From a program, if you
! don't want to mark the buffer modified, specify t for NOMODIFY.
! If you know exactly what coding system you want to use,
! just set the variable `buffer-file-coding-system' directly."
    (interactive "zCoding system for saving file (default, nil): \nP")
    (check-coding-system coding-system)
    (if (and coding-system buffer-file-coding-system (null force))
***************
*** 1736,1742 ****
             (find-new-buffer-file-coding-system last-coding-system-used))
            (modified-p (buffer-modified-p)))
        (when coding-system
!         (set-buffer-file-coding-system coding-system t)
          (if (and enable-multibyte-characters
                   (or (eq coding-system 'no-conversion)
                       (eq (coding-system-type coding-system) 5))
--- 1737,1747 ----
             (find-new-buffer-file-coding-system last-coding-system-used))
            (modified-p (buffer-modified-p)))
        (when coding-system
!         ;; Tell set-buffer-file-coding-system not to mark the file
!         ;; as modified; we just read it, and it's supposed to be unmodified.
!         ;; Marking it modified would try to lock it, which would
!         ;; check the modtime, and we don't want to do that again now.
!         (set-buffer-file-coding-system coding-system t t)
          (if (and enable-multibyte-characters
                   (or (eq coding-system 'no-conversion)
                       (eq (coding-system-type coding-system) 5))
***************
*** 1746,1752 ****
                   (= (buffer-size) inserted))
              ;; For coding systems no-conversion and raw-text...,
              ;; edit the buffer as unibyte.
!             (let ((pos-marker (copy-marker (+ (point) inserted))))
                (set-buffer-multibyte nil)
                (setq inserted (- pos-marker (point)))))
          (set-buffer-modified-p modified-p))))
--- 1751,1759 ----
                   (= (buffer-size) inserted))
              ;; For coding systems no-conversion and raw-text...,
              ;; edit the buffer as unibyte.
!             (let ((pos-marker (copy-marker (+ (point) inserted)))
!                   ;; Prevent locking.
!                   (buffer-file-name nil))
                (set-buffer-multibyte nil)
                (setq inserted (- pos-marker (point)))))
          (set-buffer-modified-p modified-p))))