Merge from trunk.

1 files changed, 29 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3faab15c35..e024646cd26 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,32 @@
+2011-07-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * loadhist.el (unload-feature-special-hooks):
+        Add `auto-coding-functions', `fill-nobreak-predicate' and
+        `find-directory-functions' (bug#5327).
+
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * vc/ediff.el (ediff-patch-file): Clarify doc string (bug#3138).
+
+        * cus-edit.el (custom-guess-name-alist): -alist variables should
+        use the `alist' type (bug#3120).  Suggested by Drew Adams.
+
+        * printing.el: Add documentation to all the `pr-toggle-' commands.
+
+2011-07-11  Leo  <sdl.web@gmail.com>  (tiny change)
+
+        * files.el (toggle-read-only): Only do the `C-x C-q' warning on VC
+        backends where it makes sense (bug#2623).
+
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired-x.el (dired-guess-default): Remove duplicate shell command
+        entries (bug#2028).
+        (dired-guess-default): Fix grammar in doc string (bug#2028).
+        (dired-guess-shell-alist-user): Clarify the example a bit (bug#2030).
+
+        * subr.el (remove-duplicates): New conveniency function.
+
 2011-07-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * tool-bar.el (tool-bar-mode): Clarify positive/negative arguments