Skip to content

clojure-mode.el (clojure-docstring-fill-prefix): New option #244

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jul 27, 2014
Merged

clojure-mode.el (clojure-docstring-fill-prefix): New option #244

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11361ba
clojure-mode.el (clojure-docstring-fill-prefix): New option
Jul 27, 2014
7060f66
Rename `clojure-docstring-fill-prefix' to `clojure-docstring-fill-pre…
Jul 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions clojure-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,15 @@ Otherwise check `define-clojure-indent' and `put-clojure-indent'."
:group 'clojure
:safe 'integerp)

(defcustom clojure-docstring-fill-prefix-width 2
"Width of `fill-prefix' when filling a docstring.
The default value conforms with the de facto convention for
Clojure docstrings, aligning the second line with the opening
double quotes on the third column."
:type 'integer
:group 'clojure
:safe 'integerp)

(defcustom clojure-omit-space-between-tag-and-delimiters '(?\[ ?\{)
"Allowed opening delimiter characters after a reader literal tag.
For example, \[ is allowed in :db/id[:db.part/user]."
Expand Down Expand Up @@ -296,7 +305,8 @@ ENDP and DELIMITER."
(defun clojure-adaptive-fill-function ()
"Clojure adaptive fill function.
This only takes care of filling docstring correctly."
(if (clojure-in-docstring-p) " "))
(if (clojure-in-docstring-p)
(make-string clojure-docstring-fill-prefix-width ? )))

(defun clojure-fill-paragraph (&optional justify)
"Like `fill-paragraph' but handle Clojure docstrings."
Expand All @@ -307,7 +317,7 @@ This only takes care of filling docstring correctly."
(paragraph-separate
(concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
(fill-column (or clojure-docstring-fill-column fill-column))
(fill-prefix " "))
(fill-prefix (make-string clojure-docstring-fill-prefix-width ? )))
(fill-paragraph justify))
(let ((paragraph-start (concat paragraph-start
"\\|\\s-*\\([(;:\"[]\\|`(\\|#'(\\)"))
Expand Down Expand Up @@ -624,7 +634,9 @@ since these are single objects this behavior is okay."
(if (clojure-in-docstring-p)
(save-excursion
(beginning-of-line)
(when (looking-at "^\\s-*") (replace-match " ")))
(when (looking-at "^\\s-*")
(replace-match
(make-string clojure-docstring-fill-prefix-width ? ))))
(lisp-indent-line)))

(defun clojure-indent-function (indent-point state)
Expand Down