[Emacs-diffs] /srv/bzr/emacs/trunk r103131: * lisp/progmodes/sh-script.el (sh-font-lock-paren, sh-kw, sh-prev-thing):

[Stefan Monnier]

------------------------------------------------------------
revno: 103131
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 10:53:04 -0500
message:
  * lisp/progmodes/sh-script.el (sh-font-lock-paren, sh-kw, sh-prev-thing):
  Handle new bashisms ";&" and ";;&".
modified:
  lisp/ChangeLog
  lisp/progmodes/sh-script.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-05 10:03:29 +0000
+++ b/lisp/ChangeLog    2011-02-05 15:53:04 +0000
@@ -1,7 +1,12 @@
+2011-02-05  Stefan Monnier  <address@hidden>
+
+       * progmodes/sh-script.el (sh-font-lock-paren, sh-kw, sh-prev-thing):
+       Handle new bashisms ";&" and ";;&" (bug#7947).
+
 2011-02-05  Michael Albinus  <address@hidden>
 
-       * net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'.  Add
-       "NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".
+       * net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'.
+       Add "NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".
 
 2011-02-05  Era Eriksson  <address@hidden>  (tiny change)
 

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2011-01-26 08:36:39 +0000
+++ b/lisp/progmodes/sh-script.el       2011-02-05 15:53:04 +0000
@@ -1104,7 +1104,7 @@
                  ;; a normal command rather than the real `in' keyword.
                  ;; I.e. we should look back to try and find the
                  ;; corresponding `case'.
-                 (looking-at ";;\\|in"))
+                 (looking-at ";[;&]\\|in"))
       sh-st-punc)))
 
 (defun sh-font-lock-backslash-quote ()
@@ -1659,6 +1659,8 @@
      ("esac" sh-handle-this-esac sh-handle-prev-esac)
      (case-label nil sh-handle-after-case-label) ;; ???
      (";;" nil sh-handle-prev-case-alt-end) ;; ???
+     (";;&" nil sh-handle-prev-case-alt-end) ;Like ";;" with diff semantics.
+     (";&" nil sh-handle-prev-case-alt-end) ;Like ";;" with diff semantics.
      ("done" sh-handle-this-done sh-handle-prev-done)
      ("do" sh-handle-this-do sh-handle-prev-do))
 
@@ -2496,7 +2498,7 @@
                          (sh-prev-line nil)
                        (line-beginning-position))))
       (skip-chars-backward " \t;" min-point)
-      (if (looking-at "\\s-*;;")
+      (if (looking-at "\\s-*;[;&]")
           ;; (message "Found ;; !")
           ";;"
         (skip-chars-backward "^)}];\"'`({[" min-point)