Merge from origin/emacs-24

216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust.
20cfd24 Improve indexing on the chapter/section/subsection levels.
14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows.
012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function
75e114f Fix line numbers on Python shell.
d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
8e818d1 Keep maximized when going fullscreen.
749813e python.el: Fix electric colon behavior
936d5e5 Fix last patch.
74d3b20 Fixes: debbugs:18623

Conflicts:
	doc/emacs/ChangeLog
	doc/lispref/ChangeLog
	doc/lispref/functions.texi
	lisp/ChangeLog
	src/ChangeLog
	src/xterm.c
	test/ChangeLog

6 files changed, 208 insertions, 168 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81740630e2a..61e2e425ccd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,50 @@
 2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
 
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+        Use `tramp-rsh-end-of-line', it ought to be more robust.
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/js.el (js-syntax-propertize): "return" can't be divided
+        (bug#19397).
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-read-passwd): Ignore errors from `auth-source-*'.
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n"
+        as end-of-line delimeter for passwords, when running on MS Windows.
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-set-shell): Don't change the global value
+        of indent-line-function (bug#19433).
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        Fix line numbers on Python shell.
+        * progmodes/python.el (python-shell--save-temp-file): Do not
+        append coding cookie.
+        (python-shell-send-string): Generalize for
+        python-shell-send-region.
+        (python--use-fake-loc): Delete var.
+        (python-shell-buffer-substring): Cleanup fake-loc logic.
+        (python-shell-send-region): Remove fake-loc logic, simplify.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-indent-post-self-insert-function):
+        Make colon to re-indent only for dedenters, handling
+        multiline-statements gracefully.
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-insert-file-contents):
+        Set `find-file-not-found-functions' in case of errors.  (Bug#18623)
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
         * net/tramp-sh.el (tramp-send-command-and-read): New optional
         arg MARKER.
         (tramp-get-remote-path): Use it.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 2e2e2ac3698..6fc2effbe0f 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2471,8 +2471,12 @@ The method used must be an out-of-band method."
                    (mapconcat 'identity (process-command p) " "))
                   (tramp-set-connection-property p "vector" orig-vec)
                   (tramp-compat-set-process-query-on-exit-flag p nil)
-                  (tramp-process-actions
-                   p v nil tramp-actions-copy-out-of-band)
+
+                  ;; We must adapt `tramp-local-end-of-line' for
+                  ;; sending the password.
+                  (let ((tramp-local-end-of-line tramp-rsh-end-of-line))
+                    (tramp-process-actions
+                     p v nil tramp-actions-copy-out-of-band))
 
                   ;; Check the return code.
                   (goto-char (point-max))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 7aba7494672..dc62ceeceb9 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3086,115 +3086,118 @@ User is always nil."
   (setq filename (expand-file-name filename))
   (let (result local-copy remote-copy)
     (with-parsed-tramp-file-name filename nil
-      (with-tramp-progress-reporter
-          v 3 (format "Inserting `%s'" filename)
-        (unwind-protect
-            (if (not (file-exists-p filename))
-                (progn
-                  ;; We don't raise a Tramp error, because it might be
-                  ;; suppressed, like in `find-file-noselect-1'.
-                  (tramp-message
-                   v 1 "File not `%s' found on remote host" filename)
-                  (signal 'file-error
-                          (list "File not found on remote host" filename)))
-
-              (if (and (tramp-local-host-p v)
-                       (let (file-name-handler-alist)
-                         (file-readable-p localname)))
-                  ;; Short track: if we are on the local host, we can
-                  ;; run directly.
-                  (setq result
-                        (tramp-run-real-handler
-                         'insert-file-contents
-                         (list localname visit beg end replace)))
-
-                ;; When we shall insert only a part of the file, we
-                ;; copy this part.  This works only for the shell file
-                ;; name handlers.
-                (when (and (or beg end)
-                           (tramp-get-method-parameter
-                            (tramp-file-name-method v) 'tramp-login-program))
-                  (setq remote-copy (tramp-make-tramp-temp-file v))
-                  ;; This is defined in tramp-sh.el.  Let's assume
-                  ;; this is loaded already.
-                  (tramp-compat-funcall
-                   'tramp-send-command
-                   v
-                   (cond
-                    ((and beg end)
-                     (format "dd bs=1 skip=%d if=%s count=%d of=%s"
-                             beg (tramp-shell-quote-argument localname)
-                             (- end beg) remote-copy))
-                    (beg
-                     (format "dd bs=1 skip=%d if=%s of=%s"
-                             beg (tramp-shell-quote-argument localname)
-                             remote-copy))
-                    (end
-                     (format "dd bs=1 count=%d if=%s of=%s"
-                             end (tramp-shell-quote-argument localname)
-                             remote-copy))))
-                  (setq tramp-temp-buffer-file-name nil beg nil end nil))
-
-                ;; `insert-file-contents-literally' takes care to
-                ;; avoid calling jka-compr.  By let-binding
-                ;; `inhibit-file-name-operation', we propagate that
-                ;; care to the `file-local-copy' operation.
-                (setq local-copy
-                      (let ((inhibit-file-name-operation
-                             (when (eq inhibit-file-name-operation
-                                       'insert-file-contents)
-                               'file-local-copy)))
-                        (cond
-                         ((stringp remote-copy)
-                          (file-local-copy
-                           (tramp-make-tramp-file-name
-                            method user host remote-copy)))
-                         ((stringp tramp-temp-buffer-file-name)
-                          (copy-file filename tramp-temp-buffer-file-name 'ok)
-                          tramp-temp-buffer-file-name)
-                         (t (file-local-copy filename)))))
-
-                ;; When the file is not readable for the owner, it
-                ;; cannot be inserted, even if it is readable for the
-                ;; group or for everybody.
-                (set-file-modes
-                 local-copy (tramp-compat-octal-to-decimal "0600"))
-
-                (when (and (null remote-copy)
-                           (tramp-get-method-parameter
-                            method 'tramp-copy-keep-tmpfile))
-                  ;; We keep the local file for performance reasons,
-                  ;; useful for "rsync".
-                  (setq tramp-temp-buffer-file-name local-copy))
-
-                ;; We must ensure that `file-coding-system-alist'
-                ;; matches `local-copy'.  We must also use `visit',
-                ;; otherwise there might be an error in the
-                ;; `revert-buffer' function under XEmacs.
-                (let ((file-coding-system-alist
-                       (tramp-find-file-name-coding-system-alist
-                        filename local-copy)))
-                  (setq result
-                        (insert-file-contents
-                         local-copy visit beg end replace)))))
-
-          ;; Save exit.
-          (progn
-            (when visit
-              (setq buffer-file-name filename)
-              (setq buffer-read-only (not (file-writable-p filename)))
-              (set-visited-file-modtime)
-              (set-buffer-modified-p nil))
-            (when (and (stringp local-copy)
-                       (or remote-copy (null tramp-temp-buffer-file-name)))
-              (delete-file local-copy))
-            (when (stringp remote-copy)
-              (delete-file
-               (tramp-make-tramp-file-name method user host remote-copy)))))))
-
-    ;; Result.
-    (list (expand-file-name filename)
-          (cadr result))))
+      (unwind-protect
+          (if (not (file-exists-p filename))
+              (tramp-error
+               v 'file-error "File `%s' not found on remote host" filename)
+
+            (with-tramp-progress-reporter
+                v 3 (format "Inserting `%s'" filename)
+              (condition-case err
+                  (if (and (tramp-local-host-p v)
+                           (let (file-name-handler-alist)
+                             (file-readable-p localname)))
+                      ;; Short track: if we are on the local host, we can
+                      ;; run directly.
+                      (setq result
+                            (tramp-run-real-handler
+                             'insert-file-contents
+                             (list localname visit beg end replace)))
+
+                    ;; When we shall insert only a part of the file, we
+                    ;; copy this part.  This works only for the shell file
+                    ;; name handlers.
+                    (when (and (or beg end)
+                               (tramp-get-method-parameter
+                                (tramp-file-name-method v)
+                                'tramp-login-program))
+                      (setq remote-copy (tramp-make-tramp-temp-file v))
+                      ;; This is defined in tramp-sh.el.  Let's assume
+                      ;; this is loaded already.
+                      (tramp-compat-funcall
+                       'tramp-send-command
+                       v
+                       (cond
+                        ((and beg end)
+                         (format "dd bs=1 skip=%d if=%s count=%d of=%s"
+                                 beg (tramp-shell-quote-argument localname)
+                                 (- end beg) remote-copy))
+                        (beg
+                         (format "dd bs=1 skip=%d if=%s of=%s"
+                                 beg (tramp-shell-quote-argument localname)
+                                 remote-copy))
+                        (end
+                         (format "dd bs=1 count=%d if=%s of=%s"
+                                 end (tramp-shell-quote-argument localname)
+                                 remote-copy))))
+                      (setq tramp-temp-buffer-file-name nil beg nil end nil))
+
+                    ;; `insert-file-contents-literally' takes care to
+                    ;; avoid calling jka-compr.  By let-binding
+                    ;; `inhibit-file-name-operation', we propagate that
+                    ;; care to the `file-local-copy' operation.
+                    (setq local-copy
+                          (let ((inhibit-file-name-operation
+                                 (when (eq inhibit-file-name-operation
+                                           'insert-file-contents)
+                                   'file-local-copy)))
+                            (cond
+                             ((stringp remote-copy)
+                              (file-local-copy
+                               (tramp-make-tramp-file-name
+                                method user host remote-copy)))
+                             ((stringp tramp-temp-buffer-file-name)
+                              (copy-file
+                               filename tramp-temp-buffer-file-name 'ok)
+                              tramp-temp-buffer-file-name)
+                             (t (file-local-copy filename)))))
+
+                    ;; When the file is not readable for the owner, it
+                    ;; cannot be inserted, even if it is readable for the
+                    ;; group or for everybody.
+                    (set-file-modes
+                     local-copy (tramp-compat-octal-to-decimal "0600"))
+
+                    (when (and (null remote-copy)
+                               (tramp-get-method-parameter
+                                method 'tramp-copy-keep-tmpfile))
+                      ;; We keep the local file for performance reasons,
+                      ;; useful for "rsync".
+                      (setq tramp-temp-buffer-file-name local-copy))
+
+                    ;; We must ensure that `file-coding-system-alist'
+                    ;; matches `local-copy'.  We must also use `visit',
+                    ;; otherwise there might be an error in the
+                    ;; `revert-buffer' function under XEmacs.
+                    (let ((file-coding-system-alist
+                           (tramp-find-file-name-coding-system-alist
+                            filename local-copy)))
+                      (setq result
+                            (insert-file-contents
+                             local-copy visit beg end replace))))
+                (error
+                 (add-hook 'find-file-not-found-functions
+                           `(lambda () (signal ',(car err) ',(cdr err)))
+                           nil t)
+                 (signal (car err) (cdr err))))))
+
+        ;; Save exit.
+        (progn
+          (when visit
+            (setq buffer-file-name filename)
+            (setq buffer-read-only (not (file-writable-p filename)))
+            (set-visited-file-modtime)
+            (set-buffer-modified-p nil))
+          (when (and (stringp local-copy)
+                     (or remote-copy (null tramp-temp-buffer-file-name)))
+            (delete-file local-copy))
+          (when (stringp remote-copy)
+            (delete-file
+             (tramp-make-tramp-file-name method user host remote-copy)))))
+
+      ;; Result.
+      (list (expand-file-name filename)
+            (cadr result)))))
 
 (defun tramp-handle-load (file &optional noerror nomessage nosuffix must-suffix)
   "Like `load' for Tramp files."
@@ -4188,25 +4191,27 @@ Invokes `password-read' if available, `read-passwd' else."
                ;; it's bound.  `auth-source-user-or-password' is an
                ;; obsoleted function, it has been replaced by
                ;; `auth-source-search'.
-               (and (boundp 'auth-sources)
-                    (tramp-get-connection-property
-                     v "first-password-request" nil)
-                    ;; Try with Tramp's current method.
-                    (if (fboundp 'auth-source-search)
-                        (setq auth-info
-                              (tramp-compat-funcall
-                               'auth-source-search
-                               :max 1
-                               :user (or tramp-current-user t)
-                               :host tramp-current-host
-                               :port tramp-current-method)
-                              auth-passwd (plist-get (nth 0 auth-info) :secret)
-                              auth-passwd (if (functionp auth-passwd)
-                                              (funcall auth-passwd)
-                                            auth-passwd))
-                      (tramp-compat-funcall
-                       'auth-source-user-or-password
-                       "password" tramp-current-host tramp-current-method)))
+               (ignore-errors
+                 (and (boundp 'auth-sources)
+                      (tramp-get-connection-property
+                       v "first-password-request" nil)
+                      ;; Try with Tramp's current method.
+                      (if (fboundp 'auth-source-search)
+                          (setq auth-info
+                                (tramp-compat-funcall
+                                 'auth-source-search
+                                 :max 1
+                                 :user (or tramp-current-user t)
+                                 :host tramp-current-host
+                                 :port tramp-current-method)
+                                auth-passwd (plist-get
+                                             (nth 0 auth-info) :secret)
+                                auth-passwd (if (functionp auth-passwd)
+                                                (funcall auth-passwd)
+                                              auth-passwd))
+                        (tramp-compat-funcall
+                         'auth-source-user-or-password
+                         "password" tramp-current-host tramp-current-method))))
                ;; Try the password cache.
                (when (functionp 'password-read)
                  (let ((password
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 45074d338d3..f6a9440610e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1673,7 +1673,7 @@ This performs fontification according to `js--class-styles'."
     ;; We can probably just add +, -, !, <, >, %, ^, ~, |, &, ?, : at which
     ;; point I think only * and / would be missing which could also be added,
     ;; but need care to avoid affecting the // and */ comment markers.
-    ("\\(?:^\\|[=([{,:;]\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
+    ("\\(?:^\\|[=([{,:;]\\|\\_<return\\_>\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
      (1 (ignore
          (forward-char -1)
          (when (or (not (memq (char-after (match-beginning 0)) '(?\s ?\t)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index bd8c734e0b9..b1c6b01c4dc 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1206,12 +1206,18 @@ the line will be re-indented automatically if needed."
            (eolp)
            ;; Avoid re-indenting on extra colon
            (not (equal ?: (char-before (1- (point)))))
-           (not (python-syntax-comment-or-string-p))
-           ;; Never re-indent at beginning of defun
-           (not (save-excursion
-                  (python-nav-beginning-of-statement)
-                  (python-info-looking-at-beginning-of-defun))))
-      (python-indent-line)))))
+           (not (python-syntax-comment-or-string-p)))
+      ;; Just re-indent dedenters
+      (let ((dedenter-pos (python-info-dedenter-statement-p))
+            (current-pos (point)))
+        (when dedenter-pos
+          (save-excursion
+            (goto-char dedenter-pos)
+            (python-indent-line)
+            (unless (= (line-number-at-pos dedenter-pos)
+                       (line-number-at-pos current-pos))
+              ;; Reindent region if this is a multiline statement
+              (python-indent-region dedenter-pos current-pos)))))))))
 
 
 ;;; Navigation
@@ -2608,9 +2614,12 @@ there for compatibility with CEDET.")
               (concat (file-remote-p default-directory) "/tmp")
             temporary-file-directory))
          (temp-file-name (make-temp-file "py"))
+         ;; XXX: Python's built-in compile function accepts utf-8 as
+         ;; input so there's no need to enforce a coding cookie.  In
+         ;; the future making `coding-system-for-write' match the
+         ;; current buffer's coding may be a good idea.
          (coding-system-for-write 'utf-8))
     (with-temp-file temp-file-name
-      (insert "# -*- coding: utf-8 -*-\n") ;Not needed for Python-3.
       (insert string)
       (delete-trailing-whitespace))
     temp-file-name))
@@ -2620,8 +2629,9 @@ there for compatibility with CEDET.")
   (interactive "sPython command: ")
   (let ((process (or process (python-shell-get-or-create-process))))
     (if (string-match ".\n+." string)   ;Multiline.
-        (let* ((temp-file-name (python-shell--save-temp-file string)))
-          (python-shell-send-file temp-file-name process temp-file-name t))
+        (let* ((temp-file-name (python-shell--save-temp-file string))
+               (file-name (or (buffer-file-name) temp-file-name)))
+          (python-shell-send-file file-name process temp-file-name t))
       (comint-send-string process string)
       (when (or (not (string-match "\n\\'" string))
                 (string-match "\n[ \t].*\n?\\'" string))
@@ -2697,12 +2707,6 @@ Returns the output.  See `python-shell-send-string-no-output'."
 (define-obsolete-function-alias
   'python-send-string 'python-shell-internal-send-string "24.3")
 
-(defvar python--use-fake-loc nil
-  "If non-nil, use `compilation-fake-loc' to trace errors back to the buffer.
-If nil, regions of text are prepended by the corresponding number of empty
-lines and Python is told to output error messages referring to the whole
-source file.")
-
 (defun python-shell-buffer-substring (start end &optional nomain)
   "Send buffer substring from START to END formatted for shell.
 This is a wrapper over `buffer-substring' that takes care of
@@ -2715,8 +2719,7 @@ the python shell:
   3. Wraps indented regions under an \"if True:\" block so the
      interpreter evaluates them correctly."
   (let ((substring (buffer-substring-no-properties start end))
-        (fillstr (unless python--use-fake-loc
-                   (make-string (1- (line-number-at-pos start)) ?\n)))
+        (fillstr (make-string (1- (line-number-at-pos start)) ?\n))
         (toplevel-block-p (save-excursion
                             (goto-char start)
                             (or (zerop (line-number-at-pos start))
@@ -2728,11 +2731,6 @@ the python shell:
       (if fillstr (insert fillstr))
       (insert substring)
       (goto-char (point-min))
-      (unless python--use-fake-loc
-        ;; python-shell--save-temp-file adds an extra coding line, which would
-        ;; throw off the line-counts, so let's try to compensate here.
-        (if (looking-at "[ \t]*[#\n]")
-            (delete-region (point) (line-beginning-position 2))))
       (when (not toplevel-block-p)
         (insert "if True:")
         (delete-region (point) (line-end-position)))
@@ -2756,26 +2754,14 @@ the python shell:
                  (line-number-at-pos if-name-main-start)) ?\n)))))
       (buffer-substring-no-properties (point-min) (point-max)))))
 
-(declare-function compilation-fake-loc "compile"
-                  (marker file &optional line col))
-
 (defun python-shell-send-region (start end &optional nomain)
   "Send the region delimited by START and END to inferior Python process."
   (interactive "r")
-  (let* ((python--use-fake-loc
-          (or python--use-fake-loc (not buffer-file-name)))
-         (string (python-shell-buffer-substring start end nomain))
+  (let* ((string (python-shell-buffer-substring start end nomain))
          (process (python-shell-get-or-create-process))
          (_ (string-match "\\`\n*\\(.*\\)" string)))
     (message "Sent: %s..." (match-string 1 string))
-    (let* ((temp-file-name (python-shell--save-temp-file string))
-           (file-name (or (buffer-file-name) temp-file-name)))
-      (python-shell-send-file file-name process temp-file-name t)
-      (unless python--use-fake-loc
-        (with-current-buffer (process-buffer process)
-          (compilation-fake-loc (copy-marker start) temp-file-name
-                                2)) ;; Not 1, because of the added coding line.
-        ))))
+    (python-shell-send-string string process)))
 
 (defun python-shell-send-buffer (&optional arg)
   "Send the entire buffer to inferior Python process.
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 524749d6266..904e9dfc289 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2374,7 +2374,7 @@ Calls the value of `sh-set-shell-hook' if set."
             (sh-make-vars-local))
         (message "Indentation setup for shell type %s" sh-shell))
     (message "No indentation for this shell type.")
-    (setq indent-line-function 'sh-basic-indent-line))
+    (setq-local indent-line-function 'sh-basic-indent-line))
   (when font-lock-mode
     (setq font-lock-set-defaults nil)
     (font-lock-set-defaults)