upstream

1 files changed, 45 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a57fe75405..15296e09b46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,48 @@
+2011-08-29  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-done): Don't display message "Mark saved"
+        when arg `edit' is non-nil to prevent its flicker in the echo area.
+
+2011-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-menu-mark-delete): Allow marking
+        obsolete packages for deletion.
+
+2011-08-28  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * help-mode.el (help-mode-map): Add special-mode-map to parent.
+        (help-mode): Derive help-mode from special-mode. Don't invoke
+        view-mode from help-mode.
+        (help-xref-override-view-map): Remove.
+        (help-make-xrefs): Remove minor-mode-overriding-map-alist since
+        view-mode is not used anymore.
+
+2011-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * server.el (server-port): Doc fix.
+
+        * cus-theme.el (custom-theme-choose-mode): Inherit from
+        special-mode (Bug#9124).
+        (custom-theme-choose-mode-map): Add special-mode to parent.
+
+2011-08-28  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-fonts.el
+        (c-make-font-lock-BO-decl-search-function): New function.
+        (c-basic-matchers-after - "Fontify the clauses after various
+        keywords"): Extract the three keyword lists for the 3 erroneous
+        constructs from the list of four, and use the new function above
+        in place of an old one.
+
+2011-08-28  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-insert-prev-input)
+        (rcirc-insert-next-input): Remove unused argument.
+
+2011-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * shell.el (shell-parse-pcomplete-arguments): Unquote args (bug#9160).
+
 2011-08-27  Alan Mackenzie  <acm@muc.de>
 
         * progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Make it