merge trunk

1 files changed, 20 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7163b4b4989..c9aa7e99356 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,25 @@
+2012-09-15  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-bzr.el (vc-bzr-working-revision): For lightweight local
+        checkouts, check the parent dirstate matches the branch.
+        Add "--tree" to "bzr revno" arguments.  Don't try to shorten the
+        empty string.
+
+        * version.el (emacs-bzr-version): Doc fix.
+        (emacs-bzr-version-dirstate): New function.
+        (emacs-bzr-get-version): For lightweight checkouts, if the parent
+        is local try and check that it matches the branch.  If not, just
+        use dirstate information.  (Bug#12441)
+
+2012-09-14  Juri Linkov  <juri@jurta.org>
+
+        * dired-aux.el (dired-do-chmod): Use `eq' to detect empty input.
+        (Bug#12399)
+
 2012-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/advice.el (ad-prognify): Remove, use macroexp-progn.
+
         * emacs-lisp/edebug.el: Miscellaneous cleanup.
         Remove obsolete byte-compiler hack that tried to silence some warnings.
         (edebug-submit-bug-report): Remove.