Mercurial > emacs
changeset 74684:2a54a5dd0df4
(magic-mode-alist): Mark as risky.
(make-backup-file-name-1): Expand backup-directory explicitly.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 17 Dec 2006 18:03:09 +0000 |
| parents | f1038333001f |
| children | fb31f72a65b7 |
| files | lisp/files.el |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/files.el Sun Dec 17 17:00:18 2006 +0000 +++ b/lisp/files.el Sun Dec 17 18:03:09 2006 +0000 @@ -2141,6 +2141,7 @@ If FUNCTION is nil, then it is not called. (That is a way of saying \"allow `auto-mode-alist' to decide for these files.\")") +(put 'magic-mode-alist 'risky-local-variable t) (defvar magic-mode-regexp-match-limit 4000 "Upper limit on `magic-mode-alist' regexp matches.") @@ -3228,6 +3229,12 @@ (if (string-match (car elt) file) (setq backup-directory (cdr elt) alist nil))) + ;; If backup-directory is relative, it should be relative to the + ;; file's directory. By expanding explicitly here, we avoid + ;; depending on default-directory. + (if backup-directory + (setq backup-directory (expand-file-name backup-directory + (file-name-directory file)))) (if (and backup-directory (not (file-exists-p backup-directory))) (condition-case nil (make-directory backup-directory 'parents)