aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorRichard M. Stallman2011-08-15 22:06:32 -0400
committerRichard M. Stallman2011-08-15 22:06:32 -0400
commitfe38beefade6a9c382aa6f6c1dd98edbfe4bceca (patch)
treedee290e458d7e8ef3048d207c1c09c78bf946d0c /lisp/ChangeLog
parent3a99bf64df4071fc6910876070215a948c18aa01 (diff)
downloademacs-fe38beefade6a9c382aa6f6c1dd98edbfe4bceca.tar.gz
emacs-fe38beefade6a9c382aa6f6c1dd98edbfe4bceca.zip
Fix previous change.
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 053f9d3bab6..400500998c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
12011-08-16 Richard Stallman <rms@gnu.org> 12011-08-16 Richard Stallman <rms@gnu.org>
2 2
3 * epa.el (epa-decrypt-region): New arg COPY-FUNCTION. 3 * epa.el (epa-decrypt-region): New arg MAKE-BUFFER-FUNCTION.
4 Don't bind buffer-read-only, just inhibit-read-only.
4 (epa--find-coding-system-for-mime-charset): Fix the non-xemacs case. 5 (epa--find-coding-system-for-mime-charset): Fix the non-xemacs case.
5 (epa-decrypt-armor-in-region): Make error message clearer. 6 (epa-decrypt-armor-in-region): Make error message clearer.
6 7