[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/files.el,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/files.el,v |
Date: |
Sat, 30 Dec 2006 06:28:58 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 06/12/30 06:28:58
Index: files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -b -r1.871 -r1.872
--- files.el 30 Dec 2006 01:53:11 -0000 1.871
+++ files.el 30 Dec 2006 06:28:57 -0000 1.872
@@ -3031,7 +3031,7 @@
(convert-standard-filename
"~/%backup%~")))
(message "Cannot write backup file; backing up in %s"
- (file-name-nondirectory backupname))
+ backupname)
(sleep-for 1)
(backup-buffer-copy real-file-name backupname modes)))
(setq buffer-backed-up t)
@@ -3227,7 +3227,7 @@
(defun make-backup-file-name-1 (file)
"Subroutine of `make-backup-file-name' and `find-backup-file-name'."
(let ((alist backup-directory-alist)
- elt backup-directory)
+ elt backup-directory abs-backup-directory)
(while alist
(setq elt (pop alist))
(if (string-match (car elt) file)
@@ -3237,12 +3237,14 @@
;; file's directory. By expanding explicitly here, we avoid
;; depending on default-directory.
(if backup-directory
- (setq backup-directory (expand-file-name backup-directory
+ (setq abs-backup-directory
+ (expand-file-name backup-directory
(file-name-directory file))))
- (if (and backup-directory (not (file-exists-p backup-directory)))
+ (if (and abs-backup-directory (not (file-exists-p abs-backup-directory)))
(condition-case nil
- (make-directory backup-directory 'parents)
- (file-error (setq backup-directory nil))))
+ (make-directory abs-backup-directory 'parents)
+ (file-error (setq backup-directory nil
+ abs-backup-directory nil))))
(if (null backup-directory)
file
(if (file-name-absolute-p backup-directory)
@@ -3273,9 +3275,7 @@
(replace-regexp-in-string "!" "!!" file))
backup-directory))
(expand-file-name (file-name-nondirectory file)
- (file-name-as-directory
- (expand-file-name backup-directory
- (file-name-directory file))))))))
+ (file-name-as-directory abs-backup-directory))))))
(defun backup-file-name-p (file)
"Return non-nil if FILE is a backup file name (numeric or not).
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Eli Zaretskii, 2006/12/08
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Richard M. Stallman, 2006/12/10
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Richard M. Stallman, 2006/12/17
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Kim F. Storm, 2006/12/19
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Juanma Barranquero, 2006/12/29
- [Emacs-diffs] Changes to emacs/lisp/files.el,v,
Richard M. Stallman <=
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Kim F. Storm, 2006/12/30
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Kim F. Storm, 2006/12/30