From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: [drew.adams@oracle.com: RE: doc string of `diff' does not mention prefix arg] Date: Wed, 11 Jul 2007 17:03:38 -0400 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: sea.gmane.org 1184187801 28213 80.91.229.12 (11 Jul 2007 21:03:21 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 11 Jul 2007 21:03:21 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 11 23:03:20 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 1I8jLB-0002xs-3G for ged-emacs-devel@m.gmane.org; Wed, 11 Jul 2007 23:03:17 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I8jLA-0001tJ-Lf for ged-emacs-devel@m.gmane.org; Wed, 11 Jul 2007 17:03:16 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I8jL6-0001oq-AA for emacs-devel@gnu.org; Wed, 11 Jul 2007 17:03:12 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I8jL5-0001mz-JR for emacs-devel@gnu.org; Wed, 11 Jul 2007 17:03:11 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I8jL5-0001m0-7l for emacs-devel@gnu.org; Wed, 11 Jul 2007 17:03:11 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1I8jL4-0005M2-9q for emacs-devel@gnu.org; Wed, 11 Jul 2007 17:03:10 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60) (envelope-from ) id 1I8jLW-0006TC-HE; Wed, 11 Jul 2007 17:03:38 -0400 X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) 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:74655 Archived-At: Would someone please install this in the trunk? ------- Start of forwarded message ------- X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=failed version=3.1.0 From: "Drew Adams" To: Subject: RE: doc string of `diff' does not mention prefix arg Date: Tue, 10 Jul 2007 15:16:05 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-15" In-Reply-To: > Would you like to send a patch? Below. But notice this exchange from the thread, which shows that the prefix arg was in fact mentioned - I just didn't read the doc string well. Anyway, I've tried to make it clearer. > > > The doc string of command `diff' should mention that if you supply a > > > prefix arg you are prompted for the diff switches. > > > > "With prefix arg, prompt for diff switches." > > > > Copied directly from the doc string. > > My bad; sorry for the noise. Thanks. > > No excuse for my not seeing that, but don't we usually mention the > interactive use first? That is, wouldn't it be better to put the > info about > C-u before the explanation of non-interactive arg NO-ASYNC? And to > explicitly call out that NO-ASYNC is for a non-interactive call? Here's the patch: diff -c "c:/drews-lisp-20/cvs-lisp/diff-CVS-2007-07-10.el" "c:/drews-lisp-20/cvs-lisp/diff-CVS-patched-2007-07-10.el" *** c:/drews-lisp-20/cvs-lisp/diff-CVS-2007-07-10.el Tue Jul 10 15:08:24 2007 - --- c:/drews-lisp-20/cvs-lisp/diff-CVS-patched-2007-07-10.el Tue Jul 10 15:13:38 2007 *************** *** 75,84 **** ;;;###autoload (defun diff (old new &optional switches no-async) "Find and display the differences between OLD and NEW files. ! Interactively the current buffer's file name is the default for NEW ! and a backup file for NEW is the default for OLD. ! If NO-ASYNC is non-nil, call diff synchronously. ! With prefix arg, prompt for diff switches." (interactive (let (oldf newf) (setq newf (buffer-file-name) - --- 75,87 ---- ;;;###autoload (defun diff (old new &optional switches no-async) "Find and display the differences between OLD and NEW files. ! Interactively, the current buffer's file name is the default for NEW, ! and a backup file for NEW is the default for OLD. ! Interactively, if you supply a prefix argument then you are prompted ! for the `diff' command switches to use. With no prefix arg, the ! value of variable `diff-switches' is used. ! Non-interactively, non-nil optional argument NO-ASYNC means call ! `diff' synchronously." (interactive (let (oldf newf) (setq newf (buffer-file-name) ------- End of forwarded message -------