[nongnu] elpa/scala-mode 1641807a27 4/4: Merge pull request #188 from Hi-Angel/fix-some-docs

[ELPA Syncer]

branch: elpa/scala-mode
commit 1641807a27fb7b2105a535f6384531c15543ecae
Merge: bd0638c32a 473f2cb66a
Author: Heikki Vesalainen <heikkivesalainen@yahoo.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #188 from Hi-Angel/fix-some-docs
    
    Multiple docstring fixes
---
 scala-mode-prettify-symbols.el |  3 ++-
 scala-mode-syntax.el           | 10 ++++++----
 scala-mode.el                  |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/scala-mode-prettify-symbols.el b/scala-mode-prettify-symbols.el
index 73dd2593f0..3171addffc 100644
--- a/scala-mode-prettify-symbols.el
+++ b/scala-mode-prettify-symbols.el
@@ -76,7 +76,8 @@
     (">>" . ?≫)
     ("followedBy" . ?≫)
     ("<+>" . ?⊕))
-  "Prettify rules for category theory related operators (for use with 
cats/scalaz/...).")
+  "Prettify rules for category theory related operators (for use with
+cats/scalaz/...).")
 
 (defcustom
   scala-prettify-symbols-alist
diff --git a/scala-mode-syntax.el b/scala-mode-syntax.el
index edab1ab2e9..a0c815bb85 100644
--- a/scala-mode-syntax.el
+++ b/scala-mode-syntax.el
@@ -407,7 +407,7 @@
 
 (defconst scala-syntax:list-keywords-re
   (regexp-opt '("var" "val" "import") 'words)
-  ("Keywords that can start a list"))
+  "Keywords that can start a list")
 
 (defconst scala-syntax:case-re
   "\\<case\\>")
@@ -647,12 +647,12 @@ symbol constituents (syntax 3)."
 ;;;;
 
 (defun scala-syntax:beginning-of-code-line ()
-  (interactive)
   "Move to the beginning of code on the line, or to the end of
 the line, if the line is empty. Return the new point.  Not to be
 called on a line whose start is inside a comment, i.e. a comment
 begins on the previous line and continues past the start of this
 line."
+  (interactive)
   ;; TODO: make it work even if the start IS inside a comment
   (beginning-of-line)
   (let ((eol (line-end-position))
@@ -995,7 +995,8 @@ not. A list must be either enclosed in parentheses or start 
with
 
 (defun scala-syntax:beginning-of-definition ()
   "This function may not work properly with certain types of scala definitions.
-For example, no care has been taken to support multiple assignments to vals 
such as
+For example, no care has been taken to support multiple assignments to
+vals such as
 
 val a, b = (1, 2)
 "
@@ -1009,7 +1010,8 @@ val a, b = (1, 2)
 
 (defun scala-syntax:end-of-definition ()
   "This function may not work properly with certain types of scala definitions.
-For example, no care has been taken to support multiple assignments to vals 
such as
+For example, no care has been taken to support multiple assignments to
+vals such as
 
 val a, b = (1, 2)
 "
diff --git a/scala-mode.el b/scala-mode.el
index 7fb201986d..ddabd3ae8f 100644
--- a/scala-mode.el
+++ b/scala-mode.el
@@ -73,7 +73,9 @@ If there is no plausible default, return nil."
 
 ;;;###autoload
 (defun scala-mode:set-scala-syntax-mode ()
-  "Sets the syntax-table and other related variables for the current buffer to 
those of scala-mode. Can be used to make some other major mode (such as 
sbt-mode) use scala syntax-table."
+  "Sets the syntax-table and other related variables for the current buffer
+to those of scala-mode. Can be used to make some other major mode (such
+as sbt-mode) use scala syntax-table."
   (set-syntax-table scala-syntax:syntax-table)
   (scala-mode:make-local-variables
    'syntax-propertize-function