[nongnu] elpa/beancount 1da4c88ebb 018/103: Merged in elisp-comment-fixes (pull request #107)

[ELPA Syncer]

branch: elpa/beancount
commit 1da4c88ebb5a4c418b60da2944171966be2b2e79
Merge: 8496f49748 3f5e4fcef5
Author: Martin Blais <blais@furius.ca>
Commit: Martin Blais <blais@furius.ca>

    Merged in elisp-comment-fixes (pull request #107)
    
    beancount.el: kill more comment-related Org variables
    
    Approved-by: Martin Blais
---
 beancount.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/beancount.el b/beancount.el
index 04abe799c3..f561655e79 100644
--- a/beancount.el
+++ b/beancount.el
@@ -181,10 +181,14 @@ is great for sectioning large files with many 
transactions.
   ;; Default to `;;' in comment-region.
   (set (make-local-variable 'comment-add) 1)
 
-  ;; Org-mode sets both of these to `org-comment-or-uncomment-region',
-  ;; which doesn't know about our ";" comments.
+  ;; Org-mode sets up its own comment handling because of its unusual comment
+  ;; syntax. Beancount doesn't use org's comments, though, so revert to the
+  ;; normal Emacs comment handlers.
   (kill-local-variable 'comment-region-function)
   (kill-local-variable 'uncomment-region-function)
+  (kill-local-variable 'comment-insert-comment-function)
+  (kill-local-variable 'comment-use-syntax)
+  (kill-local-variable 'comment-start-skip)
 
   ;; No tabs by default.
   (set (make-local-variable 'indent-tabs-mode) nil)