Commit 04e408d9 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(cvs-update-header): Fix handling of extra newlines so that

they don't keep accumulating.
parent b6357463
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) 2006-10-01 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change)
   
* ffap.el (ffap-rfc-path): Change the address of the RFC * ffap.el (ffap-rfc-path): Change the address of the RFC
repository to ftp.rfc-editor.org, as ds.internic.net seems to be repository to ftp.rfc-editor.org, as ds.internic.net seems to be gone.
gone.
   
2006-10-01 Stephen Berman <Stephen.Berman@gmx.net> 2006-10-01 Stephen Berman <Stephen.Berman@gmx.net>
   
...@@ -38,7 +42,7 @@ ...@@ -38,7 +42,7 @@
   
2006-09-30 Martin Rudalics <rudalics@gmx.at> 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> 2006-09-30 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se>
   
...@@ -47,15 +51,15 @@ ...@@ -47,15 +51,15 @@
   
2006-09-30 Michael Welsh Duggan <md5i@cs.cmu.edu> 2006-09-30 Michael Welsh Duggan <md5i@cs.cmu.edu>
   
* progmodes/sh-script.el (sh-prev-thing): Take * progmodes/sh-script.el (sh-prev-thing):
`sh-leading-keywords' into account. Take `sh-leading-keywords' into account.
   
2006-09-29 Glenn Morris <rgm@gnu.org> 2006-09-29 Glenn Morris <rgm@gnu.org>
   
* custom.el (defcustom): Doc fix. * custom.el (defcustom): Doc fix.
   
* calendar/calendar.el (european-calendar-style): Call * calendar/calendar.el (european-calendar-style):
european-calendar or american-calendar as needed when set. Call european-calendar or american-calendar as needed when set.
(diary-view-entries, list-calendar-holidays): Move autoloads (diary-view-entries, list-calendar-holidays): Move autoloads
before use. before use.
   
...@@ -82,7 +86,7 @@ ...@@ -82,7 +86,7 @@
2006-09-29 Carsten Dominik <dominik@science.uva.nl> 2006-09-29 Carsten Dominik <dominik@science.uva.nl>
   
* textmodes/org.el (org-file-remote-p): Get regexp from list. * 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> 2006-09-28 Jonathan Yavner <jyavner@member.fsf.org>
   
......
...@@ -618,7 +618,6 @@ If non-nil, NEW means to create a new buffer no matter what." ...@@ -618,7 +618,6 @@ If non-nil, NEW means to create a new buffer no matter what."
(str (car hf)) (str (car hf))
(done "") (done "")
(tin (ewoc-nth cvs-cookies 0))) (tin (ewoc-nth cvs-cookies 0)))
(if (eq (length str) 2) (setq str ""))
;; look for the first *real* fileinfo (to determine emptyness) ;; look for the first *real* fileinfo (to determine emptyness)
(while (while
(and tin (and tin
...@@ -626,14 +625,17 @@ If non-nil, NEW means to create a new buffer no matter what." ...@@ -626,14 +625,17 @@ If non-nil, NEW means to create a new buffer no matter what."
'(MESSAGE DIRCHANGE))) '(MESSAGE DIRCHANGE)))
(setq tin (ewoc-next cvs-cookies tin))) (setq tin (ewoc-next cvs-cookies tin)))
(if add (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 (if (not (string-match
(concat "^-- Running " (regexp-quote cmd) " \\.\\.\\.\n") str)) (concat "^-- Running " (regexp-quote cmd) " \\.\\.\\.\n") str))
(error "Internal PCL-CVS error while removing message") (error "Internal PCL-CVS error while removing message")
(setq str (replace-match "" t t str)) (setq str (replace-match "" t t str))
(if (zerop (length str)) (setq str "\n")) ;; Re-add the default empty line, if applicable.
(setq done (concat "-- last cmd: " cmd " --")))) (if (not (string-match "." str)) (setq str "\n\n"))
(setq str (concat str "\n") done (concat done "\n")) (setq done (concat "-- last cmd: " cmd " --\n"))))
;; set the new header and footer ;; set the new header and footer
(ewoc-set-hf cvs-cookies (ewoc-set-hf cvs-cookies
str (concat "\n--------------------- " str (concat "\n--------------------- "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment