(org-file-remote-p): Get regexp from list.

(org-archive-subtree): remove erraneous `]' from character list.

diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 30ee123388c3af8f2dd44fb2542586fe72d5f42e..c8ecc3df63d564584a75963093432f453de663cc 100644 (file)
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -4569,7 +4569,7 @@ this heading. "
                ;; Make the subtree visible
                (show-subtree)
                (org-end-of-subtree t)
-               (skip-chars-backward " \t\r\n]")
+               (skip-chars-backward " \t\r\n")
                (and (looking-at "[ \t\r\n]*")
                     (replace-match "\n\n")))
            ;; No specific heading, just go to end of file.
@@ -9816,7 +9816,7 @@ on the system \"/user@host:\"."
         ((fboundp 'tramp-handle-file-remote-p)
          (tramp-handle-file-remote-p file))
         ((and (boundp 'ange-ftp-name-format)
-              (string-match ange-ftp-name-format file))
+              (string-match (car ange-ftp-name-format) file))
          t)
         (t nil)))