Merge from emacs-24; up to 2012-12-20T16:09:05Z!dmantipov@yandex.ru

diff --cc doc/lispref/ChangeLog
index d8a08ee,9d54197..fe61fb4
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
 -2013-02-14  Glenn Morris  <rgm@gnu.org>
+ 2013-02-19  Glenn Morris  <rgm@gnu.org>
+ 
+       * text.texi (Change Hooks): Fix typo.
+ 
 +2013-02-15  Glenn Morris  <rgm@gnu.org>
  
        * modes.texi (Basic Major Modes): 'z' no longer bound in special-mode.
  

diff --cc lisp/ChangeLog
index d4832d9,f99cab9..d430ba0
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,40 -1,25 +1,60 @@@
 -      * progmodes/python.el (python-indent-context): Fix
 -      python-info-line-ends-backslash-p call.
+ 2013-02-19  Fabián Ezequiel Gallina  <fgallina@cuca>
+ 
 -      (python-info-beginning-of-backslash): Respect line-number
 -      argument.
 -      (python-info-current-line-comment-p): Fix behavior when not at
 -      beginning-of-line.
++      * progmodes/python.el (python-indent-context):
++      Fix python-info-line-ends-backslash-p call.
+       (python-info-line-ends-backslash-p)
 -2013-02-18  Michael Albinus  <michael.albinus@gmx.de>
++      (python-info-beginning-of-backslash): Respect line-number argument.
++      (python-info-current-line-comment-p):
++      Fix behavior when not at beginning-of-line.
+       (python-util-position): Remove function.
+       (python-util-goto-line): New function.
+ 
 -2013-02-16  Didier Verna  <didier@didierverna.net>
++2013-02-19  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * eshell/em-unix.el (eshell/su): Require tramp.
+       (eshell/sudo): Require tramp.  Remove now unnecessary check.
+ 
+       * net/tramp-sh.el (tramp-sh-handle-start-file-process): Let-bind
+       `tramp-current-connection' in order to avoid an error when several
+       commands are invoked in a short time in eshell and friends.
+ 
 +2013-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      Cleanup some of EIEIO's namespace.
 +      * emacs-lisp/eieio.el (eieio--define-field-accessors): New macro.
 +      Use it to define all the class-* and object-* field accessors (renamed
 +      to eieio--class-* and eieio--object-*).  Update all uses.
 +      (eieio--class-num-slots, eieio--object-num-slots): Rename from
 +      class-num-slots and object-num-slots.
 +      (eieio--check-type): New macro.
 +      (eieio-defclass, eieio-oref, eieio-oref-default, same-class-p)
 +      (object-of-class-p, child-of-class-p, object-slots, class-slot-initarg)
 +      (eieio-oset, eieio-oset-default, object-assoc, object-assoc-list)
 +      (object-assoc-list-safe): Use it.
 +      (eieio-defclass): Tighten regexp.
 +      (eieio--defmethod): Use `memq'.  Signal an error for unknown method kind.
 +      Remove unreachable code.
 +      (object-class-fast): Declare obsolete.
 +      (eieio-class-name, eieio-object-name, eieio-object-set-name-string)
 +      (eieio-object-class, eieio-object-class-name, eieio-class-parents)
 +      (eieio-class-children, eieio-class-precedence-list, eieio-class-parent):
 +      Rename from class-name, object-name, object-set-name-string,
 +      object-class, object-class-name, class-parents, class-children,
 +      class-precedence-list, class-parent; with obsolete alias.
 +      (class-of, class-direct-superclasses, class-direct-subclasses):
 +      Declare obsolete.
 +      (eieio-defmethod): Use `memq'; remove unreachable code.
 +      * emacs-lisp/eieio-base.el (eieio-persistent-read):
 +      * emacs-lisp/eieio-opt.el (eieio-class-button, eieio-describe-generic)
 +      (eieio-browse-tree, eieio-browse): Use eieio--check-type.
 +
 +
 +2013-02-18  Michael Heerdegen  <michael_heerdegen@web.de>
 +
 +      * emacs-lisp/eldoc.el (eldoc-highlight-function-argument):
 +      Use font-lock-keyword-face for macros and special forms (bug#8345).
 +
 +2013-02-17  Didier Verna  <didier@didierverna.net>
  
        * net/network-stream.el (network-stream-open-starttls):
        Check that response to the starttls-command is non-nil.  (Bug#13706)

diff --cc lisp/eshell/em-unix.el
Simple merge

diff --cc lisp/info-look.el
Simple merge

diff --cc lisp/net/tramp-sh.el
Simple merge

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

diff --cc src/ChangeLog
index e945e22,99b5e87..ff059cf
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,5 -1,22 +1,10 @@@
 -2013-02-18  Eli Zaretskii  <eliz@gnu.org>
++2013-02-19  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * w32proc.c (new_child): Avoid leaking handles if the subprocess
+       resources were not orderly released.
+ 
  2013-02-17  Eli Zaretskii  <eliz@gnu.org>
  
 -      * w32proc.c (new_child): Remove the loop that attempted to salvage
 -      slots of dead processes.
 -      (new_child, delete_child, find_child_pid): Don't insist on
 -      procinfo.hProcess be NULL for a process slot to be considered
 -      inactive, or be non-NULL to be considered active.
 -      (reader_thread): Don't set the FILE_AT_EOF flag of a file
 -      descriptor if the corresponding child was deleted and its
 -      char_avail handle is NULL.
 -      (reap_subprocess): Don't reset the FILE_AT_EOF flag.  (Bug#13546)
 -      (sys_select): Don't pass a NULL process handle to
 -      WaitForMultipleObjects.  (Bug#13735)
 -
        * xdisp.c (x_draw_vertical_border): For a window that is neither
        the leftmost nor the rightmost, redraw both the left and the right
        vertical borders.  (Bug#13723)

diff --cc src/w32proc.c
Simple merge

diff --cc src/xdisp.c
Simple merge