From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Fwd: copyright-limit's value Date: Sun, 29 Jul 2007 16:11:40 -0400 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1185739916 30337 80.91.229.12 (29 Jul 2007 20:11:56 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 29 Jul 2007 20:11:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jul 29 22:11:49 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IFF7E-0002tK-O4 for ged-emacs-devel@m.gmane.org; Sun, 29 Jul 2007 22:11:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IFF7E-0005hp-14 for ged-emacs-devel@m.gmane.org; Sun, 29 Jul 2007 16:11:48 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IFF79-0005fc-QK for emacs-devel@gnu.org; Sun, 29 Jul 2007 16:11:43 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IFF79-0005er-CW for emacs-devel@gnu.org; Sun, 29 Jul 2007 16:11:43 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IFF79-0005eR-4r for emacs-devel@gnu.org; Sun, 29 Jul 2007 16:11:43 -0400 Original-Received: from tomts20.bellnexxia.net ([209.226.175.74] helo=tomts20-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IFF77-00056p-J5; Sun, 29 Jul 2007 16:11:41 -0400 Original-Received: from pastel.home ([70.53.195.62]) by tomts20-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20070729201140.ZSVY8273.tomts20-srv.bellnexxia.net@pastel.home>; Sun, 29 Jul 2007 16:11:40 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 4B4628014; Sun, 29 Jul 2007 16:11:40 -0400 (EDT) In-Reply-To: (Richard Stallman's message of "Sat\, 28 Jul 2007 22\:22\:14 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) X-detected-kernel: Solaris 8 (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:75790 Archived-At: > Would someone please DTRT and ack? Since the bug is in Emacs 22, > please put the fix in Emacs 22. Installed in the 22 branch, Stefan > ------- Start of forwarded message ------- > X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME > autolearn=failed version=3.1.0 > From: kimitto@gmail.com > Newsgroups: gnu.emacs.bug > Date: Fri, 27 Jul 2007 10:06:35 -0700 > Organization: http://groups.google.com > Mime-Version: 1.0 > Content-Type: text/plain; charset="iso-2022-jp" > Complaints-To: groups-abuse@google.com > Injection-Info: i13g2000prf.googlegroups.com; posting-host=60.42.99.104; > posting-account=ps2QrAMAAAA6_jCuRt2JEIpn5Otqf_w0 > Xref: shelby.stanford.edu gnu.emacs.bug:43160 > To: bug-gnu-emacs@gnu.org > Subject: copyright-limit's value > Environment > In GNU Emacs 22.1.1 (i386-mingw-nt5.1.2600) > of 2007-07-08 on CUBE > Windowing system distributor `MW32', version 11.0.1 > configured using `configure --with-gcc (3.4)' > copyright-limit's doc-string is this one. > "*Don't try to update copyright beyond this position unless > interactive. > A value of nil means to search whole buffer." > 1. start emacs with -q option > 2. M-: (setq copyright-limit nil) > 3. and M-x copyright-update error--> Wrong type argument: number-or-marker-p, nil > re-search-forward() 's second argument causes this error. > Its value is selectable as 'nil', and I hope so, thus see patch file. > Best regards, > Kimit Yada > diff -u c\:/meadow/lisp/emacs-lisp/copyright.el c\:/meadow/lisp/emacs- > lisp/copyright.mod.el > - --- c:/meadow/lisp/emacs-lisp/copyright.el 2007-07-08 > 14:27:23.001000000 +0900 > +++ c:/meadow/lisp/emacs-lisp/copyright.mod.el 2007-07-20 > 17:19:12.000000000 +0900 > @@ -83,7 +83,8 @@ > "String representing the current year.") > (defun copyright-update-year (replace noquery) > - - (when (re-search-forward copyright-regexp (+ (point) copyright- > limit) t) > + (when (re-search-forward copyright-regexp > + (and copyright-limit (+ (point) copyright- > limit)) t) > ;; If the years are continued onto multiple lined > ;; that are marked as comments, skip to the end of the years > anyway. > (while (save-excursion > @@ -162,7 +163,7 @@ > (re-search-forward "\\(the Free Software Foundation;\ > either \\|; a\\^u eldono \\([0-9]+\\)a, ? a\\^u (la\\^u via \\)\ > version \\([0-9]+\\), or (at" > - - (+ (point) copyright-limit) t) > + (and copyright-limit (+ (point) copyright-limit)) t) > (not (string= (match-string 3) copyright-current-gpl- > version)) > (or noquery > (y-or-n-p (concat "Replace GPL version by " > @@ -184,7 +185,8 @@ > (interactive) > (widen) > (goto-char (point-min)) > - - (if (re-search-forward copyright-regexp (+ (point) copyright-limit) > t) > + (if (re-search-forward copyright-regexp > + (and copyright-limit (+ (point) copyright- > limit)) t) > (let ((s (match-beginning 2)) > (e (copy-marker (1+ (match-end 2)))) > (p (make-marker)) > @@ -224,7 +226,7 @@ > "Copyright (C) " `(substring (current-time-string) -4) " by " > (or (getenv "ORGANIZATION") > str) > - - '(if (> (point) (+ (point-min) copyright-limit)) > + '(if (and copyright-limit (> (point) (+ (point-min) copyright- > limit))) > (message "Copyright extends beyond `copyright-limit' and won't > be updated automatically.")) > comment-end \n) > _______________________________________________ > bug-gnu-emacs mailing list > bug-gnu-emacs@gnu.org > http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs > ------- End of forwarded message ------- > _______________________________________________ > Emacs-devel mailing list > Emacs-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-devel