aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Janík2002-04-08 05:01:16 +0000
committerPavel Janík2002-04-08 05:01:16 +0000
commit2bbbe4f6d7c54d866790fbbcfe478f691b8c22d2 (patch)
treef3fed506a01992d7334ab51d46df1617f3145bfd
parent8a56d8ed331be880a2f7be05b15886bd7acb269d (diff)
downloademacs-2bbbe4f6d7c54d866790fbbcfe478f691b8c22d2.tar.gz
emacs-2bbbe4f6d7c54d866790fbbcfe478f691b8c22d2.zip
(display-time-string): Fix last change.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/files.el2
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 642e63ec783..357cd0ceb69 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12002-04-08 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2
3 * files.el (display-time-string): Fix last change.
4
12002-04-07 Jason Rumney <jasonr@gnu.org> 52002-04-07 Jason Rumney <jasonr@gnu.org>
2 6
3 * international/mule-cmds.el (set-default-coding-systems) 7 * international/mule-cmds.el (set-default-coding-systems)
@@ -39,8 +43,8 @@
39 43
402002-04-04 Richard M. Stallman <rms@gnu.org> 442002-04-04 Richard M. Stallman <rms@gnu.org>
41 45
42 * files.el (mode-line-format, mode-line-modified) 46 * files.el (mode-line-format, mode-line-modified)
43 (mode-line-mule-info, mode-line-buffer-identification) 47 (mode-line-mule-info, mode-line-buffer-identification)
44 (mode-line-modes, mode-line-position): Explicitly mark as risky. 48 (mode-line-modes, mode-line-position): Explicitly mark as risky.
45 (hack-one-local-variable): Don't recognize "mode-line-..." as risky. 49 (hack-one-local-variable): Don't recognize "mode-line-..." as risky.
46 50
@@ -49,7 +53,7 @@
49 * mail/mailabbrev.el (mail-abbrev-make-syntax-table): 53 * mail/mailabbrev.el (mail-abbrev-make-syntax-table):
50 Use (syntax-table), not old-syntax-table. 54 Use (syntax-table), not old-syntax-table.
51 55
52 * enriched.el (enriched-decode-foreground) 56 * enriched.el (enriched-decode-foreground)
53 (enriched-decode-background): Don't call facemenu-get-face. 57 (enriched-decode-background): Don't call facemenu-get-face.
54 58
552002-04-04 Mike Williams <mdub@bigfoot.com> 592002-04-04 Mike Williams <mdub@bigfoot.com>
diff --git a/lisp/files.el b/lisp/files.el
index 849c642fe76..c71dd806f6d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1940,7 +1940,7 @@ is specified, returning t if it is specified."
1940(put 'mode-line-buffer-identification 'risky-local-variable t) 1940(put 'mode-line-buffer-identification 'risky-local-variable t)
1941(put 'mode-line-modes 'risky-local-variable t) 1941(put 'mode-line-modes 'risky-local-variable t)
1942(put 'mode-line-position 'risky-local-variable t) 1942(put 'mode-line-position 'risky-local-variable t)
1943(put 'display-time-string-forms 'risky-local-variable t) 1943(put 'display-time-string 'risky-local-variable t)
1944 1944
1945;; This one is safe because the user gets to check it before it is used. 1945;; This one is safe because the user gets to check it before it is used.
1946(put 'compile-command 'safe-local-variable t) 1946(put 'compile-command 'safe-local-variable t)