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

5 files changed, 47 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4832d9cce8..d430ba0908f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2013-02-19  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-indent-context):
+        Fix python-info-line-ends-backslash-p call.
+        (python-info-line-ends-backslash-p)
+        (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-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.
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index f6dd0d5e990..94508d71592 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1040,6 +1040,7 @@ Show wall-clock time elapsed during execution of COMMAND.")
 
 (defun eshell/su (&rest args)
   "Alias \"su\" to call Tramp."
+  (require 'tramp)
   (setq args (eshell-stringify-list (eshell-flatten-list args)))
   (let ((orig-args (copy-tree args)))
     (eshell-eval-using-options
@@ -1077,6 +1078,7 @@ Become another USER during a login session.")
 
 (defun eshell/sudo (&rest args)
   "Alias \"sudo\" to call Tramp."
+  (require 'tramp)
   (setq args (eshell-stringify-list (eshell-flatten-list args)))
   (let ((orig-args (copy-tree args)))
     (eshell-eval-using-options
@@ -1111,8 +1113,6 @@ Execute a COMMAND as the superuser or another USER.")
                           (format "%s|sudo:%s@%s:%s"
                                   (substring prefix 0 -1) user host dir)
                         (format "/sudo:%s@%s:%s" user host dir))))
-                ;; Ensure, that Tramp has connected to that construct already.
-                (ignore (file-exists-p default-directory))
                 (eshell-named-command (car orig-args) (cdr orig-args))))))))
 
 (put 'eshell/sudo 'eshell-no-numeric-conversions t)
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 0b33dd51faf..afe4301c659 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -27,6 +27,14 @@
 ;; Really cool code to lookup info indexes.
 ;; Try especially info-lookup-symbol (aka C-h S).
 
+;; Some additional sources of (Tex)info files for non-GNU packages:
+;;
+;; Scheme: <URL:http://groups.csail.mit.edu/mac/ftpdir/scm/r5rs.info.tar.gz>
+;; LaTeX:
+;;  <URL:ftp://ctan.tug.org/tex-archive/info/latex2e-help-texinfo/latex2e.texi>
+;;  (or CTAN mirrors)
+;; Perl: <URL:ftp://ftp.cpan.org/pub/CPAN/doc/manual/texinfo/> (or CPAN mirrors)
+
 ;;; Code:
 
 (require 'info)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 9be22352b23..7388c570874 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2784,7 +2784,11 @@ the result will be a local, non-Tramp, filename."
            (or (null program) tramp-process-connection-type))
           (bmp (and (buffer-live-p buffer) (buffer-modified-p buffer)))
           (name1 name)
-          (i 0))
+          (i 0)
+          ;; We do not want to raise an error when
+          ;; `start-file-process' has been started several time in
+          ;; `eshell' and friends.
+          (tramp-current-connection nil))
 
       (unless buffer
         ;; BUFFER can be nil.  We use a temporary buffer.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index eadb06fa61e..da56fe70329 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -708,10 +708,9 @@ START is the buffer position where the sexp starts."
         ;; After backslash
         ((setq start (when (not (or (python-syntax-context 'string ppss)
                                     (python-syntax-context 'comment ppss)))
-                       (let ((line-beg-pos (line-beginning-position)))
-                         (when (python-info-line-ends-backslash-p
-                                (1- line-beg-pos))
-                           (- line-beg-pos 2)))))
+                       (let ((line-beg-pos (line-number-at-pos)))
+                         (python-info-line-ends-backslash-p
+                          (1- line-beg-pos)))))
          'after-backslash)
         ;; After beginning of block
         ((setq start (save-excursion
@@ -3115,7 +3114,7 @@ With optional argument LINE-NUMBER, check that line instead."
     (save-restriction
       (widen)
       (when line-number
-        (goto-char line-number))
+        (python-util-goto-line line-number))
       (while (and (not (eobp))
                   (goto-char (line-end-position))
                   (python-syntax-context 'paren)
@@ -3131,7 +3130,7 @@ Optional argument LINE-NUMBER forces the line number to check against."
     (save-restriction
       (widen)
       (when line-number
-        (goto-char line-number))
+        (python-util-goto-line line-number))
       (when (python-info-line-ends-backslash-p)
         (while (save-excursion
                  (goto-char (line-beginning-position))
@@ -3210,7 +3209,9 @@ operator."
 
 (defun python-info-current-line-comment-p ()
   "Check if current line is a comment line."
-  (char-equal (or (char-after (+ (point) (current-indentation))) ?_) ?#))
+  (char-equal
+   (or (char-after (+ (line-beginning-position) (current-indentation))) ?_)
+   ?#))
 
 (defun python-info-current-line-empty-p ()
   "Check if current line is empty, ignoring whitespace."
@@ -3225,12 +3226,10 @@ operator."
 
 ;;; Utility functions
 
-(defun python-util-position (item seq)
-  "Find the first occurrence of ITEM in SEQ.
-Return the index of the matching item, or nil if not found."
-  (let ((member-result (member item seq)))
-    (when member-result
-      (- (length seq) (length member-result)))))
+(defun python-util-goto-line (line-number)
+  "Move point to LINE-NUMBER."
+  (goto-char (point-min))
+  (forward-line (1- line-number)))
 
 ;; Stolen from org-mode
 (defun python-util-clone-local-variables (from-buffer &optional regexp)