merge trunk

1 files changed, 57 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc69b8643b6..99bfabb8115 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,60 @@
+2012-11-14  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-expr-beg): Make heredoc detection
+        more strict.  Add docstring.
+        (ruby-expression-expansion-re): Extract from
+        `ruby-match-expression-expansion'.
+        (ruby-syntax-propertize-function): After everything else, search
+        for expansions in string literals, mark their insides as
+        whitespace syntax and save match data for font-lock.
+        (ruby-font-lock-keywords): Use the 2nd group from expression
+        expansion matches.
+        (ruby-match-expression-expansion): Use the match data saved to the
+        text property in ruby-syntax-propertize-function.
+
+2012-11-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/gv.el (setf): Fix debug spec for multiple assignments
+        (bug#12879).
+
+2012-11-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-move-to-block): Looks for a block
+        start/end keyword a bit harder.  Works with different values of N.
+        Add more comments.
+        (ruby-end-of-block): Update accordingly.
+
+2012-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * woman.el (woman-file-name): Don't mess with unread-command-events
+        (bug#12861).
+
+        * emacs-lisp/advice.el: Layer on top of nadvice.el.
+        Remove out of date self-require hack.
+        (ad-do-advised-functions): Use simple `dolist'.
+        (ad-advice-name, ad-advice-protected, ad-advice-enabled)
+        (ad-advice-definition): Redefine as functions.
+        (ad-advice-classes): Move before first use.
+        (ad-make-origname, ad-set-orig-definition, ad-clear-orig-definition)
+        (ad-make-mapped-call, ad-make-advised-docstring,ad-make-plain-docstring)
+        (ad--defalias-fset): Remove functions.
+        (ad-make-advicefunname, ad-clear-advicefunname-definition): New funs.
+        (ad-get-orig-definition): Rewrite.
+        (ad-make-advised-definition-docstring): Change base docstring.
+        (ad-real-orig-definition): Rewrite.
+        (ad-map-arglists): Change name of called function.
+        (ad--make-advised-docstring): Redirect `function' from ad-Advice-...
+        (ad-make-advised-definition): Simplify.
+        (ad-assemble-advised-definition): Tweak for new calling context.
+        (ad-activate-advised-definition): Setup ad-Advice-* i.s.o ad-Orig-*.
+        (ad--defalias-fset): Rename from ad-handle-definition.  Make it set the
+        function and call ad-activate if needed.
+        (ad-activate, ad-deactivate): Don't call ad-handle-definition any more.
+        (ad-recover): Clear ad-Advice-* instead of ad-Orig-*.
+        (ad-compile-function): Compile ad-Advice-*.
+        (ad-activate-on-top-level, ad-with-auto-activation-disabled): Remove.
+        (ad-start-advice, ad-stop-advice): Remove.
+
 2012-11-13  Dmitry Gutov  <dgutov@yandex.ru>
 
         * progmodes/ruby-mode.el (ruby-add-log-current-method): Print the