auto upstream

13 files changed, 237 insertions, 59 deletions

diff --git a/admin/notes/bzr b/admin/notes/bzr
index 50eaf3710ee..cdcfa7e7e3d 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -182,6 +182,71 @@ where revision N+1 is the one where file was removed.
 You could also try `bzr add --file-ids-from', if you have a copy of
 another branch where file still exists.
 
+* Undoing a commit (uncommitting)
+
+It is possible to undo/remove a bzr commit (ie, to uncommit).
+Only do this if you really, really, need to.  For example, if you
+somehow made a commit that triggers a bug in bzr itself.
+Don't do it because you made a typo in a commit or the log.
+
+If you do need to do this, do it as soon as possible, because the
+longer you leave it, the more work is involved.
+
+0. First, tell emacs-devel that you are going to do this, and suggest
+people not commit anything to the affected branch for the duration.
+
+In the following, replace USER with your Savannah username, and
+BRANCH with the name of the branch.
+Let's assume that revno 100 is the bad commit, and that there have
+been two more commits after that (because nothing is ever easy).
+
+1. Ensure your copy of the branch is up-to-date (for a bound
+branch, bzr up; for an unbound branch, bzr pull) and has no local
+changes (bzr st).
+
+2. Make a record of the commits you are going to undo:
+bzr diff -c 102 > /tmp/102.diff
+etc
+
+Also record the commit message, author, and any --fixes information.
+
+3. Most Emacs branches are set up to prevent just this kind of thing.
+So we need to disable that protection:
+
+bzr config append_revisions_only=False \
+  -d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/
+
+4. Undo the commits:
+bzr uncommit -r -4
+
+This will show the commits it is going to undo, and prompt you to confirm.
+
+5. If using an unbound branch:
+bzr push --overwrite
+
+6. Now, replay the commits you just undid (obviously, fix whatever it
+was in the bad commit that caused the problem):
+
+patch -p0 < /tmp/100.diff
+bzr commit --author ... --fixes ... -F /tmp/100.log
+etc
+
+7. If using an unbound branch:
+bzr push
+
+8. Finally, re-enable the branch protection:
+bzr config append_revisions_only=True \
+  -d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/
+
+9. Tell emacs-devel that it is ok to use the branch again.
+Anyone with local changes should back them up before doing anything.
+
+For a bound branch, bzr up will convert any of the undone commits to a
+pending merge. Just bzr revert these away.
+
+For an unbound branch, bzr pull will complain about diverged branches
+and refuse to do anything.  Use bzr pull --overwrite.
+
 * Loggerhead
 
 Loggerhead is the bzr tool for viewing a repository over http (similar
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7893424a942..b2f89024726 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (Changing Files): Document the return values of
+        set-file-selinux-context and set-file-acl.
+
 2012-12-27  Glenn Morris  <rgm@gnu.org>
 
         * files.texi (File Names): Mention Cygwin conversion functions.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 3faa5f5e257..4317fe42523 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1703,9 +1703,11 @@ This function sets the SELinux security context of the file
 @var{filename} to @var{context}.  @xref{File Attributes}, for a brief
 description of SELinux contexts.  The @var{context} argument should be
 a list @code{(@var{user} @var{role} @var{type} @var{range})}, like the
-return value of @code{file-selinux-context}.  The function does
-nothing if SELinux is disabled, or if Emacs was compiled without
-SELinux support.
+return value of @code{file-selinux-context}.  The function returns
+@code{t} if it succeeds to set the SELinux security context of
+@var{filename}, @code{nil} otherwise.  The function does nothing and
+returns @code{nil} if SELinux is disabled, or if Emacs was compiled
+without SELinux support.
 @end defun
 
 @defun set-file-acl filename acl-string
@@ -1713,7 +1715,9 @@ This function sets the ACL entries of the file @var{filename} to
 @var{acl-string}.  @xref{File Attributes}, for a brief description of
 ACLs.  The @var{acl-string} argument should be a string containing the
 textual representation of the desired ACL entries as returned by
-@code{file-acl} (@pxref{File Attributes, file-acl}).
+@code{file-acl} (@pxref{File Attributes, file-acl}).  The function
+returns @code{t} if it succeeds to set the ACL entries of
+@var{filename}, @code{nil} otherwise.
 @end defun
 
 @node File Names
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
diff --git a/src/ChangeLog b/src/ChangeLog
index 79d1982cc0e..e95df2b8953 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fset_file_selinux_context, Fset_file_acl): Return t if
+        file's SELinux context or ACLs successfully set, nil otherwise.
+        (Bug#13298)
+        (Fcopy_file) [WINDOWSNT]: Improve diagnostics when CopyFile fails.
+
+        * w32proc.c (reader_thread): Avoid passing NULL handles to
+        SetEvent and WaitForSingleObject.
+
 2012-12-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port EXTERNALLY_VISIBLE to Clang 3.2.
diff --git a/src/data.c b/src/data.c
index a72fa3e2b5f..c0f35ac0916 100644
--- a/src/data.c
+++ b/src/data.c
@@ -583,7 +583,7 @@ DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0,
   (register Lisp_Object symbol)
 {
   CHECK_SYMBOL (symbol);
-    return XSYMBOL (symbol)->function;
+  return XSYMBOL (symbol)->function;
 }
 
 DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
diff --git a/src/fileio.c b/src/fileio.c
index 9f70c790592..0e63e3f18d9 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2029,7 +2029,15 @@ entries (depending on how Emacs was built).  */)
   if (!CopyFile (SDATA (encoded_file),
                  SDATA (encoded_newname),
                  FALSE))
-    report_file_error ("Copying file", Fcons (file, Fcons (newname, Qnil)));
+    {
+      /* CopyFile doesn't set errno when it fails.  By far the most
+         "popular" reason is that the target is read-only.  */
+      if (GetLastError () == 5)
+        errno = EACCES;
+      else
+        errno = EPERM;
+      report_file_error ("Copying file", Fcons (file, Fcons (newname, Qnil)));
+    }
   /* CopyFile retains the timestamp by default.  */
   else if (NILP (keep_time))
     {
@@ -2996,8 +3004,10 @@ DEFUN ("set-file-selinux-context", Fset_file_selinux_context,
 CONTEXT should be a list (USER ROLE TYPE RANGE), where the list
 elements are strings naming the components of a SELinux context.
 
-This function does nothing if SELinux is disabled, or if Emacs was not
-compiled with SELinux support.  */)
+Value is t if setting of SELinux context was successful, nil otherwise.
+
+This function does nothing and returns nil if SELinux is disabled,
+or if Emacs was not compiled with SELinux support.  */)
   (Lisp_Object filename, Lisp_Object context)
 {
   Lisp_Object absname;
@@ -3063,6 +3073,7 @@ compiled with SELinux support.  */)
 
           context_free (parsed_con);
           freecon (con);
+          return fail ? Qnil : Qt;
         }
       else
         report_file_error ("Doing lgetfilecon", Fcons (absname, Qnil));
@@ -3127,6 +3138,8 @@ DEFUN ("set-file-acl", Fset_file_acl, Sset_file_acl,
 ACL-STRING should contain the textual representation of the ACL
 entries in a format suitable for the platform.
 
+Value is t if setting of ACL was successful, nil otherwise.
+
 Setting ACL for local files requires Emacs to be built with ACL
 support.  */)
   (Lisp_Object filename, Lisp_Object acl_string)
@@ -3166,6 +3179,7 @@ support.  */)
         report_file_error ("Setting ACL", Fcons (absname, Qnil));
 
       acl_free (acl);
+      return fail ? Qnil : Qt;
     }
 #endif
 
diff --git a/src/w32proc.c b/src/w32proc.c
index 5c43a57db29..8977ca38a15 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -970,6 +970,11 @@ reader_thread (void *arg)
       else
         rc = _sys_read_ahead (cp->fd);
 
+      /* Don't bother waiting for the event if we already have been
+         told to exit by delete_child.  */
+      if (cp->status == STATUS_READ_ERROR || !cp->char_avail)
+        break;
+
       /* The name char_avail is a misnomer - it really just means the
          read-ahead has completed, whether successfully or not. */
       if (!SetEvent (cp->char_avail))
@@ -986,6 +991,11 @@ reader_thread (void *arg)
       if (rc == STATUS_READ_FAILED)
         break;
 
+      /* Don't bother waiting for the acknowledge if we already have
+         been told to exit by delete_child.  */
+      if (cp->status == STATUS_READ_ERROR || !cp->char_consumed)
+        break;
+
       /* Wait until our input is acknowledged before reading again */
       if (WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0)
         {
@@ -993,6 +1003,8 @@ reader_thread (void *arg)
                      "%lu for fd %ld\n", GetLastError (), cp->fd));
           break;
         }
+      /* delete_child sets status to STATUS_READ_ERROR when it wants
+         us to exit.  */
       if (cp->status == STATUS_READ_ERROR)
         break;
     }