[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108086: * lisp/progmodes/cperl-mode.el (cperl-mode): Yet another fix for

[Stefan Monnier]

------------------------------------------------------------
revno: 108086
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10095
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-08-06 13:41:32 -0400
message:
  * lisp/progmodes/cperl-mode.el (cperl-mode): Yet another fix for
  syntax-propertize-function.
modified:
  lisp/ChangeLog
  lisp/progmodes/cperl-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-28 15:09:36 +0000
+++ b/lisp/ChangeLog    2012-08-06 17:41:32 +0000
@@ -1,3 +1,8 @@
+2012-08-06  Stefan Monnier  <address@hidden>
+
+       * progmodes/cperl-mode.el (cperl-mode): Yet another fix for
+       syntax-propertize-function (bug#10095).
+
 2012-07-28  Chong Yidong  <address@hidden>
 
        * progmodes/gdb-mi.el (gdb-place-breakpoints): Fix the call to
@@ -15,8 +20,8 @@
 
 2012-07-21  Leo Liu  <address@hidden>
 
-       * progmodes/cc-cmds.el (c-defun-name): Use
-       match-string-no-properties instead for consistency.
+       * progmodes/cc-cmds.el (c-defun-name):
+       Use match-string-no-properties instead for consistency.
 
 2012-07-20  Leo Liu  <address@hidden>
 

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2012-07-18 09:33:09 +0000
+++ b/lisp/progmodes/cperl-mode.el      2012-08-06 17:41:32 +0000
@@ -1838,7 +1838,13 @@
             (set (make-local-variable 'cperl-syntax-done-to) nil)
             (set (make-local-variable 'syntax-propertize-function)
                  (lambda (start end)
-                   (goto-char start) (cperl-fontify-syntaxically end))))
+                   (goto-char start)
+                   ;; Even if cperl-fontify-syntaxically has already gone
+                   ;; beyond `start', syntax-propertize has just removed
+                   ;; syntax-table properties between start and end, so we have
+                   ;; to re-apply them.
+                   (setq cperl-syntax-done-to start)
+                   (cperl-fontify-syntaxically end))))
        (make-local-variable 'parse-sexp-lookup-properties)
        ;; Do not introduce variable if not needed, we check it!
        (set 'parse-sexp-lookup-properties t)