From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 07 23:38:17 2016 Received: (at submit) by debbugs.gnu.org; 8 Jun 2016 03:38:17 +0000 Received: from localhost ([127.0.0.1]:59419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAUJt-0005HL-DG for submit@debbugs.gnu.org; Tue, 07 Jun 2016 23:38:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAUJr-0005H8-OQ for submit@debbugs.gnu.org; Tue, 07 Jun 2016 23:38:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAUJk-0005R6-Ku for submit@debbugs.gnu.org; Tue, 07 Jun 2016 23:38:09 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:46223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAUJk-0005R0-HS for submit@debbugs.gnu.org; Tue, 07 Jun 2016 23:38:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAUJh-0005W4-Py for bug-gnu-emacs@gnu.org; Tue, 07 Jun 2016 23:38:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAUJc-0005Mx-QD for bug-gnu-emacs@gnu.org; Tue, 07 Jun 2016 23:38:05 -0400 Received: from omr-a005e.mx.aol.com ([204.29.186.50]:48310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAUJc-0005MY-LF for bug-gnu-emacs@gnu.org; Tue, 07 Jun 2016 23:38:00 -0400 Received: from mtaout-aae02.mx.aol.com (mtaout-aae02.mx.aol.com [172.27.1.98]) by omr-a005e.mx.aol.com (Outbound Mail Relay) with ESMTP id CFE453800095 for ; Tue, 7 Jun 2016 23:37:59 -0400 (EDT) Received: from localhost.localdomain (c-50-163-96-131.hsd1.ma.comcast.net [50.163.96.131]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mtaout-aae02.mx.aol.com (MUA/Third Party Client Interface) with ESMTPSA id 88D6738000084 for ; Tue, 7 Jun 2016 23:37:59 -0400 (EDT) From: Live System User To: bug-gnu-emacs@gnu.org Subject: 25.0.94; ediff-patch-buffer doesn't handle -p3 `ediff-patch-options' option Date: Tue, 07 Jun 2016 23:37:18 -0400 Message-ID: <87bn3c9wr5.fsf@aol.com> MIME-Version: 1.0 Content-Type: text/plain x-aol-global-disposition: G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.aol.com; s=20150623; t=1465357079; bh=nsfHS+8b9UIeqiCEa6jMielRpQxCaHlEfZe5kssl0bQ=; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type; b=PCffOd07Q1DtBGsFGGRDf3I1q88PMpuYCgFJvpuLF1APdWmrlrHhL0kjne0nyXdk2 yy69z12Z5o+d8a05G6DSA5WYrutoDxpf5MZkifgps2xLokfFlr7GYNVLiSpWwPGgGZ Nsw0K1Rgv7+pHGUkpZDx9+CGS07OXej/29V1BZ04= x-aol-sid: 3039ac1b016257579317208f X-AOL-IP: 50.163.96.131 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Hi, I cannot seem to pass a specific patch obtion to `ediff-patch-buffer'. I set `ediff-patch-options' to "-p3". I have a patch that when invoking `ediff-patch-buffer' via: Tools->Apply Patch->To a Buffer gets me the error message: patch: **** Only garbage was found in the patch input. However, when using the following from the command line: patch --verbose -p3 < /tmp/G1.patch it works, as expected. The patch is a unified diff, if it matters and I am using GNU patch 2.7.5. Thanks. In GNU Emacs 25.0.94.1 (x86_64-redhat-linux-gnu, GTK+ Version 3.18.9) of 2016-05-18 built on copr-builder-587584625.novalocal Windowing system distributor 'Fedora Project', version 11.0.11799901 Configured using: 'configure --build=x86_64-redhat-linux-gnu --host=x86_64-redhat-linux-gnu --program-prefix= --disable-dependency-tracking --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-dbus --with-gif --with-jpeg --with-png --with-rsvg --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no --with-xwidgets build_alias=x86_64-redhat-linux-gnu host_alias=x86_64-redhat-linux-gnu 'CFLAGS=-DMAIL_USE_LOCKF -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic' LDFLAGS=-Wl,-z,relro PKG_CONFIG_PATH=:/usr/lib64/pkgconfig:/usr/share/pkgconfig' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 XWIDGETS Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Group Minor modes in effect: cursor-sensor-mode: t gnus-undo-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t buffer-read-only: t line-number-mode: t transient-mark-mode: t Recent messages: Scoring...done Sorting threads...done Generating summary...done Load-path shadows: None found. Features: (shadow emacsbug sendmail gnus-dup sort gnus-cite smiley ansi-color url-util url-parse url-vars shr-color color shr seq dom subr-x browse-url mm-archive mail-extr gnus-async gnus-bcklg qp gnus-ml disp-table cursor-sensor nndraft nnmh nndoc utf-7 rfc2104 nnfolder network-stream nsm starttls gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg gnus-art mm-uu mml2015 mm-view mml-smime smime dig mailcap nntp gnus-cache pp epa-file epa derived auth-source eieio byte-opt bytecomp byte-compile cconv eieio-core sieve sieve-mode sieve-manage nnir gnus-sum gnus-group gnus-undo gnus-start gnus-cloud gnus-spec gnus-win cl-extra nnimap cl-seq nnmail gnus-int gnus-range mail-source message cl-macs dired format-spec rfc822 mml mml-sec password-cache epg epg-config mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev gmm-utils mailheader parse-time tls gnutls utf7 netrc nnoo gnus gnus-ems wid-edit cl gv nnheader gnus-util mm-util help-fns help-mode easymenu cl-loaddefs pcase cl-lib mail-prsvr mail-utils misearch multi-isearch time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese charscript case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote dbusbind inotify dynamic-setting system-font-setting font-render-setting xwidget-internal move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 262862 67457) (symbols 48 122591 0) (miscs 40 101 405) (strings 32 93292 13906) (string-bytes 1 3486493) (vectors 16 23991) (vector-slots 8 648461 18351) (floats 8 547 890) (intervals 56 1424 69) (buffers 976 34) (heap 1024 50762 519230)) From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 10 01:00:10 2016 Received: (at 23724) by debbugs.gnu.org; 10 Jun 2016 05:00:10 +0000 Received: from localhost ([127.0.0.1]:35063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bBEYD-0008OI-Ri for submit@debbugs.gnu.org; Fri, 10 Jun 2016 01:00:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bBEYC-0008NK-Au for 23724@debbugs.gnu.org; Fri, 10 Jun 2016 01:00:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBEY6-0003Y2-Ki for 23724@debbugs.gnu.org; Fri, 10 Jun 2016 01:00:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBEY4-0003XT-Uf; Fri, 10 Jun 2016 01:00:00 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1bBEY4-0000F3-3f; Fri, 10 Jun 2016 01:00:00 -0400 From: Glenn Morris To: Live System User Subject: Re: bug#23724: 25.0.94; ediff-patch-buffer doesn't handle -p3 `ediff-patch-options' option References: <87bn3c9wr5.fsf@aol.com> X-Spook: Mahmoud Ahmadinejad CBNRC ARPA halcon BART Air Marshal X-Ran: 400Q2A!Y>v}$}~%"80x!ZkA@"`d1Y5aToZ&Z6]=#(sY|g=M-W}xU>"zE=`A|29F6\i'Fr, X-Hue: blue X-Attribution: GM Date: Fri, 10 Jun 2016 00:59:59 -0400 In-Reply-To: <87bn3c9wr5.fsf@aol.com> (Live System User's message of "Tue, 07 Jun 2016 23:37:18 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.4 (------) X-Debbugs-Envelope-To: 23724 Cc: 23724@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.4 (------) I was unable to reproduce this. One would expect the wrong -p option to produce a "can't find file to patch" error, not "Only garbage was found in the patch". In any case, I don't think you need to add -p# to ediff options, I think it figures out internally what file to patch. From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 21 17:21:38 2017 Received: (at control) by debbugs.gnu.org; 21 Jul 2017 21:21:38 +0000 Received: from localhost ([127.0.0.1]:51683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dYfMg-0002Yp-0Y for submit@debbugs.gnu.org; Fri, 21 Jul 2017 17:21:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dYfMe-0002Yb-Ia for control@debbugs.gnu.org; Fri, 21 Jul 2017 17:21:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYfMY-0003ob-QT for control@debbugs.gnu.org; Fri, 21 Jul 2017 17:21:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYfMY-0003oV-NE for control@debbugs.gnu.org; Fri, 21 Jul 2017 17:21:30 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1dYfMY-0001FA-DK for control@debbugs.gnu.org; Fri, 21 Jul 2017 17:21:30 -0400 Subject: control message for bug 23724 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Fri, 21 Jul 2017 17:21:30 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) tag 23724 wontfix close 23724 From unknown Fri Jun 20 07:21:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 19 Aug 2017 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