[Emacs-diffs] /srv/bzr/emacs/trunk r112693: * lisp/emacs-lisp/smie.el (smie-indent-forward-token)

[Stefan Monnier]

------------------------------------------------------------
revno: 112693
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14381
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-23 13:44:38 -0400
message:
  * lisp/emacs-lisp/smie.el (smie-indent-forward-token)
  (smie-indent-backward-token): Handle string tokens.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/smie.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-23 15:27:48 +0000
+++ b/lisp/ChangeLog    2013-05-23 17:44:38 +0000
@@ -1,3 +1,8 @@
+2013-05-23  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/smie.el (smie-indent-forward-token)
+       (smie-indent-backward-token): Handle string tokens (bug#14381).
+
 2013-05-23  Rüdiger Sonderfeld  <address@hidden>
 
        * ielm.el (ielm-menu): New menu.

=== modified file 'lisp/emacs-lisp/smie.el'
--- a/lisp/emacs-lisp/smie.el   2013-05-17 04:33:12 +0000
+++ b/lisp/emacs-lisp/smie.el   2013-05-23 17:44:38 +0000
@@ -1363,7 +1363,12 @@
      ((looking-at "\\s(\\|\\s)\\(\\)")
       (forward-char 1)
       (cons (buffer-substring (1- (point)) (point))
-            (if (match-end 1) '(0 nil) '(nil 0)))))))
+            (if (match-end 1) '(0 nil) '(nil 0))))
+     ((looking-at "\\s\"")
+      (forward-sexp 1)
+      nil)
+     ((eobp) nil)
+     (t (error "Bumped into unknown token")))))
 
 (defun smie-indent-backward-token ()
   "Skip token backward and return it, along with its levels."
@@ -1375,7 +1380,12 @@
      ((memq (setq class (syntax-class (syntax-after (1- (point))))) '(4 5))
       (forward-char -1)
       (cons (buffer-substring (point) (1+ (point)))
-            (if (eq class 4) '(nil 0) '(0 nil)))))))
+            (if (eq class 4) '(nil 0) '(0 nil))))
+     ((eq class 7)
+      (backward-sexp 1)
+      nil)
+     ((bobp) nil)
+     (t (error "Bumped into unknown token")))))
 
 (defun smie-indent-virtual ()
   ;; We used to take an optional arg (with value :not-hanging) to specify that