changeset 50968:d80aece92b78

(file-relative-name): Remove dead code. Make sure \n in a filename does not confuse us.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 13 May 2003 18:39:39 +0000
parents c2440710e1c4
children 489cbd8af02e
files lisp/files.el
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/files.el	Tue May 13 18:35:16 2003 +0000
+++ b/lisp/files.el	Tue May 13 18:39:39 2003 +0000
@@ -1,6 +1,6 @@
 ;;; files.el --- file input and output commands for Emacs
 
-;; Copyright (C) 1985, 86, 87, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
+;; Copyright (C) 1985,86,87,92,93,94,95,96,97,98,99,2000,01,02,2003
 ;;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -2357,6 +2357,8 @@
 	  (if (eq system-type 'vax-vms)
 	      (setq new-name (downcase new-name)))
 	  (setq default-directory (file-name-directory buffer-file-name))
+	  ;; If new-name == old-name, renaming would add a spurious <2>
+	  ;; and it's considered as a feature in rename-buffer.
 	  (or (string= new-name (buffer-name))
 	      (rename-buffer new-name t))))
     (setq buffer-backed-up nil)
@@ -2911,17 +2913,13 @@
 		 (string-match re directory)
 		 (substring directory 0 (match-end 0))))))))
 	  filename
-        (unless (file-name-absolute-p filename)
-	  (setq filename (concat "/" filename)))
-        (unless (file-name-absolute-p directory)
-	  (setq directory (concat "/" directory)))
         (let ((ancestor ".")
 	      (filename-dir (file-name-as-directory filename)))
           (while
 	      (and
-	       (not (string-match (concat "^" (regexp-quote directory))
+	       (not (string-match (concat "\\`" (regexp-quote directory))
 				  filename-dir))
-	       (not (string-match (concat "^" (regexp-quote directory))
+	       (not (string-match (concat "\\`" (regexp-quote directory))
 				  filename)))
             (setq directory (file-name-directory (substring directory 0 -1))
 		  ancestor (if (equal ancestor ".")