[Emacs-diffs] Changes to emacs/lisp/textmodes/rst.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/21 04:10:27

Index: textmodes/rst.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/rst.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- textmodes/rst.el    20 Jun 2008 19:38:53 -0000      1.4
+++ textmodes/rst.el    21 Jun 2008 04:10:26 -0000      1.5
@@ -406,7 +406,6 @@
   (set (make-local-variable 'font-lock-defaults)
        '(rst-font-lock-keywords-function
         t nil nil nil
-        (font-lock-multiline . t)
         (font-lock-mark-block-function . mark-paragraph)))
   ;; `jit-lock-mode' has been the default since Emacs-21.1, so there's no
   ;; point messing around with font-lock-support-mode any more.
@@ -2749,6 +2748,7 @@
        (set sym sym)
        (setq i (1+ i))))))
 
+(rst-define-level-faces)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -3044,15 +3044,21 @@
       ;; Always succeeds because the limit set by PRE-MATCH-FORM is the
       ;; ultimate point to find
       (goto-char (or (rst-forward-indented-block nil limit) limit))
+      (save-excursion
+        ;; Include subsequent empty lines in the font-lock block,
+        ;; in case the user subsequently changes the indentation of the next
+        ;; non-empty line to move it into the indented element.
+        (skip-chars-forward " \t\n")
+        (put-text-property beg-pnt (point) 'font-lock-multiline t))
       (set-match-data (list beg-pnt (point)))
       t)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Adornments
 
-;; Stores the point where the current adornment ends. Also used as a trigger
-;; for `rst-font-lock-handle-adornment'.
-(defvar rst-font-lock-adornment-point nil)
+(defvar rst-font-lock-adornment-point nil
+  "Stores the point where the current adornment ends.  Also used as a trigger
+for `rst-font-lock-handle-adornment'.")
 
 ;; Here `rst-font-lock-handle-adornment' stores the section level of the
 ;; current adornment or t for a transition.
@@ -3174,6 +3180,7 @@
             (mtc (cdr ado)))
        (setq rst-font-lock-level (rst-adornment-level key t))
        (goto-char (nth 1 mtc))
+        (put-text-property (nth 0 mtc) (nth 1 mtc) 'font-lock-multiline t)
        (set-match-data mtc)
        t))))