Fix issue with roxygen refilling

Partial fix for emacs-ess#263
e3bo · Nov 5, 2015 · 7d1e641 · 7d1e641
1 parent 8ffa19c
commit 7d1e641
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lisp/ess-roxy.el b/lisp/ess-roxy.el
@@ -777,7 +777,8 @@ list of strings."
            (looking-at "#")))
     (ess-roxy-with-filling-context
       ad-do-it))
-   ((ess-point-in-comment-p)
+   ((and (not (ess-roxy-entry-p))
+         (ess-point-in-comment-p))
     ad-do-it)
    ;; Filling of call arguments with point on call name
    ((and ess-fill-calls

diff --git a/test/literate/roxy.R b/test/literate/roxy.R
@@ -17,11 +17,10 @@ NULL
 ##'     sed do eiusmod tempor incididunt ut labore et dolore magna
 ##'     aliqua. Ut enim ad minim veniam, quis nostrud exercitation
 ##'     ullamco laboris nisi ut aliquip ex ea commodo consequat.
-##'     @param Lorem ipsum dolor sit amet, consectetur adipiscing
-##'     elit, sed do eiusmod tempor incididunt ut labore et dolore
-##'     magna aliqua. Ut enim ad minim veniam, quis nostrud
-##'     exercitation ullamco laboris nisi ut aliquip ex ea commodo
-##'     consequat.
+##' @param Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+##'     sed do eiusmod tempor incididunt ut labore et dolore magna
+##'     aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+##'     ullamco laboris nisi ut aliquip ex ea commodo consequat.
 NULL