Show
Ignore:
Timestamp:
08/10/06 11:19:54 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/progmodes/sh-script.el

    r4131 r4140  
    987987  ;; effort to handle multiline cases correctly, so it ends up being 
    988988  ;; rather flakey. 
    989   (when (re-search-forward "\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(?:\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)" limit t) 
     989  (when (and (re-search-forward "\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(?:\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)" limit t) 
     990             ;; Make sure the " we matched is an opening quote. 
     991             (eq ?\" (nth 3 (syntax-ppss)))) 
    990992    ;; bingo we have a $( or a ` inside a "" 
    991993    (let ((char (char-after (point))) 
    …… 
    10821084    ;; Make sure $@ and @? are correctly recognized as sexps. 
    10831085    ("\\$\\([?@]\\)" 1 ,sh-st-symbol) 
    1084     ;; highlight (possibly nested) subshells inside "" quoted regions correctly. 
    1085     (sh-quoted-subshell 
    1086      (1 (sh-apply-quoted-subshell) t t)) 
    10871086    ;; Find HEREDOC starters and add a corresponding rule for the ender. 
    10881087    (sh-font-lock-here-doc 
    …… 
    10941093      nil t)) 
    10951094    ;; Distinguish the special close-paren in `case'. 
    1096     (")" 0 (sh-font-lock-paren (match-beginning 0))))) 
     1095    (")" 0 (sh-font-lock-paren (match-beginning 0))) 
     1096    ;; highlight (possibly nested) subshells inside "" quoted regions correctly. 
     1097    ;; This should be at the very end because it uses syntax-ppss. 
     1098    (sh-quoted-subshell 
     1099     (1 (sh-apply-quoted-subshell) t t)))) 
    10971100 
    10981101(defun sh-font-lock-syntactic-face-function (state)