From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: dhruva Newsgroups: gmane.emacs.devel Subject: Re: Missing file in EMACS_22_BASE (GIT repo) Date: Fri, 5 Oct 2007 09:58:17 +0530 Message-ID: References: <87przvxc7h.fsf@rho.meyering.net> <87ejgbxawc.fsf@rho.meyering.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1191558513 25621 80.91.229.12 (5 Oct 2007 04:28:33 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 5 Oct 2007 04:28:33 +0000 (UTC) Cc: Emacs Devel To: "Jim Meyering" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 05 06:28:30 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 1Idene-0005Wr-0J for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 06:28:30 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdenY-0004jH-WA for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 00:28:25 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IdenV-0004hh-KZ for emacs-devel@gnu.org; Fri, 05 Oct 2007 00:28:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IdenT-0004hV-E7 for emacs-devel@gnu.org; Fri, 05 Oct 2007 00:28:20 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdenT-0004hS-Ah for emacs-devel@gnu.org; Fri, 05 Oct 2007 00:28:19 -0400 Original-Received: from nf-out-0910.google.com ([64.233.182.188]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IdenT-0007JS-D2 for emacs-devel@gnu.org; Fri, 05 Oct 2007 00:28:19 -0400 Original-Received: by nf-out-0910.google.com with SMTP id f5so352334nfh for ; Thu, 04 Oct 2007 21:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=/cLw9mw67eQStsjx7KVzrZ/rqL/dseW/2OxE+ReCEpA=; b=Ykr5s2rV7ryqlxm3yCjQTvu3ki/z+NAW+Z3ldn/7FEWceZDgXzYNdnd4qxPwmD/q//A3X67nWG2LlB44pf7C7wyZXAaNEK8KDtBOMiDYWVZGGIqKUi09lrYNY285+kp+KhGa+GrwNp/CSD9fryfUjSRjuS6lBBc7VZJL4jSCB/8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=fc8eCaBWHBA/L8sASMyO59yKGCgtNMcRFRUqlVrF5vdAxOuLaRB+ttKmV77KlRLReSlvqcmpEv+NNJNPPslfB5Q2tdEOkaRzU+I1/ELyNzqL0iGdEvjVvFXDEGUiquJhMnaFDEddCUTCjOuE0vG5h8+7bNO02MFqUYoSmsZVG+g= Original-Received: by 10.78.200.3 with SMTP id x3mr711160huf.1191558497727; Thu, 04 Oct 2007 21:28:17 -0700 (PDT) Original-Received: by 10.78.205.1 with HTTP; Thu, 4 Oct 2007 21:28:17 -0700 (PDT) In-Reply-To: Content-Disposition: inline X-Detected-Kernel: Linux 2.6 (newer, 2) 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:80264 Archived-At: Hi, On 10/4/07, dhruva wrote: > Hi, > > On 10/4/07, Jim Meyering wrote: > > I see what you mean, now. > > I missed the part about "on a branch". > > > > If you can confirm that that's the only file, it probably makes > > sense simply to add it manually on that branch. I confirm that 'nt/emacs.manifest' is the only missing file. However, I notice a difference in a few files. In the following unified diffs (does emacs devel prefer unified/contextual diffs?), the first is the CVS repo and the second is the GIT repo (CVS vs GIT comparison). --- ./emacs/lisp/ChangeLog Thu Oct 4 22:10:33 2007 +++ /e/users/dky/stub/hacks/./emacs/lisp/ChangeLog Thu Oct 4 17:43:06 2007 @@ -1,7 +1,3 @@ -2007-10-04 Juanma Barranquero - - * image-dired.el (image-dired-image-at-point-p): Fix typo in docstring. - 2007-10-04 MichaAkBl Cadilhac * progmodes/gud.el (gud-gud-gdb-command-name): Fix typo in docstring. --- ./emacs/lisp/image-dired.el Thu Oct 4 22:05:17 2007 +++ /e/users/dky/stub/hacks/./emacs/lisp/image-dired.el Thu Oct 4 17:43:12 2007 @@ -1851,7 +1851,7 @@ (image-dired-display-image (dired-get-filename) arg)) (defun image-dired-image-at-point-p () - "Return true if there is an image-dired thumbnail at point." + "Return true if there is a image-dired thumbnail at point." (get-text-property (point) 'image-dired-thumbnail)) (defun image-dired-rotate-thumbnail (degrees) --- ./emacs/src/ChangeLog Fri Oct 5 06:01:33 2007 +++ /e/users/dky/stub/hacks/./emacs/src/ChangeLog Thu Oct 4 17:43:24 2007 @@ -12,10 +12,6 @@ * emacs.c (standard_args): Change priority of "--no-splash" from 40 to 3. Add "--no-desktop" with the same priority. -2007-09-29 Jason Rumney - - * w32.c (w32_get_resource): Always close registry keys. - -dky -- Dhruva Krishnamurthy Contents reflect my personal views only!