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

[Stefan Monnier]

Index: emacs/lisp/font-lock.el
diff -c emacs/lisp/font-lock.el:1.228 emacs/lisp/font-lock.el:1.229
*** emacs/lisp/font-lock.el:1.228       Mon Oct 11 14:56:50 2004
--- emacs/lisp/font-lock.el     Fri Nov 12 00:00:59 2004
***************
*** 1,7 ****
  ;;; font-lock.el --- Electric font lock mode
  
! ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 02, 2003, 
2004
! ;;  Free Software Foundation, Inc.
  
  ;; Author: jwz, then rms, then sm
  ;; Maintainer: FSF
--- 1,7 ----
  ;;; font-lock.el --- Electric font lock mode
  
! ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! ;;   2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
  
  ;; Author: jwz, then rms, then sm
  ;; Maintainer: FSF
***************
*** 1289,1308 ****
      (if loudly (message "Fontifying %s... (syntactically...)" (buffer-name)))
      (goto-char start)
      ;;
!     ;; Find the state at the `beginning-of-line' before `start'.
      (setq state (or ppss (syntax-ppss start)))
      ;;
      ;; Find each interesting place between here and `end'.
      (while
        (progn
          (when (or (nth 3 state) (nth 4 state))
            (setq face (funcall font-lock-syntactic-face-function state))
            (setq beg (max (nth 8 state) start))
            (setq state (parse-partial-sexp (point) end nil nil state
                                            'syntax-table))
            (when face (put-text-property beg (point) 'face face)))
-         (setq state (parse-partial-sexp (point) end nil nil state
-                                         'syntax-table))
          (< (point) end)))))
  
  ;;; End of Syntactic fontification functions.
--- 1289,1308 ----
      (if loudly (message "Fontifying %s... (syntactically...)" (buffer-name)))
      (goto-char start)
      ;;
!     ;; Find the `start' state.
      (setq state (or ppss (syntax-ppss start)))
      ;;
      ;; Find each interesting place between here and `end'.
      (while
        (progn
+         (setq state (parse-partial-sexp (point) end nil nil state
+                                         'syntax-table))
          (when (or (nth 3 state) (nth 4 state))
            (setq face (funcall font-lock-syntactic-face-function state))
            (setq beg (max (nth 8 state) start))
            (setq state (parse-partial-sexp (point) end nil nil state
                                            'syntax-table))
            (when face (put-text-property beg (point) 'face face)))
          (< (point) end)))))
  
  ;;; End of Syntactic fontification functions.
***************
*** 2003,2007 ****
  
  (provide 'font-lock)
  
! ;;; arch-tag: 682327e4-64d8-4057-b20b-1fbb9f1fc54c
  ;;; font-lock.el ends here
--- 2003,2007 ----
  
  (provide 'font-lock)
  
! ;; arch-tag: 682327e4-64d8-4057-b20b-1fbb9f1fc54c
  ;;; font-lock.el ends here