Mercurial > emacs

comparison lisp/pcvs-util.el @ 83507:81f2d90dee68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-188 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-189 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-190 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-191 Undo incorrect merge of etc/images/README from Gnus 5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-192 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-193 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-194 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-195 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-196 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-197 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-198 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-199 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-200 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-201 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-202 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-203 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-204 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-205 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-206 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-73 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-74 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-75 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-76 Update from CVS: README: Addition from 5.10.6 tar ball. * emacs@sv.gnu.org/gnus--rel--5.10--patch-77 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-78 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-79 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-80 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-547
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 10 Apr 2006 14:52:24 +0000
parents 768d198de598
children 2b77fa42947f 482dfed28bee
comparison
equal deleted inserted replaced
83506:9905fc171253 83507:81f2d90dee68
155 (colwidth (/ wwidth columns))) 155 (colwidth (/ wwidth columns)))
156 ;; Use tab-width rather than indent-to. 156 ;; Use tab-width rather than indent-to.
157 (setq tab-width colwidth) 157 (setq tab-width colwidth)
158 ;; The insertion should be "sensible" no matter what choices were made. 158 ;; The insertion should be "sensible" no matter what choices were made.
159 (dolist (str strings) 159 (dolist (str strings)
160 (unless (bolp) (insert " \t")) 160 (unless (bolp)
161 (when (< wwidth (+ (max colwidth (length str)) (current-column))) 161 (insert " \t")
162 (delete-char -2) (insert "\n")) 162 (when (< wwidth (+ (max colwidth (length str)) (current-column)))
163 (insert str))))) 163 (delete-char -2) (insert "\n")))
164 (insert str)))))
164 165
165 166
166 (defun cvs-file-to-string (file &optional oneline args) 167 (defun cvs-file-to-string (file &optional oneline args)
167 "Read the content of FILE and return it as a string. 168 "Read the content of FILE and return it as a string.
168 If ONELINE is t, only the first line (no \\n) will be returned. 169 If ONELINE is t, only the first line (no \\n) will be returned.
355 the (ARG mod 10)'th prefix is made persistent. 356 the (ARG mod 10)'th prefix is made persistent.
356 If ARG is nil toggle the PREFIX's value between its 0th default and nil 357 If ARG is nil toggle the PREFIX's value between its 0th default and nil
357 and reset the persistence." 358 and reset the persistence."
358 (let* ((prefix (symbol-value (cvs-prefix-sym sym))) 359 (let* ((prefix (symbol-value (cvs-prefix-sym sym)))
359 (numarg (if (integerp arg) arg 0)) 360 (numarg (if (integerp arg) arg 0))
360 (defs (cvs-flags-defaults prefix))) 361 ;; (defs (cvs-flags-defaults prefix))
362 )
361 363
362 ;; set persistence if requested 364 ;; set persistence if requested
363 (when (> (prefix-numeric-value arg) 9) 365 (when (> (prefix-numeric-value arg) 9)
364 (setf (cvs-flags-persist prefix) t) 366 (setf (cvs-flags-persist prefix) t)
365 (setq numarg (mod numarg 10))) 367 (setq numarg (mod numarg 10)))