auto upstream

6 files changed, 119 insertions, 51 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1083dc5513d..81b4978dba5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2012-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-acl): Suppress basic attributes.
+        (tramp-sh-handle-set-file-acl): Return `t' on success.
+
+2012-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (backup-buffer-copy, basic-save-buffer-2): If
+        set-file-extended-attributes fails, fall back on set-file-modes
+        instead of signaling an error.  (Bug#13298)
+        (basic-save-buffer): Likewise.
+
+2012-12-29  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el: Support other commands triggering
+        python-indent-line so indentation cycling continues to work.
+        (python-indent-trigger-commands): New defcustom.
+        (python-indent-line): Use it.
+
+2012-12-29  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-shell-send-region): Add blank lines
+        for non sent code so backtraces remain correct.
+
+2012-12-29  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el: Remove cl dependency.
+        (python-syntax-count-quotes): Replace incf call.
+        (python-fill-string): Replace setf call.
+
+2012-12-29  Damien Cassou  <damien.cassou@gmail.com>
+
+        * info.el (info-other-window): New arg, for consistency with info.
+
 2012-12-28  Martin Rudalics  <rudalics@gmx.at>
 
         * mail/rmail.el (rmail-maybe-display-summary): Rewrite
diff --git a/lisp/files.el b/lisp/files.el
index f076530fbc8..e8be1a09047 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4019,10 +4019,12 @@ BACKUPNAME is the backup file name, which is the old file renamed."
               nil)))
       ;; Reset the umask.
       (set-default-file-modes umask)))
-  (and modes
-       (set-file-modes to-name (logand modes #o1777)))
-  (and extended-attributes
-       (set-file-extended-attributes to-name extended-attributes)))
+  ;; If set-file-extended-attributes fails, fall back on set-file-modes.
+  (unless (and extended-attributes
+               (with-demoted-errors
+                 (set-file-extended-attributes to-name extended-attributes)))
+    (and modes
+         (set-file-modes to-name (logand modes #o1777)))))
 
 (defvar file-name-version-regexp
   "\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(?:~[[:digit:]]+\\)?~\\)"
@@ -4619,9 +4621,11 @@ Before and after saving the buffer, this function runs
             (if setmodes
                 (condition-case ()
                     (progn
-                      (set-file-modes buffer-file-name (car setmodes))
-                      (set-file-extended-attributes buffer-file-name
-                                                    (nth 1 setmodes)))
+                      (unless
+                          (with-demoted-errors
+                            (set-file-modes buffer-file-name (car setmodes)))
+                        (set-file-extended-attributes buffer-file-name
+                                                      (nth 1 setmodes))))
                   (error nil))))
           ;; If the auto-save file was recent before this command,
           ;; delete it now.
@@ -4737,8 +4741,14 @@ Before and after saving the buffer, this function runs
                (setq setmodes (list (file-modes buffer-file-name)
                                     (file-extended-attributes buffer-file-name)
                                     buffer-file-name))
-               (set-file-modes buffer-file-name (logior (car setmodes) 128))
-               (set-file-extended-attributes buffer-file-name (nth 1 setmodes)))))
+               ;; If set-file-extended-attributes fails, fall back on
+               ;; set-file-modes.
+               (unless
+                   (with-demoted-errors
+                     (set-file-extended-attributes buffer-file-name
+                                                   (nth 1 setmodes)))
+                 (set-file-modes buffer-file-name
+                                 (logior (car setmodes) 128))))))
         (let (success)
           (unwind-protect
               (progn
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b9df3bb9cf7..e17661095e4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -26,11 +26,11 @@
 
 2012-12-27  Andreas Schwab  <schwab@linux-m68k.org>
 
-        * mml2015.el (mml2015-epg-key-image): separate attribute stream from
+        * mml2015.el (mml2015-epg-key-image): Separate attribute stream from
         stderr.
 
-        * nnimap.el (nnimap-find-article-by-message-id):
-        Don't error out if group is nil.
+        * nnimap.el (nnimap-find-article-by-message-id): Don't error out if
+        group is nil.
 
         * shr.el (shr-tag-em): Render as italic, not bold.
 
diff --git a/lisp/info.el b/lisp/info.el
index 19f9212f88a..07d5c66201d 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -746,11 +746,15 @@ in `Info-file-supports-index-cookies-list'."
                   (push dir Info-directory-list)))))))
 
 ;;;###autoload
