[Emacs-diffs] /srv/bzr/emacs/trunk r111826: Merge from emacs-24; up to r111280

[Glenn Morris]

------------------------------------------------------------
revno: 111826 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-02-18 19:29:28 -0800
message:
  Merge from emacs-24; up to r111280
modified:
  doc/lispref/ChangeLog
  doc/lispref/text.texi
  etc/MORE.STUFF
  lisp/ChangeLog
  lisp/eshell/em-unix.el
  lisp/info-look.el
  lisp/net/tramp-sh.el
  lisp/progmodes/python.el
  src/ChangeLog
  src/w32proc.c
  src/xdisp.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-02-15 17:31:12 +0000
+++ b/doc/lispref/ChangeLog     2013-02-19 03:29:28 +0000
@@ -1,3 +1,7 @@
+2013-02-19  Glenn Morris  <address@hidden>
+
+       * text.texi (Change Hooks): Fix typo.
+
 2013-02-15  Glenn Morris  <address@hidden>
 
        * modes.texi (Basic Major Modes): 'z' no longer bound in special-mode.

=== modified file 'doc/lispref/text.texi'
--- a/doc/lispref/text.texi     2013-01-01 09:11:05 +0000
+++ b/doc/lispref/text.texi     2013-02-19 01:20:50 +0000
@@ -4344,7 +4344,7 @@
 modification.  Each function receives three arguments: the beginning
 and end of the region just changed, and the length of the text that
 existed before the change.  All three arguments are integers.  The
-buffer has been changed is always the current buffer.
+buffer that has been changed is always the current buffer.
 
 The length of the old text is the difference between the buffer
 positions before and after that text as it was before the change.  As

=== modified file 'etc/MORE.STUFF'
--- a/etc/MORE.STUFF    2013-01-01 09:11:05 +0000
+++ b/etc/MORE.STUFF    2013-02-19 03:10:46 +0000
@@ -41,9 +41,6 @@
   The Emacs Wiki has an area for storing elisp files
   <URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
 
-* WikEmacs
-  <URL:http://wikemacs.org> is an alternative wiki for Emacs.
-
 * Emacs slides and tutorials can be found here:
    <URL:http://web.psung.name/emacs/>
 
@@ -55,16 +52,8 @@
 
  * Ada-mode: <URL:http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html>
 
- * Battery and Info Look: <URL:http://ralph-schleicher.de/emacs.html>
-
  * CC mode: <URL:http://cc-mode.sourceforge.net/>
 
- * CPerl: <URL:http://math.berkeley.edu/~ilya/software/emacs/>
-
- * Ediff and Viper: <URL:http://www.cs.sunysb.edu/~kifer/emacs.html>
-
- * ERC: <URL:http://savannah.gnu.org/projects/erc/>
-
  * Gnus: <URL:http://www.gnus.org/>
 
  * MH-E: <URL:http://mh-e.sourceforge.net/>
@@ -73,25 +62,11 @@
 
  * Org mode: <URL:http://orgmode.org/>
 
- * RefTeX: <URL:http://www.gnu.org/software/auctex/reftex.html>
-
- * Remember: <URL:https://gna.org/p/remember-el>
-
  * CEDET: <URL:http://cedet.sourceforge.net/>
 
  * Tramp: Remote file access via rsh/ssh
    <URL:http://savannah.gnu.org/projects/tramp/>
 
-* Auxiliary files
-
- * (Tex)info files for use with Info-look that don't come from 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)
-
 * GNU Zile: <URL:http://www.gnu.org/software/zile/>
   A lightweight Emacs clone, for when you don't have room for Emacs proper.
 
@@ -108,6 +83,7 @@
  * AUCTeX: <URL:http://www.gnu.org/software/auctex/>
    An extensible package that supports writing and formatting TeX
    files (including AMS-TeX, LaTeX, Texinfo, ConTeXt, and docTeX).
