Merge from trunk.

1 files changed, 38 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e024646cd26..7a9e0267c3e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,41 @@
+2011-07-12  Johan Bockgård  <bojohan@gnu.org>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Fix previous fix (bug#2490).
+
+2011-07-12  Roland Winkler  <winkler@gnu.org>
+
+        * textmodes/bibtex.el (bibtex-initialize): Use
+        pop-to-buffer-same-window.
+        (bibtex-search-entries): Fix interactive call.
+
+2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Fontise bytecomp Error lines more correctly (bug#2490).  Fix
+        suggested by Johan Bockgård.
+
+        * subr.el (remove-duplicates): Remove; `delete-dups' is sufficient.
+
+        * dired-x.el (dired-guess-default): Use `delete-dups'.
+
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * dired.el (dired-mark-prompt):
+        * dired-aux.el (dired-read-shell-command): Doc fix.
+
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/sendmail.el (sendmail-query-once): Use
+        `customize-save-variable' unconditionally, now that it works under
+        emacs -Q.
+
+        * mail/smtpmail.el (smtpmail-query-smtp-server): Ditto.
+
+        * cus-edit.el (custom-file): Take an optional no-error variable.
+        (customize-save-variable): Set the variable, and give a warning if
+        running under "emacs -q".
+
 2011-07-11  Juanma Barranquero  <lekktu@gmail.com>
 
         * loadhist.el (unload-feature-special-hooks):