[Emacs-diffs] emacs-24 r116984: * lisp/progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable

[Stefan Monnier]

------------------------------------------------------------
revno: 116984
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17297
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-04-19 13:14:27 -0400
message:
  * lisp/progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable
  assignments such as "case=hello".
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/sh-script.el    shscript.el-20091113204419-o5vbwnq5f7feedwu-727

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-18 18:57:04 +0000
+++ b/lisp/ChangeLog    2014-04-19 17:14:27 +0000
@@ -1,3 +1,8 @@
+2014-04-19  Stefan Monnier  <address@hidden>
+
+       * progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable
+       assignments such as "case=hello" (bug#17297).
+
 2014-04-18  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-run-real-handler, tramp-file-name-handler):

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2014-03-05 19:02:55 +0000
+++ b/lisp/progmodes/sh-script.el       2014-04-19 17:14:27 +0000
@@ -1832,9 +1832,10 @@
 
 (defun sh-smie--sh-keyword-p (tok)
   "Non-nil if TOK (at which we're looking) really is a keyword."
-  (if (equal tok "in")
-      (sh-smie--sh-keyword-in-p)
-    (sh-smie--keyword-p)))
+  (cond
+   ((looking-at "[[:alnum:]_]+=") nil)
+   ((equal tok "in") (sh-smie--sh-keyword-in-p))
+   (t (sh-smie--keyword-p))))
 
 (defun sh-smie-sh-forward-token ()
   (if (and (looking-at "[ \t]*\\(?:#\\|\\(\\s|\\)\\|$\\)")