+   Includes Preview LaTeX: embed preview LaTeX images in source buffer.
    Available from GNU ELPA.
 
  * BBDB: personal Info Rolodex integrated with mail/news:
@@ -134,6 +110,7 @@
 
  * Emacs Muse: <URL:http://mwolson.org/projects/EmacsMuse.html>
    An authoring and publishing environment for Emacs.
+   Available from GNU ELPA.
 
  * Emacs speaks statistics (ESS): statistical programming within Emacs
    <URL:http://ess.r-project.org>
@@ -170,9 +147,6 @@
  * Planner Mode: <URL:http://www.wjsullivan.net/PlannerMode.html>
    Planner is an organizer and day planner for Emacs.
 
- * Preview LaTeX: embed preview LaTeX images in source buffer.
-   <URL:http://www.gnu.org/software/auctex/preview-latex.html>
-
  * Quack: <URL:http://www.neilvandyke.org/quack/>
    Quack enhances Emacs support for Scheme.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-19 02:57:04 +0000
+++ b/lisp/ChangeLog    2013-02-19 03:29:28 +0000
@@ -1,3 +1,23 @@
+2013-02-19  Fabián Ezequiel Gallina  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
 
        Cleanup some of EIEIO's namespace.

=== modified file 'lisp/eshell/em-unix.el'
--- a/lisp/eshell/em-unix.el    2013-01-02 16:13:04 +0000
+++ b/lisp/eshell/em-unix.el    2013-02-19 03:29:28 +0000
@@ -1040,6 +1040,7 @@
 
 (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 @@
 
 (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 @@
                          (format "%s|sudo:address@hidden:%s"
                                  (substring prefix 0 -1) user host dir)
                        (format "/sudo:address@hidden:%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)

=== modified file 'lisp/info-look.el'
--- a/lisp/info-look.el 2013-02-16 17:20:43 +0000
+++ b/lisp/info-look.el 2013-02-19 03:29:28 +0000
@@ -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)

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-02-16 17:44:00 +0000
+++ b/lisp/net/tramp-sh.el      2013-02-19 03:29:28 +0000
@@ -2784,7 +2784,11 @@
           (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.

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2013-02-15 06:35:54 +0000
+++ b/lisp/progmodes/python.el  2013-02-19 03:29:28 +0000
@@ -708,10 +708,9 @@
         ;; 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 @@
     (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 @@
     (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 @@
 
 (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 @@
 
 ;;; 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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-17 19:01:46 +0000
+++ b/src/ChangeLog     2013-02-19 03:29:28 +0000
@@ -1,3 +1,8 @@
+2013-02-19  Eli Zaretskii  <address@hidden>
+
+       * w32proc.c (new_child): Avoid leaking handles if the subprocess
+       resources were not orderly released.
+
 2013-02-17  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (x_draw_vertical_border): For a window that is neither

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2013-02-17 19:01:46 +0000
+++ b/src/w32proc.c     2013-02-19 03:29:28 +0000
@@ -849,6 +849,12 @@
   cp = &child_procs[child_proc_count++];
 
  Initialize:
+  /* Last opportunity to avoid leaking handles before we forget them
+     for good.  */
+  if (cp->procinfo.hProcess)
+    CloseHandle (cp->procinfo.hProcess);
+  if (cp->procinfo.hThread)
+    CloseHandle (cp->procinfo.hThread);
   memset (cp, 0, sizeof (*cp));
   cp->fd = -1;
   cp->pid = -1;

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-02-17 19:01:46 +0000
+++ b/src/xdisp.c       2013-02-19 03:29:28 +0000
@@ -28244,7 +28244,7 @@
   if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
     return;
 
-  /* Note: It is necessary to redraw bot the left and the right
+  /* Note: It is necessary to redraw both the left and the right
      borders, for when only this single window W is being
      redisplayed.  */
   if (!WINDOW_RIGHTMOST_P (w)