aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLawrence Mitchell2011-02-18 16:46:08 -0500
committerStefan Monnier2011-02-18 16:46:08 -0500
commite697fcfc0121d210c7acb16e3306cf7c552cf633 (patch)
tree19532cdb03a53d7092a6b87b1425465307cd6cd3
parent4114ed61cd3edf2a0d54aff4cfc625d13abd6e0e (diff)
downloademacs-e697fcfc0121d210c7acb16e3306cf7c552cf633.tar.gz
emacs-e697fcfc0121d210c7acb16e3306cf7c552cf633.zip
* lisp/progmodes/sh-script.el (sh-syntax-propertize-here-doc):
Bind case-fold-search to nil when looking for end of here-doc. Fixes: debbugs:8053
-rw-r--r--lisp/ChangeLog21
-rw-r--r--lisp/progmodes/sh-script.el3
2 files changed, 15 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 367e685dd1d..0f6fac51a95 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
12011-02-18 Lawrence Mitchell <wence@gmx.li>
2
3 * progmodes/sh-script.el (sh-syntax-propertize-here-doc): (bug#8053)
4 Bind case-fold-search to nil when looking for end of here-doc.
5
12011-02-18 Eli Zaretskii <eliz@gnu.org> 62011-02-18 Eli Zaretskii <eliz@gnu.org>
2 7
3 * image-mode.el (image-toggle-display-image): Set 8 * image-mode.el (image-toggle-display-image):
4 find-file-literally non-nil in buffers visiting binary image 9 Set find-file-literally non-nil in buffers visiting binary image
5 files. (Bug#8047) 10 files. (Bug#8047)
6 11
72011-02-18 Stefan Monnier <monnier@iro.umontreal.ca> 122011-02-18 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -111,8 +116,8 @@
111 allout-abbreviate-flattened-numbering. 116 allout-abbreviate-flattened-numbering.
112 (allout-mode-p): Include among autoloads, for use by other modes 117 (allout-mode-p): Include among autoloads, for use by other modes
113 with impunity. 118 with impunity.
114 (allout-listify-exposed): Use 119 (allout-listify-exposed):
115 allout-flattened-numbering-abbreviation. 120 Use allout-flattened-numbering-abbreviation.
116 (allout-encrypt-string): Use set-buffer-multibyte directly. 121 (allout-encrypt-string): Use set-buffer-multibyte directly.
117 (allout-set-buffer-multibyte): Remove. 122 (allout-set-buffer-multibyte): Remove.
118 123
@@ -189,8 +194,8 @@
189 194
190 * vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log. 195 * vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log.
191 196
192 * vc/log-view.el (log-view-mode-menu): Add 197 * vc/log-view.el (log-view-mode-menu):
193 log-view-toggle-entry-display. 198 Add log-view-toggle-entry-display.
194 199
1952011-02-14 Glenn Morris <rgm@gnu.org> 2002011-02-14 Glenn Morris <rgm@gnu.org>
196 201
@@ -215,8 +220,8 @@
215 * progmodes/cc-fonts.el (c-font-lock-declarations): Remove a 220 * progmodes/cc-fonts.el (c-font-lock-declarations): Remove a
216 narrow-to-region call that cuts context off the end (Bug#7722). 221 narrow-to-region call that cuts context off the end (Bug#7722).
217 222
218 * progmodes/cc-engine.el (c-forward-<>-arglist-recur): Refactor 223 * progmodes/cc-engine.el (c-forward-<>-arglist-recur):
219 nested if-forms with a simple cond. 224 Refactor nested if-forms with a simple cond.
220 (c-forward-<>-arglist): Revert 2011-01-31 change. 225 (c-forward-<>-arglist): Revert 2011-01-31 change.
221 226
2222011-02-13 Chong Yidong <cyd@stupidchicken.com> 2272011-02-13 Chong Yidong <cyd@stupidchicken.com>
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 900072fe356..7b84cc89d08 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -969,7 +969,8 @@ Point is at the beginning of the next line."
969(defun sh-syntax-propertize-here-doc (end) 969(defun sh-syntax-propertize-here-doc (end)
970 (let ((ppss (syntax-ppss))) 970 (let ((ppss (syntax-ppss)))
971 (when (eq t (nth 3 ppss)) 971 (when (eq t (nth 3 ppss))
972 (let ((key (get-text-property (nth 8 ppss) 'sh-here-doc-marker))) 972 (let ((key (get-text-property (nth 8 ppss) 'sh-here-doc-marker))
973 (case-fold-search nil))
973 (when (re-search-forward 974 (when (re-search-forward
974 (concat "^\\([ \t]*\\)" (regexp-quote key) "\\(\n\\)") 975 (concat "^\\([ \t]*\\)" (regexp-quote key) "\\(\n\\)")
975 end 'move) 976 end 'move)