diff options
| author | Reiner Steib | 2006-05-12 12:29:08 +0000 |
|---|---|---|
| committer | Reiner Steib | 2006-05-12 12:29:08 +0000 |
| commit | e48335de35c9d1e1545ee6bf0dfa112d15c8bca8 (patch) | |
| tree | 768215ab141329c38be3624aa337a135ea927039 | |
| parent | e1d01705a50042fd32b2ebe0314d9ebcf1351b08 (diff) | |
| download | emacs-e48335de35c9d1e1545ee6bf0dfa112d15c8bca8.tar.gz emacs-e48335de35c9d1e1545ee6bf0dfa112d15c8bca8.zip | |
(version-control): Correct safe values.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a3c73415154..5fc4d502468 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-05-12 Reiner Steib <Reiner.Steib@gmx.de> | ||
| 2 | |||
| 3 | * files.el (version-control): Correct safe values. | ||
| 4 | |||
| 1 | 2006-05-12 Thien-Thi Nguyen <ttn@gnu.org> | 5 | 2006-05-12 Thien-Thi Nguyen <ttn@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs-lisp/ewoc.el (ewoc-refresh): Compute PP once before looping. | 7 | * emacs-lisp/ewoc.el (ewoc-refresh): Compute PP once before looping. |
diff --git a/lisp/files.el b/lisp/files.el index 0b45a35190a..e64464bdec4 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -250,7 +250,8 @@ nil means make them for files that have some already. | |||
| 250 | (other :tag "Always" t)) | 250 | (other :tag "Always" t)) |
| 251 | :group 'backup | 251 | :group 'backup |
| 252 | :group 'vc) | 252 | :group 'vc) |
| 253 | (put 'version-control 'safe-local-variable 'symbolp) | 253 | (put 'version-control 'safe-local-variable |
| 254 | '(lambda (x) (or (booleanp x) (equal x 'never)))) | ||
| 254 | 255 | ||
| 255 | (defcustom dired-kept-versions 2 | 256 | (defcustom dired-kept-versions 2 |
| 256 | "*When cleaning directory, number of versions to keep." | 257 | "*When cleaning directory, number of versions to keep." |