diff options
author | Bastien Guerry <bzg@altern.org> | 2012-10-29 07:41:29 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-10-29 07:41:29 +0100 |
commit | 0513f11b16dc0190e49391a9116e32f33f59a4fe (patch) | |
tree | cade73dc2892bff879469eb2ca0b8259fba8e5b2 | |
parent | 90fcb4b841ee8a6d32c54d63ed98457a58586cea (diff) | |
parent | d22e732d7a688622729fb2d4994cf95a94dd0598 (diff) | |
download | org-mode-0513f11b16dc0190e49391a9116e32f33f59a4fe.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-remember.el | 4 | ||||
-rw-r--r-- | lisp/org-src.el | 2 | ||||
-rw-r--r-- | lisp/org.el | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org-remember.el b/lisp/org-remember.el index bfbca73..5cfe70f 100644 --- a/lisp/org-remember.el +++ b/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 diff --git a/lisp/org-src.el b/lisp/org-src.el index b4d4c04..75db1d7 100644 --- a/lisp/org-src.el +++ b/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) diff --git a/lisp/org.el b/lisp/org.el index 2aa70bd..4794315 100644 --- a/lisp/org.el +++ b/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:")) |