Merge from emacs-24; up to 2012-12-13T00:52:17Z!yamaoka@jpl.org

diff --cc lisp/ChangeLog
index 868f6cf,356fe37..e46e666
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,24 -1,15 +1,36 @@@
+ 2013-01-30  Glenn Morris  <rgm@gnu.org>
+ 
+       * 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  <fgallina@cuca>
+ 
+       * progmodes/python.el
+       (python-pdbtrack-comint-output-filter-function): Enhancements on
+       stacktrace detection.  (thanks @gnovak)
+ 
 +2013-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * 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  <jay.p.belanger@gmail.com>
 +
 +      * 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  <michael.albinus@gmx.de>
 +
 +      * 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  <rgm@gnu.org>
  
        * imenu.el (imenu-default-create-index-function):

diff --cc lisp/progmodes/python.el
Simple merge