Mercurial > hg > xemacs-beta
comparison lisp/files.el @ 4024:f901409b074b
[xemacs-hg @ 2007-06-21 23:27:13 by aidan]
Pass the NOMODIFY argument to s-b-f-c-s in a few more cases.
author | aidan |
---|---|
date | Thu, 21 Jun 2007 23:27:16 +0000 |
parents | cee87f8de64b |
children | 346788f5aa64 |
comparison
equal
deleted
inserted
replaced
4023:27b5d12ddbd7 | 4024:f901409b074b |
---|---|
3471 (set-buffer-file-coding-system | 3471 (set-buffer-file-coding-system |
3472 (if adjust-eol | 3472 (if adjust-eol |
3473 (coding-system-base | 3473 (coding-system-base |
3474 buffer-file-coding-system-when-loaded) | 3474 buffer-file-coding-system-when-loaded) |
3475 buffer-file-coding-system-when-loaded) | 3475 buffer-file-coding-system-when-loaded) |
3476 (not adjust-eol)))))) | 3476 (not adjust-eol) t))))) |
3477 (goto-char (min opoint (point-max))) | 3477 (goto-char (min opoint (point-max))) |
3478 ;; Recompute the truename in case changes in symlinks | 3478 ;; Recompute the truename in case changes in symlinks |
3479 ;; have changed the truename. | 3479 ;; have changed the truename. |
3480 ;;XEmacs: already done by insert-file-contents | 3480 ;;XEmacs: already done by insert-file-contents |
3481 ;;(setq buffer-file-truename | 3481 ;;(setq buffer-file-truename |
3614 (coding-system buffer-file-coding-system) | 3614 (coding-system buffer-file-coding-system) |
3615 ;; Auto-saved file shoule be read without any code conversion. | 3615 ;; Auto-saved file shoule be read without any code conversion. |
3616 (coding-system-for-read 'escape-quoted)) | 3616 (coding-system-for-read 'escape-quoted)) |
3617 (erase-buffer) | 3617 (erase-buffer) |
3618 (insert-file-contents file-name nil) | 3618 (insert-file-contents file-name nil) |
3619 (set-buffer-file-coding-system coding-system)) | 3619 (set-buffer-file-coding-system coding-system |
3620 nil t)) | |
3620 (after-find-file nil nil t) | 3621 (after-find-file nil nil t) |
3621 (return nil)) | 3622 (return nil)) |
3622 (diff | 3623 (diff |
3623 ;; rather than just diff the two files (which would | 3624 ;; rather than just diff the two files (which would |
3624 ;; be easy), we have to deal with the fact that | 3625 ;; be easy), we have to deal with the fact that |