mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-12 02:40:34 -08:00
Code Issues Projects Releases Wiki Activity

(magic-mode-alist): Mark as risky.

Browse source 
(make-backup-file-name-1): Expand backup-directory explicitly.
This commit is contained in:
Richard M. Stallman 2006-12-17 18:03:26 +00:00
parent b8976ce04f
commit eb0455abe8
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2006-12-17 Richard Stallman <rms@gnu.org>
* files.el (magic-mode-alist): Mark as risky.
* files.el (make-backup-file-name-1):
Expand backup-directory explicitly.
2006-12-17 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-default-method): Before setting to "pscp",

7
lisp/files.el
View file

@ -2141,6 +2141,7 @@ to decide the buffer's major mode.
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 @@ doesn't exist, it is created."
(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)