Mercurial > emacs
comparison lisp/add-log.el @ 90182:f042e7c0fe20
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 302-319)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 69)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 20 May 2005 04:22:05 +0000 |
parents | 02f1dbc4a199 2c228409c44d |
children | 01137c1fdbe9 |
comparison
equal
deleted
inserted
replaced
90181:0c828e2b0b6f | 90182:f042e7c0fe20 |
---|---|
248 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face)) | 248 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face)) |
249 ;; | 249 ;; |
250 ;; Acknowledgements. | 250 ;; Acknowledgements. |
251 ;; Don't include plain "From" because that is vague; | 251 ;; Don't include plain "From" because that is vague; |
252 ;; we want to encourage people to say something more specific. | 252 ;; we want to encourage people to say something more specific. |
253 ;; Note that the FSF does not use "Patches by"; our convention | |
254 ;; is to put the name of the author of the changes at the top | |
255 ;; of the change log entry. | |
253 ("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" | 256 ("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" |
254 3 'change-log-acknowledgement-face)) | 257 3 'change-log-acknowledgement-face)) |
255 "Additional expressions to highlight in Change Log mode.") | 258 "Additional expressions to highlight in Change Log mode.") |
256 | 259 |
257 (defvar change-log-mode-map | 260 (defvar change-log-mode-map |
373 (defun find-change-log (&optional file-name buffer-file) | 376 (defun find-change-log (&optional file-name buffer-file) |
374 "Find a change log file for \\[add-change-log-entry] and return the name. | 377 "Find a change log file for \\[add-change-log-entry] and return the name. |
375 | 378 |
376 Optional arg FILE-NAME specifies the file to use. | 379 Optional arg FILE-NAME specifies the file to use. |
377 If FILE-NAME is nil, use the value of `change-log-default-name'. | 380 If FILE-NAME is nil, use the value of `change-log-default-name'. |
378 If 'change-log-default-name' is nil, behave as though it were 'ChangeLog' | 381 If `change-log-default-name' is nil, behave as though it were 'ChangeLog' |
379 \(or whatever we use on this operating system). | 382 \(or whatever we use on this operating system). |
380 | 383 |
381 If 'change-log-default-name' contains a leading directory component, then | 384 If `change-log-default-name' contains a leading directory component, then |
382 simply find it in the current directory. Otherwise, search in the current | 385 simply find it in the current directory. Otherwise, search in the current |
383 directory and its successive parents for a file so named. | 386 directory and its successive parents for a file so named. |
384 | 387 |
385 Once a file is found, `change-log-default-name' is set locally in the | 388 Once a file is found, `change-log-default-name' is set locally in the |
386 current buffer to the complete file name. | 389 current buffer to the complete file name. |
487 (full-name (or add-log-full-name (user-full-name))) | 490 (full-name (or add-log-full-name (user-full-name))) |
488 (mailing-address (or add-log-mailing-address user-mail-address))) | 491 (mailing-address (or add-log-mailing-address user-mail-address))) |
489 | 492 |
490 (if whoami | 493 (if whoami |
491 (progn | 494 (progn |
492 (setq full-name (read-input "Full name: " full-name)) | 495 (setq full-name (read-string "Full name: " full-name)) |
493 ;; Note that some sites have room and phone number fields in | 496 ;; Note that some sites have room and phone number fields in |
494 ;; full name which look silly when inserted. Rather than do | 497 ;; full name which look silly when inserted. Rather than do |
495 ;; anything about that here, let user give prefix argument so that | 498 ;; anything about that here, let user give prefix argument so that |
496 ;; s/he can edit the full name field in prompter if s/he wants. | 499 ;; s/he can edit the full name field in prompter if s/he wants. |
497 (setq mailing-address | 500 (setq mailing-address |
498 (read-input "Mailing address: " mailing-address)))) | 501 (read-string "Mailing address: " mailing-address)))) |
499 | 502 |
500 (unless (equal file-name buffer-file-name) | 503 (unless (equal file-name buffer-file-name) |
501 (if (or other-window (window-dedicated-p (selected-window))) | 504 (if (or other-window (window-dedicated-p (selected-window))) |
502 (find-file-other-window file-name) | 505 (find-file-other-window file-name) |
503 (find-file file-name))) | 506 (find-file file-name))) |