Mercurial > emacs
changeset 73207:7e220566994b
(cvs-update-header): Fix handling of extra newlines so that
they don't keep accumulating.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 02 Oct 2006 00:21:07 +0000 |
| parents | e81b342a6e8a |
| children | 4a95d08e5126 |
| files | lisp/ChangeLog lisp/pcvs.el |
| diffstat | 2 files changed, 19 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 01 22:58:44 2006 +0000 +++ b/lisp/ChangeLog Mon Oct 02 00:21:07 2006 +0000 @@ -1,8 +1,12 @@ +2006-10-01 Stefan Monnier <monnier@iro.umontreal.ca> + + * pcvs.el (cvs-update-header): Fix handling of extra newlines so that + they don't keep accumulating. + 2006-10-01 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change) * ffap.el (ffap-rfc-path): Change the address of the RFC - repository to ftp.rfc-editor.org, as ds.internic.net seems to be - gone. + repository to ftp.rfc-editor.org, as ds.internic.net seems to be gone. 2006-10-01 Stephen Berman <Stephen.Berman@gmx.net> @@ -38,7 +42,7 @@ 2006-09-30 Martin Rudalics <rudalics@gmx.at> - * files.el (find-file-existing): Modified to not allow wildcards. + * files.el (find-file-existing): Modify to not allow wildcards. 2006-09-30 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> @@ -47,15 +51,15 @@ 2006-09-30 Michael Welsh Duggan <md5i@cs.cmu.edu> - * progmodes/sh-script.el (sh-prev-thing): Take - `sh-leading-keywords' into account. + * progmodes/sh-script.el (sh-prev-thing): + Take `sh-leading-keywords' into account. 2006-09-29 Glenn Morris <rgm@gnu.org> * custom.el (defcustom): Doc fix. - * calendar/calendar.el (european-calendar-style): Call - european-calendar or american-calendar as needed when set. + * calendar/calendar.el (european-calendar-style): + Call european-calendar or american-calendar as needed when set. (diary-view-entries, list-calendar-holidays): Move autoloads before use. @@ -82,7 +86,7 @@ 2006-09-29 Carsten Dominik <dominik@science.uva.nl> * textmodes/org.el (org-file-remote-p): Get regexp from list. - (org-archive-subtree): remove erraneous `]' from character list. + (org-archive-subtree): Remove erraneous `]' from character list. 2006-09-28 Jonathan Yavner <jyavner@member.fsf.org>
--- a/lisp/pcvs.el Sun Oct 01 22:58:44 2006 +0000 +++ b/lisp/pcvs.el Mon Oct 02 00:21:07 2006 +0000 @@ -618,7 +618,6 @@ (str (car hf)) (done "") (tin (ewoc-nth cvs-cookies 0))) - (if (eq (length str) 2) (setq str "")) ;; look for the first *real* fileinfo (to determine emptyness) (while (and tin @@ -626,14 +625,17 @@ '(MESSAGE DIRCHANGE))) (setq tin (ewoc-next cvs-cookies tin))) (if add - (setq str (concat "-- Running " cmd " ...\n" str)) + (progn + ;; Remove the default empty line, if applicable. + (if (not (string-match "." str)) (setq str "\n")) + (setq str (concat "-- Running " cmd " ...\n" str))) (if (not (string-match (concat "^-- Running " (regexp-quote cmd) " \\.\\.\\.\n") str)) (error "Internal PCL-CVS error while removing message") (setq str (replace-match "" t t str)) - (if (zerop (length str)) (setq str "\n")) - (setq done (concat "-- last cmd: " cmd " --")))) - (setq str (concat str "\n") done (concat done "\n")) + ;; Re-add the default empty line, if applicable. + (if (not (string-match "." str)) (setq str "\n\n")) + (setq done (concat "-- last cmd: " cmd " --\n")))) ;; set the new header and footer (ewoc-set-hf cvs-cookies str (concat "\n--------------------- "