diff options
| author | Dale Sedivec | 2013-02-28 22:43:57 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-02-28 22:43:57 -0500 |
| commit | 4a83d19e56d3d13f254b406fcd569ba9b5fe0cfd (patch) | |
| tree | 371b5d15b44074c135af691fa9ab983375e24c43 | |
| parent | 9d232fc451d9abc3e3ee3eead61176067470b24e (diff) | |
| download | emacs-4a83d19e56d3d13f254b406fcd569ba9b5fe0cfd.tar.gz emacs-4a83d19e56d3d13f254b406fcd569ba9b5fe0cfd.zip | |
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function):
Return valid syntax-table property value when converting
quotes within text from string syntax to punctuation syntax.
Fixes: debbugs:13844
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44109a5095f..5ce0e6b597a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-02-28 Dale Sedivec <dale@codefu.org> | ||
| 2 | |||
| 3 | * textmodes/sgml-mode.el (sgml-syntax-propertize-function): | ||
| 4 | Return valid syntax-table property value when converting | ||
| 5 | quotes within text from string syntax to punctuation syntax (bug#13844). | ||
| 6 | |||
| 1 | 2013-02-28 Juri Linkov <juri@jurta.org> | 7 | 2013-02-28 Juri Linkov <juri@jurta.org> |
| 2 | 8 | ||
| 3 | * dired-aux.el (dired-diff): If file at point is a backup file, | 9 | * dired-aux.el (dired-diff): If file at point is a backup file, |
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index fb0dc84b0e1..33dfa277330 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el | |||
| @@ -312,8 +312,8 @@ Any terminating `>' or `/' is not matched.") | |||
| 312 | 312 | ||
| 313 | (defconst sgml-syntax-propertize-function | 313 | (defconst sgml-syntax-propertize-function |
| 314 | (syntax-propertize-rules | 314 | (syntax-propertize-rules |
| 315 | ;; Use the `b' style of comments to avoid interference with the -- ... -- | 315 | ;; Use the `b' style of comments to avoid interference with the -- ... -- |
| 316 | ;; comments recognized when `sgml-specials' includes ?-. | 316 | ;; comments recognized when `sgml-specials' includes ?-. |
| 317 | ;; FIXME: beware of <!--> blabla <!--> !! | 317 | ;; FIXME: beware of <!--> blabla <!--> !! |
| 318 | ("\\(<\\)!--" (1 "< b")) | 318 | ("\\(<\\)!--" (1 "< b")) |
| 319 | ("--[ \t\n]*\\(>\\)" (1 "> b")) | 319 | ("--[ \t\n]*\\(>\\)" (1 "> b")) |
| @@ -322,7 +322,7 @@ Any terminating `>' or `/' is not matched.") | |||
| 322 | ;; going to change, so as not to need to flush the data we just computed. | 322 | ;; going to change, so as not to need to flush the data we just computed. |
| 323 | ("\"" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0)))) | 323 | ("\"" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0)))) |
| 324 | (goto-char (match-end 0))) | 324 | (goto-char (match-end 0))) |
| 325 | ".")))) | 325 | (string-to-syntax "."))))) |
| 326 | "Syntactic keywords for `sgml-mode'.") | 326 | "Syntactic keywords for `sgml-mode'.") |
| 327 | 327 | ||
| 328 | ;; internal | 328 | ;; internal |