auto upstream

5 files changed, 44 insertions, 23 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d783443f528..5efa7810ad2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2013-01-24  Aaron Ecay <aaronecay@gmail.com>  (tiny change)
+
+        * paren.el (show-paren-function): Make sure to set 'priority and
+        'face only if the overlay does exist.
+
+2013-01-24  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-tramp-file-p): Check, whether NAME is unibyte.
+
+        * net/tramp-sh.el (tramp-sh-handle-set-file-acl): Do not suppress
+        basic attributes.
+        (tramp-sh-handle-set-file-acl): Improve error checking.
+
+2013-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * doc-view.el (doc-view-display): Force mode line update until all
+        document is converted.  Suggested by Stefan Monnier (Bug#13164).
+
 2013-01-23  Bastien Guerry  <bzg@gnu.org>
 
         * paren.el (show-paren-function): Make sure an overlay exists
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index fa54eef828d..30aa3a09bf2 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1265,6 +1265,8 @@ have the page we want to view."
                                            "[0-9]+")
                                    t)
                   'doc-view-sort))
+      (unless (eq (length prev-pages) (length doc-view-current-files))
+        (force-mode-line-update))
       (dolist (win (or (get-buffer-window-list buffer nil t)
                        (list t)))
         (let* ((page (doc-view-current-page win))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 743c8dbe0f9..21c747967af 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1549,7 +1549,7 @@ be non-negative integers."
       (when (and (tramp-remote-acl-p v)
                  (tramp-send-command-and-check
                   v (format
-                     "getfacl -acs %s 2>/dev/null"
+                     "getfacl -ac %s 2>/dev/null"
                      (tramp-shell-quote-argument localname))))
         (with-current-buffer (tramp-get-connection-buffer v)
           (goto-char (point-max))
@@ -1560,21 +1560,20 @@ be non-negative integers."
 
 (defun tramp-sh-handle-set-file-acl (filename acl-string)
   "Like `set-file-acl' for Tramp files."
-  (with-parsed-tramp-file-name filename 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 nil))))
-        ;; In case of errors, we return `nil'.
-        (error
-         (tramp-set-file-property v localname "file-acl" 'undef)
-         nil)))))
+  (with-parsed-tramp-file-name (expand-file-name filename) nil
+    (if (and (stringp acl-string) (tramp-remote-acl-p v)
+             (progn
+               (tramp-send-command
+                v (format "setfacl --set-file=- %s <<'EOF'\n%s\nEOF\n"
+                          (tramp-shell-quote-argument localname) acl-string))
+               (tramp-send-command-and-check v nil)))
+        ;; Success.
+        (progn
+          (tramp-set-file-property v localname "file-acl" acl-string)
+          t)
+      ;; In case of errors, we return `nil'.
+      (tramp-set-file-property v localname "file-acl-string" 'undef)
+      nil)))
 
 ;; Simple functions using the `test' command.
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 69e82de3f7f..045304cbc4f 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1140,9 +1140,12 @@ If the `tramp-methods' entry does not exist, return nil."
 
 ;;;###tramp-autoload
 (defun tramp-tramp-file-p (name)
-  "Return t if NAME is a string with Tramp file name syntax."
+  "Return t if NAME is a string with Tramp file name syntax.
+It checks also, whether NAME is unibyte encoded."
   (save-match-data
-    (and (stringp name) (string-match tramp-file-name-regexp name))))
+    (and (stringp name)
+         (string-equal name (string-as-unibyte name))
+         (string-match tramp-file-name-regexp name))))
 
 (defun tramp-find-method (method user host)
   "Return the right method string to use.
diff --git a/lisp/paren.el b/lisp/paren.el
index bf2238d4907..a9d3be60622 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -259,11 +259,10 @@ matching parenthesis is highlighted in `show-paren-style' after
                             (- (point) dir)))))
               (if show-paren-overlay
                   (move-overlay show-paren-overlay from to (current-buffer))
-                (setq show-paren-overlay (make-overlay from to nil t)))))
-          ;;
-          ;; Always set the overlay face, since it varies.
-          (overlay-put show-paren-overlay 'priority show-paren-priority)
-          (overlay-put show-paren-overlay 'face face)))
+                (setq show-paren-overlay (make-overlay from to nil t))))
+            ;; Always set the overlay face, since it varies.
+            (overlay-put show-paren-overlay 'priority show-paren-priority)
+            (overlay-put show-paren-overlay 'face face))))
     ;; show-paren-mode is nil in this buffer.
     (and show-paren-overlay
          (delete-overlay show-paren-overlay))