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

[Andreas Schwab]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.657 emacs/lisp/files.el:1.658
*** emacs/lisp/files.el:1.657   Tue May 13 14:39:39 2003
--- emacs/lisp/files.el Sat May 24 16:16:33 2003
***************
*** 4304,4309 ****
--- 4304,4310 ----
                            file-name-coding-system
                            default-file-name-coding-system
                            'undecided))
+               coding-no-eol
                val pos)
            (when (and enable-multibyte-characters
                       (not (memq (coding-system-base coding)
***************
*** 4314,4319 ****
--- 4315,4322 ----
                  (setq coding (detect-coding-region beg (point) t)))
              (if (not (eq (coding-system-base coding) 'undecided))
                  (save-restriction
+                   (setq coding-no-eol
+                         (coding-system-change-eol-conversion coding 'unix))
                    (narrow-to-region beg (point))
                    (goto-char (point-min))
                    (while (not (eobp))
***************
*** 4321,4327 ****
                            val (get-text-property (point) 'dired-filename))
                      (goto-char (next-single-property-change
                                  (point) 'dired-filename nil (point-max)))
!                     (decode-coding-region pos (point) coding)
                      (if val
                          (put-text-property pos (point)
                                             'dired-filename t)))))))
--- 4324,4333 ----
                            val (get-text-property (point) 'dired-filename))
                      (goto-char (next-single-property-change
                                  (point) 'dired-filename nil (point-max)))
!                     ;; Force no eol conversion on a file name, so
!                     ;; that CR is preserved.
!                     (decode-coding-region pos (point)
!                                           (if val coding-no-eol coding))
                      (if val
                          (put-text-property pos (point)
                                             'dired-filename t)))))))