[Emacs-diffs] emacs/lisp ChangeLog progmodes/sh-script.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/19 22:18:19

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : sh-script.el 

Log message:
        (sh-font-lock-quoted-subshell): ' inside a "..." does not quote 
anything.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15359&r2=1.15360
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/sh-script.el?cvsroot=emacs&r1=1.222&r2=1.223

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15359
retrieving revision 1.15360
diff -u -b -r1.15359 -r1.15360
--- ChangeLog   19 Feb 2009 22:14:12 -0000      1.15359
+++ ChangeLog   19 Feb 2009 22:18:16 -0000      1.15360
@@ -1,5 +1,8 @@
 2009-02-19  Stefan Monnier  <address@hidden>
 
+       * progmodes/sh-script.el (sh-font-lock-quoted-subshell): ' inside
+       a "..." does not quote anything.
+
        * textmodes/rst.el (rst-mode-abbrev-table): Mark entries as `system'.
 
 2009-02-19  Andreas Schwab  <address@hidden>

Index: progmodes/sh-script.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- progmodes/sh-script.el      21 Jan 2009 01:23:31 -0000      1.222
+++ progmodes/sh-script.el      19 Feb 2009 22:18:18 -0000      1.223
@@ -1063,7 +1063,9 @@
                                (< (point) limit)))
         ;; unescape " inside a $( ... ) construct.
         (case (char-after)
-          (?\' (forward-char 1) (skip-chars-forward "^'" limit))
+          (?\' (case state
+                 (double-quote nil)
+                 (t (forward-char 1) (skip-chars-forward "^'" limit))))
           (?\\ (forward-char 1))
           (?\" (case state
                  (double-quote (setq state (pop states)))