[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108041: * lisp/progmodes/cperl-mode.el (cperl-update-syntaxification):

[Stefan Monnier]

------------------------------------------------------------
revno: 108041
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11739
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-06-21 12:49:21 -0400
message:
  * lisp/progmodes/cperl-mode.el (cperl-update-syntaxification):
  Use syntax-propertize.
modified:
  lisp/ChangeLog
  lisp/progmodes/cperl-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-13 20:08:10 +0000
+++ b/lisp/ChangeLog    2012-06-21 16:49:21 +0000
@@ -1,3 +1,8 @@
+2012-06-21  Stefan Monnier  <address@hidden>
+
+       * progmodes/cperl-mode.el (cperl-update-syntaxification):
+       Use syntax-propertize (bug#11739).
+
 2012-06-13  Glenn Morris  <address@hidden>
 
        * international/mule-cmds.el (mule-menu-keymap)
@@ -18,13 +23,13 @@
 
 2012-06-01  Chong Yidong  <address@hidden>
 
-       * cus-edit.el (customize-changed-options-previous-release): Bump
-       to 23.4.
+       * cus-edit.el (customize-changed-options-previous-release):
+       Bump to 23.4.
 
 2012-05-31  Stefan Monnier  <address@hidden>
 
-       * emacs-lisp/bytecomp.el (byte-compile-fix-header): Handle
-       arbitrary file name lengths (Bug#11585).
+       * emacs-lisp/bytecomp.el (byte-compile-fix-header):
+       Handle arbitrary file name lengths (Bug#11585).
 
 2012-05-28  Martin Rudalics  <address@hidden>
 
@@ -34,8 +39,8 @@
 2012-05-18  Eli Zaretskii  <address@hidden>
 
        * mail/sendmail.el (mail-yank-region): Recognize
-       rmail-yank-current-message in addition to insert-buffer.  Fixes
-       mail-mode's "C-c C-r" that otherwise does nothing when invoked in
+       rmail-yank-current-message in addition to insert-buffer.
+       Fixes mail-mode's "C-c C-r" that otherwise does nothing when invoked in
        a *mail* buffer created through rmail-start-mail with sendmail as
        mail-user-agent.
 

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/cperl-mode.el      2012-06-21 16:49:21 +0000
@@ -8951,14 +8951,15 @@
       (setq cperl-syntax-done-to (min cperl-syntax-done-to beg))))
 
 (defun cperl-update-syntaxification (from to)
-  (if (and cperl-use-syntax-table-text-property
-          cperl-syntaxify-by-font-lock
-          (or (null cperl-syntax-done-to)
-              (< cperl-syntax-done-to to)))
-      (progn
-       (save-excursion
-         (goto-char from)
-         (cperl-fontify-syntaxically to)))))
+  (cond
+   ((not cperl-use-syntax-table-text-property) nil)
+   ((fboundp 'syntax-propertize) (syntax-propertize to))
+   ((and cperl-syntaxify-by-font-lock
+         (or (null cperl-syntax-done-to)
+             (< cperl-syntax-done-to to)))
+    (save-excursion
+      (goto-char from)
+      (cperl-fontify-syntaxically to)))))
 
 (defvar cperl-version
   (let ((v  "Revision: 6.2"))