diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 18605c2735..64416288c6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2012-01-07 Paul Eggert <[email protected]> + + * epg.el (epg--make-temp-file): Avoid permission race conditions + when creating temporary directories and files on older Emacs. + + * files.el (move-file-to-trash): Preserve default file modes on error. + (Bug#10401) + 2012-01-07 Lars Magne Ingebrigtsen <[email protected]> * faces.el (set-face-attribute): Clarify the meaning of the nil @@ -128,6 +136,7 @@ * mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded headers of non-MIME messages, when rmail-enable-mime is non-nil. +>>>>>>> MERGE-SOURCE 2011-12-29 Michael Albinus <[email protected]> |