From: Glenn Morris Date: Wed, 30 Jan 2013 17:16:30 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-13T00:52:17Z!yamaoka@jpl.org X-Git-Tag: emacs-24.3.90~173^2~7^2~194 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=741d511359a7862a6f7c65da9e2952a1cc8cd92b;p=emacs.git Merge from emacs-24; up to 2012-12-13T00:52:17Z!yamaoka@jpl.org --- 741d511359a7862a6f7c65da9e2952a1cc8cd92b diff --cc lisp/ChangeLog index 868f6cf6fad,356fe37fb70..e46e66651ca --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,24 -1,15 +1,36 @@@ + 2013-01-30 Glenn Morris + + * mouse.el (mouse-drag-line): Avoid pushing same event onto + unread-command-events twice in some cases. This tries to implement + the 2012-07-26 changes in a different way. (Bug#13560) + + 2013-01-30 Fabián Ezequiel Gallina + + * progmodes/python.el + (python-pdbtrack-comint-output-filter-function): Enhancements on + stacktrace detection. (thanks @gnovak) + +2013-01-30 Stefan Monnier + + * jit-lock.el (jit-lock-stealth-chunk-start): Don't widen (bug#13542). + (jit-lock-mode, jit-lock-functions, jit-lock-context-unfontify-pos): + Use defvar-local. + (jit-lock-register): Use setq-local. + +2013-01-30 Jay Belanger + + * calc-units.el (math-default-units-table): Remove initial value. + (calc-convert-units): Treat expressions where all the units cancel as + if they didn't have units. + +2013-01-30 Michael Albinus + + * net/tramp.el (tramp-process-connection-type): Fix docstring. + (tramp-completion-reread-directory-timeout): Fix type. + (tramp-connection-min-time-diff): New defcustom. + + * net/tramp-sh.el (tramp-maybe-open-connection): Use it. + 2013-01-30 Glenn Morris * imenu.el (imenu-default-create-index-function):