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

[Chong Yidong]

Index: emacs/lisp/hi-lock.el
diff -c emacs/lisp/hi-lock.el:1.33 emacs/lisp/hi-lock.el:1.34
*** emacs/lisp/hi-lock.el:1.33  Fri Nov 25 05:32:56 2005
--- emacs/lisp/hi-lock.el       Tue Nov 29 22:28:59 2005
***************
*** 331,337 ****
                             (cons (or (car hi-lock-regexp-history) "") 1 )
                             nil nil 'hi-lock-regexp-history))
      (hi-lock-read-face-name)))
!   (or (facep face) (setq face 'rwl-yellow))
    (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1))
    (hi-lock-set-pattern
     ;; The \\(?:...\\) grouping construct ensures that a leading ^, +, * or ?
--- 331,337 ----
                             (cons (or (car hi-lock-regexp-history) "") 1 )
                             nil nil 'hi-lock-regexp-history))
      (hi-lock-read-face-name)))
!   (or (facep face) (setq face 'hi-yellow))
    (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1))
    (hi-lock-set-pattern
     ;; The \\(?:...\\) grouping construct ensures that a leading ^, +, * or ?
***************
*** 356,362 ****
                             (cons (or (car hi-lock-regexp-history) "") 1 )
                             nil nil 'hi-lock-regexp-history))
      (hi-lock-read-face-name)))
!   (or (facep face) (setq face 'rwl-yellow))
    (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1))
    (hi-lock-set-pattern regexp face))
  
--- 356,362 ----
                             (cons (or (car hi-lock-regexp-history) "") 1 )
                             nil nil 'hi-lock-regexp-history))
      (hi-lock-read-face-name)))
!   (or (facep face) (setq face 'hi-yellow))
    (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1))
    (hi-lock-set-pattern regexp face))
  
***************
*** 376,382 ****
                              (cons (or (car hi-lock-regexp-history) "") 1 )
                              nil nil 'hi-lock-regexp-history)))
      (hi-lock-read-face-name)))
!   (or (facep face) (setq face 'rwl-yellow))
    (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1))
    (hi-lock-set-pattern regexp face))
  
--- 376,382 ----
                              (cons (or (car hi-lock-regexp-history) "") 1 )
                              nil nil 'hi-lock-regexp-history)))
      (hi-lock-read-face-name)))
!   (or (facep face) (setq face 'hi-yellow))
    (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1))
    (hi-lock-set-pattern regexp face))
  
***************
*** 440,456 ****
  `highlight-regexp' and `highlight-lines-matching-regexp'; they can
  be found in variable `hi-lock-interactive-patterns'."
    (interactive)
!   (let ((prefix (format "%s %s:" (or comment-start "") "Hi-lock")))
!     (when (> (+ (point) (length prefix)) hi-lock-file-patterns-range)
!       (beep)
!       (message
!        "Warning, inserted keywords not close enough to top of file."))
      (mapcar
       (lambda (pattern)
!        (insert (format "%s (%s) %s\n"
!                        prefix (prin1-to-string pattern) (or comment-end ""))))
!      hi-lock-interactive-patterns)))
! 
  
  ;; Implementation Functions
  
--- 440,455 ----
  `highlight-regexp' and `highlight-lines-matching-regexp'; they can
  be found in variable `hi-lock-interactive-patterns'."
    (interactive)
!   (if (null hi-lock-interactive-patterns)
!       (error "There are no interactive patterns"))
!   (let ((beg (point)))
      (mapcar
       (lambda (pattern)
!        (insert (format "Hi-lock: (%s)\n" (prin1-to-string pattern))))
!      hi-lock-interactive-patterns)
!     (comment-region beg (point)))
!   (when (> (point) hi-lock-file-patterns-range)
!     (warn "Inserted keywords not close enough to top of file")))
  
  ;; Implementation Functions