; Merge from origin/emacs-25

[gnu-emacs] / lisp / org / org-mobile.el

diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index a43896bdd7258d5e949c50fca8a4b31b2e7e30d0..f535390790f0365954871037dfe9f914f9bf7cdb 100644 (file)
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -1,5 +1,5 @@
 ;;; org-mobile.el --- Code for asymmetric sync with a mobile device
-;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -88,7 +88,7 @@ org-agenda-text-search-extra-files
 Encryption uses AES-256, with a password given in
 `org-mobile-encryption-password'.
 When nil, plain files are kept on the server.
-Turning on encryption requires to set the same password in the MobileOrg
+Turning on encryption requires setting the same password in the MobileOrg
 application.  Before turning this on, check of MobileOrg does already
 support it - at the time of this writing it did not yet."
   :group 'org-mobile
@@ -460,6 +460,7 @@ agenda view showing the flagged items."
                              ((stringp x) x)
                              ((eq (car x) :startgroup) "{")
                              ((eq (car x) :endgroup) "}")
+                             ((eq (car x) :grouptags) nil)
                              ((eq (car x) :newline) nil)
                              ((listp x) (car x))))
                      def-tags))
@@ -1073,7 +1074,7 @@ be returned that indicates what went wrong."
            ;; which prevents correct insertion when point is invisible
            (org-show-subtree)
            (end-of-line 1)
-           (org-insert-heading-respect-content '(16) t)
+           (org-insert-heading-respect-content t)
            (org-demote))
        (beginning-of-line)
        (insert "* "))