diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-24 22:48:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-24 22:48:19 -0700 |
| commit | 09ae5da1b8bc7e8195a4a252b532ac33e5723f93 (patch) | |
| tree | 22de6cabc07e193045ba4daa99db185b68f5b5a8 /lisp/vc | |
| parent | 04e9897cf70e46c703b1412d022511e80314a720 (diff) | |
| download | emacs-09ae5da1b8bc7e8195a4a252b532ac33e5723f93.tar.gz | |
Prefer typical American spelling for "acknowledgment".
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/add-log.el | 10 | ||||
| -rw-r--r-- | lisp/vc/ediff.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index b9c3d0d385a..9401ae07093 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -223,13 +223,15 @@ Note: The search is conducted only within 10%, at the beginning of the file." (define-obsolete-face-alias 'change-log-function-face 'change-log-function "22.1") -(defface change-log-acknowledgement +(defface change-log-acknowledgment '((t (:inherit font-lock-comment-face))) "Face for highlighting acknowledgments." :version "21.1" :group 'change-log) +(define-obsolete-face-alias 'change-log-acknowledgement + 'change-log-acknowledgment "24.2") (define-obsolete-face-alias 'change-log-acknowledgement-face - 'change-log-acknowledgement "22.1") + 'change-log-acknowledgment "22.1") (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)") (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*") @@ -271,14 +273,14 @@ Note: The search is conducted only within 10%, at the beginning of the file." ;; Function of change. ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function)) ;; - ;; Acknowledgements. + ;; Acknowledgments. ;; Don't include plain "From" because that is vague; ;; we want to encourage people to say something more specific. ;; Note that the FSF does not use "Patches by"; our convention ;; is to put the name of the author of the changes at the top ;; of the change log entry. ("\\(^\\( +\\|\t\\)\\| \\)\\(Thanks to\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" - 3 'change-log-acknowledgement)) + 3 'change-log-acknowledgment)) "Additional expressions to highlight in Change Log mode.") (defun change-log-search-file-name (where) diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 9a20afd90cb..6929bfb6e0f 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -101,7 +101,7 @@ ;; and on any buffer. -;;; Acknowledgements: +;;; Acknowledgments: ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el. ;; Ediff would not have been possible without the help and encouragement of diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index ee776092443..b48ea1afd95 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -772,7 +772,7 @@ for the --graph option." (list (cons (nth 1 vc-git-root-log-format) (nth 2 vc-git-root-log-format))) (append - `((,log-view-message-re (1 'change-log-acknowledgement))) + `((,log-view-message-re (1 'change-log-acknowledgment))) ;; Handle the case: ;; user: foo@bar '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" @@ -788,8 +788,8 @@ for the --graph option." (1 'change-log-name) (2 'change-log-email)) ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" - (1 'change-log-acknowledgement) - (2 'change-log-acknowledgement)) + (1 'change-log-acknowledgment) + (2 'change-log-acknowledgment)) ("^Date: \\(.+\\)" (1 'change-log-date)) ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) |