progmodes/cc-engine.el (c-state-cache-non-literal-place): Correct to

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 510f594..a183447 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,36 @@
+2011-08-16  Alan Mackenzie  <acm@muc.de>
+
+       * progmodes/cc-engine.el (c-state-cache-non-literal-place):
+       Correct, to avoid the inside of macros.
+
+2011-08-16  Richard Stallman  <rms@gnu.org>
+
+       * epa-mail.el: Handle GnuPG group definitions.
+       (epa-mail-group-alist, epa-mail-group-modtime)
+       (epa-mail-gnupg-conf-file): New variables.
+       (epa-mail-parse-groups, epa-mail-sync-groups)
+       (epa-mail-expand-recipient-1, epa-mail-expand-recipients-2)
+       (epa-mail-expand-recipients): New functions.
+       (epa-mail-encrypt): Call epa-mail-expand-recipients.
+
+       * mail/rmail.el (rmail-epa-decrypt): New command.
+
+       * epa.el (epa-decrypt-region): New arg MAKE-BUFFER-FUNCTION.
+       Don't bind buffer-read-only, just inhibit-read-only.
+       (epa--find-coding-system-for-mime-charset): Fix the non-xemacs case.
+       (epa-decrypt-armor-in-region): Make error message clearer.
+
+2011-08-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * minibuffer.el (completion-pcm--merge-completions): Don't merge "a1b"
+       and "a2b" to "ab" for `prefix'.
+
 2011-08-14  Chong Yidong  <cyd@stupidchicken.com>
 
        * ibuf-ext.el (ibuffer-filter-disable): New arg for deleting
        filter groups.
-       (ibuffer-included-in-filter-p-1): Use it.  Suggested by Noam
-       Postavsky (Bug#8804).
+       (ibuffer-included-in-filter-p-1): Use it.  Suggested by Rafaël
+       Fourquet (Bug#8804).
 
 2011-08-12  Juanma Barranquero  <lekktu@gmail.com>