upstream

1 files changed, 23 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c7306174d6..61ef1a21065 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2011-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list.
+        * pcomplete.el (pcomplete-quote-argument): Fix thinko (bug#9161).
+
+        * pcomplete.el (pcomplete-parse-comint-arguments): Fix inf-loop.
+        Mark obsolete.
+        * shell.el (shell-parse-pcomplete-arguments): New function.
+        (shell-completion-vars): Use it instead (bug#9160).
+
+2011-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-maybe-here-document): Disable magic in
+        strings and comments (bug#9333).
+
+        * emacs-lisp/debug.el (debug-arglist): New function.
+        (debug-convert-byte-code): Use it.  Handle lexical byte-codes.
+        (debug-on-entry-1): Handle interpreted closures (bug#9120).
+
 2011-08-22  Juri Linkov  <juri@jurta.org>
 
         * progmodes/compile.el (compilation-mode-font-lock-keywords):
@@ -45,8 +64,8 @@
         (font-lock-default-fontify-region)
         (font-lock-default-unfontify-region): Add docstrings (Bug#8624).
 
-        * progmodes/compile.el (compilation-error-properties): Fix
-        confusion between file struct and message struct (Bug#9319).
+        * progmodes/compile.el (compilation-error-properties):
+        Fix confusion between file struct and message struct (Bug#9319).
         (compilation-error-regexp-alist-alist): Fix 2011-05-09 change to
         `ant' regexp.
 
@@ -140,8 +159,8 @@
         binding variables (bug#9298).  Also clean up some unused
         autoloads.
 
-        * net/network-stream.el (network-stream-open-starttls): Support
-        using starttls.el without using gnutls-cli.
+        * net/network-stream.el (network-stream-open-starttls):
+        Support using starttls.el without using gnutls-cli.
 
 2011-08-17  Juri Linkov  <juri@jurta.org>