auto upstream

1 files changed, 34 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb3f4f833f5..5a752fe0c3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2013-02-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-debug-message): Add
+        `tramp-condition-case-unless-debug'.
+        (tramp-debug-on-error): New defvar.
+        (tramp-condition-case-unless-debug): New defun.
+        (tramp-file-name-handler): Use it.
+
+2013-02-14  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-isearch-filter): Treat non-nil values of
+        `search-invisible' including its default value `open'
+        like the value `t' to match hidden text.  (Bug#13402)
+
+2013-02-14  Glenn Morris  <rgm@gnu.org>
+
+        * help-fns.el (find-lisp-object-file-name): Give special treatment
+        to all ~/.foo.elc files, not just ~/.emacs.  (Bug#9007)
+
+2013-02-14  David Biesack  <sasdjb@d72933.na.sas.com>  (tiny change)
+
+        * net/quickurl.el (quickurl-save-urls):
+        Ensure quickurl-urls is not truncated on printing.  (Bug#9276)
+
+2013-02-14  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-parse-partial): Don't increase
+        depth for unfinished percent literal.  Not using it in the caller.
+        (ruby-move-to-block): Jump over multiline literals of all types,
+        ignoring code-looking contents inside them.
+        (ruby-add-log-current-method): Improve performance at the expense
+        of accuracy.  `ruby-block-contains-point' is relatively slow, so
+        only use it for method and singleton class blocks.
+
 2013-02-13  Michael Albinus  <michael.albinus@gmx.de>
 
         Use ControlMaster where applicable.  (Bug#13677)