From unknown Sat Jun 21 10:37:22 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#8321 <8321@debbugs.gnu.org> To: bug#8321 <8321@debbugs.gnu.org> Subject: Status: 23.1; emerge error diff extra operand Reply-To: bug#8321 <8321@debbugs.gnu.org> Date: Sat, 21 Jun 2025 17:37:22 +0000 retitle 8321 23.1; emerge error diff extra operand reassign 8321 emacs submitter 8321 "Mark H. David" severity 8321 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 22 12:53:12 2011 Received: (at submit) by debbugs.gnu.org; 22 Mar 2011 16:53:12 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q24pR-00084w-0U for submit@debbugs.gnu.org; Tue, 22 Mar 2011 12:53:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2461-000716-Jr for submit@debbugs.gnu.org; Tue, 22 Mar 2011 12:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q245s-0006SC-O0 for submit@debbugs.gnu.org; Tue, 22 Mar 2011 12:06:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:59044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q245p-00069x-QE for submit@debbugs.gnu.org; Tue, 22 Mar 2011 12:06:04 -0400 Received: from [140.186.70.92] (port=38921 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q23t5-0005lA-1z for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2011 11:52:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q23t0-0003Mj-PR for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2011 11:52:50 -0400 Received: from out3.smtp.messagingengine.com ([66.111.4.27]:46836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q23t0-0003Mc-Mk for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2011 11:52:46 -0400 Received: from compute3.internal (compute3.nyi.mail.srv.osa [10.202.2.43]) by gateway1.messagingengine.com (Postfix) with ESMTP id 7104720953; Tue, 22 Mar 2011 11:52:45 -0400 (EDT) Received: from frontend2.messagingengine.com ([10.202.2.161]) by compute3.internal (MEProxy); Tue, 22 Mar 2011 11:52:45 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=message-id:date:from:mime-version:to:subject:content-type:content-transfer-encoding; s=smtpout; bh=+MkkcLmmAzeFeBL2ERkx4eQzxjE=; b=uJhTA/h9QD581AQ/6BpI1CKDXLp1WH6oS6P0+B24I+3Y2/caHcsDqttbjq966tW+mItsb2EkAl7Zrva+Y5ReGvbGWs8/bT7DjGI7VsDSPXKScESQ3fo/76l0gaY3SwBkbz5QOll1szYM/W61baFUmxHdv9IM4yQ+aczY2Jg/z8w= X-Sasl-enc: CZzBbozSVixjS/lxNvg/rPve1k4RUa6X8Wj/BP43tqPj 1300809165 Received: from [192.168.0.183] (c-24-60-17-225.hsd1.ma.comcast.net [24.60.17.225]) by mail.messagingengine.com (Postfix) with ESMTPSA id 21422441005; Tue, 22 Mar 2011 11:52:45 -0400 (EDT) Message-ID: <4D88C5CC.8090205@yv.org> Date: Tue, 22 Mar 2011 11:52:44 -0400 From: "Mark H. David" User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 MIME-Version: 1.0 To: bug-gnu-emacs@gnu.org Subject: 23.1; emerge error diff extra operand Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 199.232.76.165 X-Spam-Score: -6.6 (------) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 22 Mar 2011 12:53:07 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.6 (------) Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your bug report will be posted to the bug-gnu-emacs@gnu.org mailing list, and to the gnu.emacs.bug news group. Please describe exactly what actions triggered the bug and the precise symptoms of the bug: M-x emerge-files [RET] file1 [RET] file2 [RET] produces a buffer with name *emerge-diff-errors* whose contents is as follows: diff: extra operand diff: Try `diff --help' for more information. At the bottom of the window, in the minibuffer, the following text appears: Errors found in diff/diff3 output. Merge buffer is *merge*. Normally, I'd be put right into the merge buffer (typically named *merge* or some variant). If I go to that buffer manually, the merge/diff seems to have failed. E.g., even though the files are quite different, typing 'n' for the command to go to the next difference, does nothing. If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. If you would like to further debug the crash, please read the file c:/Program Files/emacs-23.1/etc/DEBUG for instructions. In GNU Emacs 23.1.1 (i386-mingw-nt5.1.2600) of 2009-07-30 on SOFT-MJASON Windowing system distributor `Microsoft Corp.', version 5.1.2600 configured using `configure --with-gcc (4.4)' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: ENU value of $XMODIFIERS: nil locale-coding-system: cp1252 default-enable-multibyte-characters: t Major mode: Shell Minor modes in effect: shell-dirtrack-mode: t tool-bar-mode: t mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t Recent input: M-x e m e r g e SPC f i l SPC A - e x p - n o l C-x b * m e r n M-x C-y Recent messages: Loading vc-git...done Auto-saving... Errors found in diff/diff3 output. Merge buffer is *merge*. Mark set Quit ~/my documents/expsrc/A-exp-notation.lisp and c:/documents and settings/mhd/My Documents/expsrc/A-exp-notation.lisp are the same file ~/my documents/expsrc/exp-notation.lisp and c:/documents and settings/mhd/My Documents/expsrc/exp-notation.lisp are the same file Auto-saving... Errors found in diff/diff3 output. Merge buffer is *merge*. Mark set [2 times] From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 22 15:02:52 2011 Received: (at 8321) by debbugs.gnu.org; 22 Mar 2011 19:02:52 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q26qy-0002bY-0k for submit@debbugs.gnu.org; Tue, 22 Mar 2011 15:02:52 -0400 Received: from mtaout23.012.net.il ([80.179.55.175]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q26qu-0002bK-Ts for 8321@debbugs.gnu.org; Tue, 22 Mar 2011 15:02:50 -0400 Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0LIH005003H8JD00@a-mtaout23.012.net.il> for 8321@debbugs.gnu.org; Tue, 22 Mar 2011 21:02:42 +0200 (IST) Received: from HOME-C4E4A596F7 ([77.126.16.52]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LIH0056I3KGGO40@a-mtaout23.012.net.il>; Tue, 22 Mar 2011 21:02:42 +0200 (IST) Date: Tue, 22 Mar 2011 21:02:50 +0200 From: Eli Zaretskii Subject: Re: bug#8321: 23.1; emerge error diff extra operand In-reply-to: <4D88C5CC.8090205@yv.org> X-012-Sender: halo1@inter.net.il To: "Mark H. David" Message-id: <83vczb7zc5.fsf@gnu.org> References: <4D88C5CC.8090205@yv.org> X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: 8321 Cc: 8321@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.8 (-) > Date: Tue, 22 Mar 2011 11:52:44 -0400 > From: "Mark H. David" > Cc: > > M-x emerge-files [RET] file1 [RET] file2 [RET] > > produces a buffer with name *emerge-diff-errors* whose contents is as > follows: > > diff: extra operand > diff: Try `diff --help' for more information. > > > At the bottom of the window, in the minibuffer, the following text > appears: > > Errors found in diff/diff3 output. Merge buffer is *merge*. I cannot reproduce this with 2 randomly chosen files, neither in Emacs 23.1 nor in the latest Emacs 23.3. Does this happen for _any_ 2 files? If not, can you tell what's different about these two, or show two files that trigger this? Could it be that the problem is with the white space embedded in the file names? Can you try using the 8+3 short aliases of those parts that include white space? > Normally, I'd be put right into the merge buffer (typically named > *merge* or some variant). This "normally" means that it generally works, but not this time? From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 22 15:48:38 2011 Received: (at 8321) by debbugs.gnu.org; 22 Mar 2011 19:48:38 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q27ZF-0003ac-Uy for submit@debbugs.gnu.org; Tue, 22 Mar 2011 15:48:38 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q27ZD-0003aP-GJ for 8321@debbugs.gnu.org; Tue, 22 Mar 2011 15:48:36 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LIH007005LWFQ00@a-mtaout20.012.net.il> for 8321@debbugs.gnu.org; Tue, 22 Mar 2011 21:48:29 +0200 (IST) Received: from HOME-C4E4A596F7 ([77.126.16.52]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LIH006FS5ORHS70@a-mtaout20.012.net.il>; Tue, 22 Mar 2011 21:48:29 +0200 (IST) Date: Tue, 22 Mar 2011 21:48:27 +0200 From: Eli Zaretskii Subject: Re: bug#8321: 23.1; emerge error diff extra operand In-reply-to: <4D88F91F.8020109@yv.org> X-012-Sender: halo1@inter.net.il To: "Mark H. David" Message-id: <83pqpj7x84.fsf@gnu.org> References: <4D88C5CC.8090205@yv.org> <83vczb7zc5.fsf@gnu.org> <4D88F91F.8020109@yv.org> X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 8321 Cc: 8321@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.1 (--) > Date: Tue, 22 Mar 2011 15:31:43 -0400 > From: "Mark H. David" > > Thanks for checking on this so fast! > > Wow, actually having a full pathname with no spaces worked. If so, I think this is already fixed in the development sources. Can you try the patch below? --- lisp/emerge.el~0 2011-03-10 19:56:29.093750000 +0200 +++ lisp/emerge.el 2011-03-18 23:48:44.187500000 +0200 @@ -3187,21 +3187,26 @@ ;; Metacharacters that have to be protected from the shell when executing ;; a diff/diff3 command. -(defcustom emerge-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]" - "Characters that must be quoted with \\ when used in a shell command line. +(defcustom emerge-metachars + (if (memq system-type '(ms-dos windows-nt)) + "[ \t\"<>|?*^&=]" + "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]") + "Characters that must be quoted when used in a shell command line. More precisely, a [...] regexp to match any one such character." :type 'regexp :group 'emerge) ;; Quote metacharacters (using \) when executing a diff/diff3 command. (defun emerge-protect-metachars (s) - (let ((limit 0)) - (while (string-match emerge-metachars s limit) - (setq s (concat (substring s 0 (match-beginning 0)) - "\\" - (substring s (match-beginning 0)))) - (setq limit (1+ (match-end 0))))) - s) + (if (memq system-type '(ms-dos windows-nt)) + (shell-quote-argument s) + (let ((limit 0)) + (while (string-match emerge-metachars s limit) + (setq s (concat (substring s 0 (match-beginning 0)) + "\\" + (substring s (match-beginning 0)))) + (setq limit (1+ (match-end 0))))) + s)) (provide 'emerge) From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 23 01:29:56 2011 Received: (at 8321-done) by debbugs.gnu.org; 23 Mar 2011 05:29:56 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2Gdo-0000z2-3l for submit@debbugs.gnu.org; Wed, 23 Mar 2011 01:29:56 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2Gdm-0000yq-7q for 8321-done@debbugs.gnu.org; Wed, 23 Mar 2011 01:29:54 -0400 Received: from eliz by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Q2Gdg-0002Td-Pj; Wed, 23 Mar 2011 01:29:48 -0400 Date: Wed, 23 Mar 2011 01:29:48 -0400 Message-Id: From: Eli Zaretskii To: "Mark H. David" In-reply-to: <4D892EE0.2020103@yv.org> (mhd@yv.org) Subject: Re: bug#8321: 23.1; emerge error diff extra operand References: <4D88C5CC.8090205@yv.org> <83vczb7zc5.fsf@gnu.org> <4D88F91F.8020109@yv.org> <83pqpj7x84.fsf@gnu.org> <4D892EE0.2020103@yv.org> X-Spam-Score: -6.5 (------) X-Debbugs-Envelope-To: 8321-done Cc: 8321-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.5 (------) > Date: Tue, 22 Mar 2011 19:21:04 -0400 > From: "Mark H. David" > > Hi. Yes, that worked. Thank you! > Note that I put the patch on 23.2.1 Emacs, after verifying the bug was > present in that version. It is present even in 23.3, sadly. I'm closing this bug, since it is already fixed for the next release. Thanks for your report and feedback. From unknown Sat Jun 21 10:37:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 20 Apr 2011 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator