aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Großjohann2003-04-25 14:14:31 +0000
committerKai Großjohann2003-04-25 14:14:31 +0000
commitc8df97026c2e527f2f2621f5217cda2de96d32a5 (patch)
tree6a7dac91d79b0cbbcbcaa67ec0b568d54a6197e5
parent03954a42ce9354e3a4908e16ea97c30c665de66f (diff)
downloademacs-c8df97026c2e527f2f2621f5217cda2de96d32a5.tar.gz
emacs-c8df97026c2e527f2f2621f5217cda2de96d32a5.zip
(file-relative-name): Recognize "c:/foo" as absolute
file name. Tiny change from David PONCE <david.ponce@wanadoo.fr>.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70e6c018f11..2cce2d1f7dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-04-25 Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
2
3 * files.el (file-relative-name): Recognize "c:/foo" as absolute
4 file name. Tiny change from David PONCE <david.ponce@wanadoo.fr>.
5
12003-04-24 Sam Steingold <sds@gnu.org> 62003-04-24 Sam Steingold <sds@gnu.org>
2 7
3 * calendar/diary-lib.el (fancy-diary-display-mode): Bind "q" to 8 * calendar/diary-lib.el (fancy-diary-display-mode): Bind "q" to
diff --git a/lisp/files.el b/lisp/files.el
index c18cc2e20ac..48e8dda0e74 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2909,9 +2909,9 @@ on a DOS/Windows machine, it returns FILENAME on expanded form."
2909 (string-match re directory) 2909 (string-match re directory)
2910 (substring directory 0 (match-end 0)))))))) 2910 (substring directory 0 (match-end 0))))))))
2911 filename 2911 filename
2912 (unless (eq (aref filename 0) ?/) 2912 (unless (file-name-absolute-p filename)
2913 (setq filename (concat "/" filename))) 2913 (setq filename (concat "/" filename)))
2914 (unless (eq (aref directory 0) ?/) 2914 (unless (file-name-absolute-p directory)
2915 (setq directory (concat "/" directory))) 2915 (setq directory (concat "/" directory)))
2916 (let ((ancestor ".") 2916 (let ((ancestor ".")
2917 (filename-dir (file-name-as-directory filename))) 2917 (filename-dir (file-name-as-directory filename)))