[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/add-log.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/add-log.el |
Date: |
Fri, 10 Jun 2005 03:26:17 -0400 |
Index: emacs/lisp/add-log.el
diff -c emacs/lisp/add-log.el:1.163 emacs/lisp/add-log.el:1.164
*** emacs/lisp/add-log.el:1.163 Sun May 29 16:09:04 2005
--- emacs/lisp/add-log.el Fri Jun 10 07:26:14 2005
***************
*** 166,251 ****
:type '(repeat regexp)
:group 'change-log)
! (defface change-log-date-face
'((t (:inherit font-lock-string-face)))
"Face used to highlight dates in date lines."
:version "21.1"
:group 'change-log)
! (defface change-log-name-face
'((t (:inherit font-lock-constant-face)))
"Face for highlighting author names."
:version "21.1"
:group 'change-log)
! (defface change-log-email-face
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting author email addresses."
:version "21.1"
:group 'change-log)
! (defface change-log-file-face
'((t (:inherit font-lock-function-name-face)))
"Face for highlighting file names."
:version "21.1"
:group 'change-log)
! (defface change-log-list-face
'((t (:inherit font-lock-keyword-face)))
"Face for highlighting parenthesized lists of functions or variables."
:version "21.1"
:group 'change-log)
! (defface change-log-conditionals-face
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting conditionals of the form `[...]'."
:version "21.1"
:group 'change-log)
! (defface change-log-function-face
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting items of the form `<....>'."
:version "21.1"
:group 'change-log)
! (defface change-log-acknowledgement-face
'((t (:inherit font-lock-comment-face)))
"Face for highlighting acknowledgments."
:version "21.1"
:group 'change-log)
(defvar change-log-font-lock-keywords
'(;;
;; Date lines, new and old styles.
("^\\sw.........[0-9:+ ]*"
! (0 'change-log-date-face)
;; Name and e-mail; some people put e-mail in parens, not angles.
("\\([^<(]+?\\)[ \t]*[(<]\\(address@hidden)[>)]" nil nil
! (1 'change-log-name-face)
! (2 'change-log-email-face)))
;;
;; File names.
("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)"
! (2 'change-log-file-face)
;; Possibly further names in a list:
! ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face))
;; Possibly a parenthesized list of names:
("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
! nil nil (1 'change-log-list-face))
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
! nil nil (1 'change-log-list-face)))
;;
;; Function or variable names.
("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
! (2 'change-log-list-face)
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
! (1 'change-log-list-face)))
;;
;; Conditionals.
! ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals-face))
;;
;; Function of change.
! ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face))
;;
;; Acknowledgements.
;; Don't include plain "From" because that is vague;
--- 166,267 ----
:type '(repeat regexp)
:group 'change-log)
! (defface change-log-date
'((t (:inherit font-lock-string-face)))
"Face used to highlight dates in date lines."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-date-face 'face-alias 'change-log-date)
! (defface change-log-name
'((t (:inherit font-lock-constant-face)))
"Face for highlighting author names."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-name-face 'face-alias 'change-log-name)
! (defface change-log-email
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting author email addresses."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-email-face 'face-alias 'change-log-email)
! (defface change-log-file
'((t (:inherit font-lock-function-name-face)))
"Face for highlighting file names."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-file-face 'face-alias 'change-log-file)
! (defface change-log-list
'((t (:inherit font-lock-keyword-face)))
"Face for highlighting parenthesized lists of functions or variables."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-list-face 'face-alias 'change-log-list)
! (defface change-log-conditionals
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting conditionals of the form `[...]'."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-conditionals-face 'face-alias 'change-log-conditionals)
! (defface change-log-function
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting items of the form `<....>'."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-function-face 'face-alias 'change-log-function)
! (defface change-log-acknowledgement
'((t (:inherit font-lock-comment-face)))
"Face for highlighting acknowledgments."
:version "21.1"
:group 'change-log)
+ ;; backward-compatibility alias
+ (put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement)
(defvar change-log-font-lock-keywords
'(;;
;; Date lines, new and old styles.
("^\\sw.........[0-9:+ ]*"
! (0 'change-log-date)
;; Name and e-mail; some people put e-mail in parens, not angles.
("\\([^<(]+?\\)[ \t]*[(<]\\(address@hidden)[>)]" nil nil
! (1 'change-log-name)
! (2 'change-log-email)))
;;
;; File names.
("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)"
! (2 'change-log-file)
;; Possibly further names in a list:
! ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file))
;; Possibly a parenthesized list of names:
("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
! nil nil (1 'change-log-list))
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
! nil nil (1 'change-log-list)))
;;
;; Function or variable names.
("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
! (2 'change-log-list)
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
! (1 'change-log-list)))
;;
;; Conditionals.
! ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals))
;;
;; Function of change.
! ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function))
;;
;; Acknowledgements.
;; Don't include plain "From" because that is vague;
***************
*** 254,260 ****
;; is to put the name of the author of the changes at the top
;; of the change log entry.
("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\|
from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
! 3 'change-log-acknowledgement-face))
"Additional expressions to highlight in Change Log mode.")
(defvar change-log-mode-map
--- 270,276 ----
;; is to put the name of the author of the changes at the top
;; of the change log entry.
("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\|
from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
! 3 'change-log-acknowledgement))
"Additional expressions to highlight in Change Log mode.")
(defvar change-log-mode-map
- [Emacs-diffs] Changes to emacs/lisp/add-log.el,
Miles Bader <=