-(defun info-other-window (&optional file-or-node)
+(defun info-other-window (&optional file-or-node buffer)
   "Like `info' but show the Info buffer in another window."
-  (interactive (if current-prefix-arg
-                   (list (read-file-name "Info file name: " nil nil t))))
-  (info-setup file-or-node (switch-to-buffer-other-window "*info*")))
+  (interactive (list
+                (if (and current-prefix-arg (not (numberp current-prefix-arg)))
+                    (read-file-name "Info file name: " nil nil t))
+                (if (numberp current-prefix-arg)
+                    (format "*info*<%s>" current-prefix-arg))))
+  (info-setup file-or-node
+              (switch-to-buffer-other-window (or buffer "*info*"))))
 
 ;;;###autoload (put 'info 'info-file (purecopy "emacs"))
 ;;;###autoload
@@ -767,8 +771,9 @@ with the top-level Info directory.
 
 In interactive use, a non-numeric prefix argument directs
 this command to read a file name from the minibuffer.
-A numeric prefix argument selects an Info buffer with the prefix number
-appended to the Info buffer name.
+
+A numeric prefix argument N selects an Info buffer named
+\"*info*<%s>\".
 
 The search path for Info files is in the variable `Info-directory-list'.
 The top-level Info directory is made by combining all the files named `dir'
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 67459b4f9ca..ebc377c08c8 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1547,25 +1547,31 @@ and gid of the corresponding user is taken.  Both parameters must be integers."
       (when (and (tramp-remote-acl-p v)
                  (tramp-send-command-and-check
                   v (format
-                     "getfacl -ac %s 2>/dev/null"
+                     "getfacl -acs %s 2>/dev/null"
                      (tramp-shell-quote-argument localname))))
         (with-current-buffer (tramp-get-connection-buffer v)
           (goto-char (point-max))
           (delete-blank-lines)
-          (substring-no-properties (buffer-string)))))))
+          (when (> (point-max) (point-min))
+            (substring-no-properties (buffer-string))))))))
 
 (defun tramp-sh-handle-set-file-acl (filename acl-string)
   "Like `set-file-acl' for Tramp files."
   (with-parsed-tramp-file-name filename nil
-    (if (and (stringp acl-string)
-             (tramp-remote-acl-p v)
-             (tramp-send-command-and-check
-              v (format "setfacl --set-file=- %s <<'EOF'\n%s\nEOF\n"
-                        (tramp-shell-quote-argument localname) acl-string)))
-        (tramp-set-file-property v localname "file-acl" acl-string)
-      (tramp-set-file-property v localname "file-acl-string" 'undef)))
-  ;; We always return nil.
-  nil)
+    (when (tramp-remote-acl-p v)
+      (condition-case nil
+          (when (stringp acl-string)
+            (tramp-set-file-property v localname "file-acl" acl-string)
+            (dolist (line (split-string acl-string nil t) t)
+              (unless (tramp-send-command-and-check
+                       v (format
+                          "setfacl -m %s %s"
+                          line (tramp-shell-quote-argument localname)))
+                (error))))
+        ;; In case of errors, we return `nil'.
+        (error
+         (tramp-set-file-property v localname "file-acl" 'undef)
+         nil)))))
 
 ;; Simple functions using the `test' command.
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 67388c0339b..54a657a2593 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -204,7 +204,6 @@
 
 (require 'ansi-color)
 (require 'comint)
-(eval-when-compile (require 'cl-lib))
 
 ;; Avoid compiler warnings
 (defvar view-return-to-alist)
@@ -529,7 +528,7 @@ is used to limit the scan."
     (while (and (< i 3)
                 (or (not limit) (< (+ point i) limit))
                 (eq (char-after (+ point i)) quote-char))
-      (cl-incf i))
+      (setq i (1+ i)))
     i))
 
 (defun python-syntax-stringify ()
@@ -608,6 +607,12 @@ It makes underscores and dots word constituent chars.")
   :group 'python
   :safe 'booleanp)
 
+(defcustom python-indent-trigger-commands
+  '(indent-for-tab-command yas-expand yas/expand)
+  "Commands that might trigger a `python-indent-line' call."
+  :type '(repeat symbol)
+  :group 'python)
+
 (define-obsolete-variable-alias
   'python-indent 'python-indent-offset "24.3")
 
@@ -906,20 +911,21 @@ Uses the offset calculated in
 indicated by the variable `python-indent-levels' to set the
 current indentation.
 
-When the variable `last-command' is equal to
-`indent-for-tab-command' or FORCE-TOGGLE is non-nil it cycles
-levels indicated in the variable `python-indent-levels' by
-setting the current level in the variable
-`python-indent-current-level'.
-
-When the variable `last-command' is not equal to
-`indent-for-tab-command' and FORCE-TOGGLE is nil it calculates
-possible indentation levels and saves it in the variable
-`python-indent-levels'.  Afterwards it sets the variable
-`python-indent-current-level' correctly so offset is equal
-to (`nth' `python-indent-current-level' `python-indent-levels')"
+When the variable `last-command' is equal to one of the symbols
+inside `python-indent-trigger-commands' or FORCE-TOGGLE is
+non-nil it cycles levels indicated in the variable
+`python-indent-levels' by setting the current level in the
+variable `python-indent-current-level'.
+
+When the variable `last-command' is not equal to one of the
+symbols inside `python-indent-trigger-commands' and FORCE-TOGGLE
+is nil it calculates possible indentation levels and saves it in
+the variable `python-indent-levels'.  Afterwards it sets the
+variable `python-indent-current-level' correctly so offset is
+equal to (`nth' `python-indent-current-level'
+`python-indent-levels')"
   (or
-   (and (or (and (eq this-command 'indent-for-tab-command)
+   (and (or (and (memq this-command python-indent-trigger-commands)
                  (eq last-command this-command))
             force-toggle)
         (not (equal python-indent-levels '(0)))
@@ -2009,7 +2015,14 @@ Returns the output.  See `python-shell-send-string-no-output'."
 (defun python-shell-send-region (start end)
   "Send the region delimited by START and END to inferior Python process."
   (interactive "r")
-  (python-shell-send-string (buffer-substring start end) nil t))
+  (python-shell-send-string
+   (concat
+    (let ((line-num (line-number-at-pos start)))
+      ;; When sending a region, add blank lines for non sent code so
+      ;; backtraces remain correct.
+      (make-string (1- line-num) ?\n))
+    (buffer-substring start end))
+   nil t))
 
 (defun python-shell-send-buffer (&optional arg)
   "Send the entire buffer to inferior Python process.
@@ -2487,12 +2500,12 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'."
 JUSTIFY should be used (if applicable) as in `fill-paragraph'."
   (let* ((marker (point-marker))
          (str-start-pos
-          (let ((m (make-marker)))
-            (setf (marker-position m)
-                  (or (python-syntax-context 'string)
-                      (and (equal (string-to-syntax "|")
-                                  (syntax-after (point)))
-                           (point)))) m))
+          (set-marker
+           (make-marker)
+           (or (python-syntax-context 'string)
+               (and (equal (string-to-syntax "|")
+                           (syntax-after (point)))
+                    (point)))))
          (num-quotes (python-syntax-count-quotes
                       (char-after str-start-pos) str-start-pos))
          (str-end-pos