diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-09-10 11:13:47 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-09-10 11:13:47 +0200 |
commit | ba104f34830f9bf4d5c275ef3aaf8e5d9ff650d4 (patch) | |
tree | 1cfb61bc3ba2f441ddfc0fe707ea7dbc3fc35855 | |
parent | 66a2119ae6a217a160ee02c5a6773372ad997399 (diff) | |
parent | 62dc515ae520422fc35409232884ac6d9e3b3d74 (diff) | |
download | org-mode-ba104f34830f9bf4d5c275ef3aaf8e5d9ff650d4.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ob-tangle.el | 14 | ||||
-rw-r--r-- | testing/lisp/test-ob-tangle.el | 17 |
2 files changed, 26 insertions, 5 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index cf48db3..3852185 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -362,13 +362,17 @@ that the appropriate major-mode is set. SPEC has the form: (when (and comments (not (string= comments "no")) (> (length text) 0)) (if org-babel-tangle-uncomment-comments - ;; just plain comments with no processing + ;; Plain comments: no processing. (insert text) - ;; ensure comments are made to be - ;; comments, and add a trailing newline + ;; Ensure comments are made to be + ;; comments, and add a trailing + ;; newline. Also ignore invisible + ;; characters when commenting. (comment-region - (point) (progn (insert text) (point))) - (end-of-line nil) + (point) + (progn (insert (org-no-properties text)) + (point))) + (end-of-line) (insert "\n")))))) (when comment (funcall insert-comment comment)) (when link-p diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el index 8a8e2be..9367f03 100644 --- a/testing/lisp/test-ob-tangle.el +++ b/testing/lisp/test-ob-tangle.el @@ -77,6 +77,23 @@ (should (string-match (regexp-quote "simple") expanded)) (should (string-match (regexp-quote "length 14") expanded))))) +(ert-deftest ob-tangle/comment-links-at-left-margin () + "Test commenting of links at left margin." + (should + (string-match + (regexp-quote "# [[http://orgmode.org][Org mode]]") + (org-test-with-temp-text-in-file + "[[http://orgmode.org][Org mode]] +#+header: :comments org :tangle \"test-ob-tangle.sh\" +#+begin_src sh +echo 1 +#+end_src" + (unwind-protect + (progn (org-babel-tangle) + (with-temp-buffer (insert-file-contents "test-ob-tangle.sh") + (buffer-string))) + (delete-file "test-ob-tangle.sh")))))) + (provide 'test-ob-tangle) ;;; test-ob-tangle.el ends here |