Merge branch 'maint'

lisp/org-remember.el

@@ -840,12 +840,12 @@ See also the variable `org-reverse-note-order'."
       (if (= end beg) (setq beg (1- beg)))
       (put-text-property beg end 'org-position-cursor t)))
   (goto-char (point-min))
-  (while (looking-at "^[ \t]*\n\\|^##.*\n")
+  (while (looking-at "^[ \t]*\n\\|^# .*\n")
     (replace-match ""))
   (when org-remember-delete-empty-lines-at-end
     (goto-char (point-max))
     (beginning-of-line 1)
-    (while (and (looking-at "[ \t]*$\\|##.*") (> (point) 1))
+    (while (and (looking-at "[ \t]*$\\|[ \t]*# .*") (> (point) 1))
       (delete-region (1- (point)) (point-max))
       (beginning-of-line 1)))
   (catch 'quit

lisp/org-src.el

@@ -690,7 +690,7 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
     (goto-char beg)
     (when allow-write-back-p
       (delete-region beg (max beg (1- end)))
-      (unless (string-match "^[ \t]*$" code)
+      (unless (string-match "\\`[ \t]*\\'" code)
 	(insert code)
 	(delete-char 1))
       (goto-char beg)

lisp/org.el

@@ -11315,7 +11315,7 @@ This function can be used in a hook."
     "COLUMNS:" "PROPERTY:"
     "CAPTION:" "LABEL:"
     "SETUPFILE:"
-    "INCLUDE:"
+    "INCLUDE:" "INDEX:"
     "BIND:"
     "MACRO:"))