[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.256 emacs/lisp/font-lock.el:1.257
*** emacs/lisp/font-lock.el:1.256       Thu May 19 02:15:09 2005
--- emacs/lisp/font-lock.el     Fri May 20 13:25:58 2005
***************
*** 2053,2071 ****
         ("\\<:\\sw+\\>" 0 font-lock-builtin-face)
         ;; ELisp and CLisp `&' keywords as types.
         ("\\&\\sw+\\>" . font-lock-type-face)
!        ;; Make regexp grouping constructs bold, so they stand out, but only 
in strings.
         ((lambda (bound)
!         (if (re-search-forward "\\([\\][\\]\\)\\([(|)]\\)\\(\\?:\\)?" bound)
               (let ((face (get-text-property (1- (point)) 'face)))
                 (if (listp face)
                     (memq 'font-lock-string-face face)
                   (eq 'font-lock-string-face face)))))
!       (1 font-lock-comment-face prepend) ; Should we introduce a lowlight 
face for this?
!                                       ; Ideally that would retain the color, 
dimmed 50%.
        (2 'bold prepend)
        (3 font-lock-type-face prepend t))
!        ;; Underline innermost grouping, so that you can more easily see what 
belongs together.
!        ;; 2005-05-12: Font-lock can go into an unbreakable endless loop on 
this -- something's broken.
         
;;("[\\][\\][(]\\(?:\\?:\\)?\\(\\(?:[^\\\"]+\\|[\\]\\(?:[^\\]\\|[\\][^(]\\)\\)+?\\)[\\][\\][)]"
         ;;1 'underline prepend)
  ;;;  This is too general -- rms.
--- 2053,2074 ----
         ("\\<:\\sw+\\>" 0 font-lock-builtin-face)
         ;; ELisp and CLisp `&' keywords as types.
         ("\\&\\sw+\\>" . font-lock-type-face)
!        ;; Make regexp grouping constructs bold, so they stand out, but only
!        ;; in strings.
         ((lambda (bound)
!         (if (re-search-forward "\\(\\\\\\\\\\)\\([(|)]\\)\\(\\?:\\)?" bound t)
               (let ((face (get-text-property (1- (point)) 'face)))
                 (if (listp face)
                     (memq 'font-lock-string-face face)
                   (eq 'font-lock-string-face face)))))
!         ;; Should we introduce a lowlight face for this?
!         ;; Ideally that would retain the color, dimmed.
!       (1 font-lock-comment-face prepend)
        (2 'bold prepend)
        (3 font-lock-type-face prepend t))
!        ;; Underline innermost grouping, so that you can more easily see what
!        ;; belongs together.  2005-05-12: Font-lock can go into an
!        ;; unbreakable endless loop on this -- something's broken.
         
;;("[\\][\\][(]\\(?:\\?:\\)?\\(\\(?:[^\\\"]+\\|[\\]\\(?:[^\\]\\|[\\][^(]\\)\\)+?\\)[\\][\\][)]"
         ;;1 'underline prepend)
  ;;;  This is too general -- rms.