[nongnu] elpa/jade-mode 275ab149ed 051/128: Merge pull request #11 from jkpl/master

[ELPA Syncer]

branch: elpa/jade-mode
commit 275ab149edb0f6bcfae6ac17ba456f3351191604
Merge: ed4275a1f8 3db33f4642
Author: Brian Carlson <brian.m.carlson@gmail.com>
Commit: Brian Carlson <brian.m.carlson@gmail.com>

    Merge pull request #11 from jkpl/master
    
    Improved sws indent and stylus syntax highlight
---
 stylus-mode.el |  1 +
 sws-mode.el    | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/stylus-mode.el b/stylus-mode.el
index 63eef0b6d0..46cc196249 100644
--- a/stylus-mode.el
+++ b/stylus-mode.el
@@ -57,6 +57,7 @@
     (modify-syntax-entry ?\/ ". 124b" syntable)
     (modify-syntax-entry ?* ". 23" syntable)
     (modify-syntax-entry ?\n "> b" syntable)
+    (modify-syntax-entry ?' "\"" syntable)
     syntable)
   "Syntax table for `stylus-mode'.")
 
diff --git a/sws-mode.el b/sws-mode.el
index 51dbcd137e..094211490b 100644
--- a/sws-mode.el
+++ b/sws-mode.el
@@ -14,8 +14,11 @@
 (defun sws-previous-indentation ()
   "Gets indentation of previous line"
   (save-excursion
-    (previous-line)
-    (current-indentation)))
+    (forward-line -1)
+    (if (bobp) 0
+      (progn
+        (while (and (looking-at "^[ \t]*$") (not (bobp))) (forward-line -1))
+        (current-indentation)))))
 
 (defun sws-max-indent ()
   "Calculates max indentation"
@@ -44,12 +47,13 @@
 (defun sws-indent-line ()
   "Indents current line"
   (interactive)
-  (if mark-active
-      (sws-indent-region)
-    (if (sws-at-bot-p)
-        (sws-do-indent-line)
-      ;; instead of adjusting indent, move point to text
-      (sws-point-to-bot))))
+  (if (eq this-command 'indent-for-tab-command)
+    (if mark-active
+        (sws-indent-region (region-beginning) (region-end))
+      (if (sws-at-bot-p)
+          (sws-do-indent-line)
+        (sws-point-to-bot)))
+    (indent-to (sws-previous-indentation))))
 
 (defun sws-at-bol-p ()
   "If point is at beginning of line"