Mercurial > emacs
changeset 69746:768d198de598
(cvs-insert-strings): Fix bug with strings longer than wwidth.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 31 Mar 2006 21:33:03 +0000 |
| parents | 11037ada171e |
| children | b457e0e58e20 |
| files | lisp/ChangeLog lisp/pcvs-util.el |
| diffstat | 2 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Mar 31 17:44:40 2006 +0000 +++ b/lisp/ChangeLog Fri Mar 31 21:33:03 2006 +0000 @@ -1,3 +1,8 @@ +2006-03-13 Stefan Monnier <monnier@iro.umontreal.ca> + + * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than + wwidth. + 2006-03-31 Juanma Barranquero <lekktu@gmail.com> * ido.el (ido-cache-unc-host-shares-time, ido-report-no-match) @@ -440,11 +445,6 @@ * tree-widget.el (tree-widget-themes-load-path) (tree-widget-themes-directory, tree-widget-theme): Doc fix. -2006-03-13 Stefan Monnier <monnier@iro.umontreal.ca> - - * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than - wwidth. - 2006-03-13 Ryan Yeske <rcyeske@gmail.com> * net/rcirc.el (rcirc) <defgroup>: Add link to manual.
--- a/lisp/pcvs-util.el Fri Mar 31 17:44:40 2006 +0000 +++ b/lisp/pcvs-util.el Fri Mar 31 21:33:03 2006 +0000 @@ -157,10 +157,11 @@ (setq tab-width colwidth) ;; The insertion should be "sensible" no matter what choices were made. (dolist (str strings) - (unless (bolp) (insert " \t")) - (when (< wwidth (+ (max colwidth (length str)) (current-column))) - (delete-char -2) (insert "\n")) - (insert str))))) + (unless (bolp) + (insert " \t") + (when (< wwidth (+ (max colwidth (length str)) (current-column))) + (delete-char -2) (insert "\n"))) + (insert str))))) (defun cvs-file-to-string (file &optional oneline args) @@ -357,7 +358,8 @@ and reset the persistence." (let* ((prefix (symbol-value (cvs-prefix-sym sym))) (numarg (if (integerp arg) arg 0)) - (defs (cvs-flags-defaults prefix))) + ;; (defs (cvs-flags-defaults prefix)) + ) ;; set persistence if requested (when (> (prefix-numeric-value arg) 9)