diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/hi-lock.el | 23 |
2 files changed, 17 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 881f78f1fd5..3bec02e90ff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-11-29 Chong Yidong <cyd@stupidchicken.com> + + * hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer) + (hi-lock-face-phrase-buffer): Use hi-yellow face. + (hi-lock-write-interactive-patterns): Use comment-region. + 2005-11-29 Reiner Steib <Reiner.Steib@gmx.de> * international/latexenc.el (latex-inputenc-coding-alist): Reword diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index aa40ad2ae5e..4c61be5529e 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -331,7 +331,7 @@ list maintained for regexps, global history maintained for faces. (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)) + (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,7 +356,7 @@ list maintained for regexps, global history maintained for faces. (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)) + (or (facep face) (setq face 'hi-yellow)) (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1)) (hi-lock-set-pattern regexp face)) @@ -376,7 +376,7 @@ lower-case letters made case insensitive." (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)) + (or (facep face) (setq face 'hi-yellow)) (unless hi-lock-buffer-mode (hi-lock-buffer-mode 1)) (hi-lock-set-pattern regexp face)) @@ -440,17 +440,16 @@ Interactively added patterns are those normally specified using `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.")) + (if (null hi-lock-interactive-patterns) + (error "There are no interactive patterns")) + (let ((beg (point))) (mapcar (lambda (pattern) - (insert (format "%s (%s) %s\n" - prefix (prin1-to-string pattern) (or comment-end "")))) - hi-lock-interactive-patterns))) - + (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 |