[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/syntax.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/syntax.el
diff -c emacs/lisp/emacs-lisp/syntax.el:1.13 
emacs/lisp/emacs-lisp/syntax.el:1.14
*** emacs/lisp/emacs-lisp/syntax.el:1.13        Mon Aug 29 10:45:18 2005
--- emacs/lisp/emacs-lisp/syntax.el     Fri Oct 21 06:01:22 2005
***************
*** 83,92 ****
      (setq syntax-ppss-cache (cdr syntax-ppss-cache)))
    ;; Throw away `last' value if made invalid.
    (when (< beg (or (car syntax-ppss-last) 0))
!     (if (< beg (or (car (nth 10 syntax-ppss-last))
!                  (nth 9 syntax-ppss-last)
!                  (nth 2 syntax-ppss-last)
!                  0))
        (setq syntax-ppss-last nil)
        (setcar syntax-ppss-last nil)))
    ;; Unregister if there's no cache left.  Sadly this doesn't work
--- 83,96 ----
      (setq syntax-ppss-cache (cdr syntax-ppss-cache)))
    ;; Throw away `last' value if made invalid.
    (when (< beg (or (car syntax-ppss-last) 0))
!     ;; If syntax-begin-function jumped to BEG, then the old state at BEG can
!     ;; depend on the text after BEG (which is presumably changed).  So if
!     ;; BEG=(car (nth 10 syntax-ppss-last)) don't reuse that data because the
!     ;; assumed nil state at BEG may not be valid any more.
!     (if (<= beg (or (car (nth 10 syntax-ppss-last))
!                     (nth 9 syntax-ppss-last)
!                     (nth 2 syntax-ppss-last)
!                     0))
        (setq syntax-ppss-last nil)
        (setcar syntax-ppss-last nil)))
    ;; Unregister if there's no cache left.  Sadly this doesn't work
***************
*** 293,297 ****
  
  (provide 'syntax)
  
! ;;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5
  ;;; syntax.el ends here
--- 297,301 ----
  
  (provide 'syntax)
  
! ;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5
  ;;; syntax.el ends here