xemacs-beta: lisp/files.el comparison

[xemacs-hg @ 2005-04-08 14:06:58 by aidan] Make find-file with prefix-arg on a nonexistent file behave properly.

comparison

equal deleted inserted replaced

-:834cce9b2360
+:5427b625d5cc
 (interactive (list (read-file-name "Find file: ")
 		     (and current-prefix-arg
 			  (read-coding-system "Coding system: "))
 		     t))
 (if codesys
-(let ((coding-system-for-read
+(let* ((coding-system-for-read (get-coding-system codesys))
-	     (get-coding-system codesys)))
+	     (value (find-file-noselect filename nil nil wildcards))
-	(let ((value (find-file-noselect filename nil nil wildcards)))
+	     (bufname (if (listp value) (car (nreverse value)) value)))
-	  (if (listp value)
+	;; If a user explicitly specified the coding system with a prefix
-	      (mapcar 'switch-to-buffer (nreverse value))
+	;; argument when opening a nonexistent file, insert-file-contents
-	    (switch-to-buffer value))))
+	;; hasn't preserved that coding system as the local
+	;; buffer-file-coding-system. Do that ourselves.
+	(unless (and bufname
+		     (file-exists-p (buffer-file-name bufname))
+		     (local-variable-p 'buffer-file-coding-system bufname))
+	  (save-excursion
+	    (set-buffer bufname)
+	    (setq buffer-file-coding-system coding-system-for-read)))
+	(switch-to-buffer bufname))
 (let ((value (find-file-noselect filename nil nil wildcards)))
 (if (listp value)
 	  (mapcar 'switch-to-buffer (nreverse value))
 	(switch-to-buffer value)))))

Mercurial > hg > xemacs-beta