From unknown Sun Aug 17 10:17:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25555: 25.1.91; smerge-keep-current -vs- empty change Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Jan 2017 13:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 25555 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 25555@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.148552492327338 (code B ref -1); Fri, 27 Jan 2017 13:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jan 2017 13:48:43 +0000 Received: from localhost ([127.0.0.1]:47142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cX6tO-00076s-NG for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cX6tN-00076f-5h for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX6tG-0005ht-Kl for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:36 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_50,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cX6tG-0005hm-HA for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX6tE-0007JJ-5c for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:48:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX6tB-0005eb-0j for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:48:32 -0500 Received: from gproxy7-pub.mail.unifiedlayer.com ([70.40.196.235]:33964) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1cX6tA-0005dk-Cn for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:48:28 -0500 Received: (qmail 5845 invoked by uid 0); 27 Jan 2017 13:48:22 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy7.mail.unifiedlayer.com with SMTP; 27 Jan 2017 13:48:22 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id dRoH1u00P2f2jeq01RoLR4; Fri, 27 Jan 2017 06:48:21 -0700 X-Authority-Analysis: v=2.1 cv=H75InYoi c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IgFoBzBjUZAA:10 a=AEsz7X4E7GpudvaP-NoA:9 a=6LgQRQO-2gy4s518:21 a=ejUoyZbuxKlO5GQl:21 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vUJIdSay5Br31y2NSDz9Le8XNsN3Q9hRXwKuYc1jOsM=; b=V6Hukr2saAWOQsbpPxHMbMWdMN NdTkjXVwdW5taYwtbLuJWbnZXouGUu2ExJk76sM6dPbF25C+xuEMBCKbkIZmYZEzZ8T7o8Wu6Mr7h M8R1wyotkOTrWAY3aB6mpnd0b; Received: from 174-16-146-181.hlrn.qwest.net ([174.16.146.181]:40284 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1cX6t0-0002Vl-Jh; Fri, 27 Jan 2017 06:48:18 -0700 From: Tom Tromey X-Attribution: Tom Date: Fri, 27 Jan 2017 06:48:17 -0700 Message-ID: <87r33od36m.fsf@tromey.com> MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 174.16.146.181 X-Exim-ID: 1cX6t0-0002Vl-Jh X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-146-181.hlrn.qwest.net (pokyo) [174.16.146.181]:40284 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] 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.5 (----) 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.5 (----) I'm using smerge to fix up some files after a rebase. I have a change that looks like: <<<<<<< 9f33cac3f07100fe4835ade224e10f3ce58affdc ======= ... lots of stuff here >>>>>>> Bug 1060419 - make log_print use Printf.h, r?froydnj I want to use smerge to keep the original change -- which is empty. However C-c ^ RET (aka smerge-keep-current) on either the "<<<" or "===" line says: smerge-keep-current: Not inside a version Tom In GNU Emacs 25.1.91.3 (x86_64-unknown-linux-gnu, GTK+ Version 3.20.9) of 2017-01-27 built on pokyo Repository revision: f87e6256c014434024793f02e4b51052357724c0 Windowing system distributor 'Fedora Project', version 11.0.11804000 System Description: Fedora release 24 (Twenty Four) Configured using: 'configure --prefix=/home/tromey/Emacs/install --with-file-notifications=no' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GCONF GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: C++/l Minor modes in effect: bug-reference-prog-mode: t erc-spelling-mode: t erc-truncate-mode: t diff-auto-refine-mode: t flyspell-mode: t which-function-mode: t projectile-global-mode: t projectile-mode: t erc-notify-mode: t erc-notifications-mode: t erc-services-mode: t erc-list-mode: t erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-networks-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-netsplit-mode: t erc-hl-nicks-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-move-to-prompt-mode: t erc-readonly-mode: t savehist-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t auto-fill-function: tromey-c++-do-auto-fill transient-mark-mode: t abbrev-mode: t Recent messages: C-c C-g is undefined ^ runs the command self-insert-command C-c ^ a runs the command smerge-keep-all smerge-keep-current: Not inside a version Mark set C-c ^ C-g is undefined Mark set [2 times] smerge-keep-current: Not inside a version [2 times] Quit Type C-x 1 to delete the help window. Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/25.1.91/lisp/play/bubbles Features: (shadow mail-hist eieio-opt speedbar sb-image ezimage dframe emacsbug smerge-mode git-rebase-mode gnus-html url-cache mm-url flow-fill git-commit-mode derived log-edit pcvs-util term/xterm xterm copyright misearch multi-isearch add-log bug-reference cc-mode cc-fonts cc-guess cc-menus cc-cmds erc-spelling erc-truncate url-http url url-proxy url-privacy url-history url-auth url-cookie url-domsuf url-gw url-expand url-methods bbdb-gui bbdb-hooks bbdb-rmail rmailsum rmail vc-mtn vc-hg vc-git diff-mode vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs sort gnus-cite smiley shr-color url-util url-parse url-vars shr dom browse-url mm-archive gnus-bcklg gnus-async qp gnus-ml disp-table gnus-topic nndraft nnmh nnfolder utf-7 bbdb-gnus bbdb-snarf mail-extr bbdb-com network-stream nsm starttls gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg nntp gnus-cache gnus-registry registry eieio-compat eieio-base gnus-art mm-uu mml2015 mm-view mml-smime smime dig mailcap gnus-sum gnus-group gnus-undo smtpmail sendmail gnus-start gnus-cloud nnimap nnmail mail-source tls gnutls utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range message idna rfc822 mml mml-sec epg mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev gmm-utils mailheader gnus-win gnus gnus-ems nnheader mail-utils flyspell ispell diminish appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs which-func imenu edmacro kmacro projectile grep compile ibuf-ext ibuffer minimap autorevert filenotify desktop frameset cus-start cus-load erc-notify erc-desktop-notifications notifications dbus xml erc-services erc-list erc-menu erc-join erc-ring erc-networks erc-pcomplete pcomplete erc-track erc-match erc-netsplit erc-hl-nicks easy-mmode color erc-button erc-fill erc-stamp wid-edit erc-goodies erc erc-backend erc-compat format-spec auth-source cl-seq eieio gnus-util mm-util help-fns mail-prsvr password-cache thingatpt pp status dired-aux dired-x dired warnings advice vc-dir ewoc vc vc-dispatcher flycheck json map find-func rx subr-x dash cc-styles cc-align cc-engine cc-vars cc-defs bbdb cl timezone ange-ftp comint ansi-color ring server savehist finder-inf bbdb-autoloads dwarf-mode-autoloads eieio-core cl-macs lisppaste-autoloads pydoc-info-autoloads info-look weblogger-autoloads info package epg-config seq byte-opt gv bytecomp byte-compile cl-extra help-mode easymenu cconv cl-loaddefs pcase cl-lib 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 move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 2558550 1048482) (symbols 48 104945 1) (miscs 40 24265 2936) (strings 32 1221955 378296) (string-bytes 1 55754709) (vectors 16 102146) (vector-slots 8 1892301 171245) (floats 8 901 569) (intervals 56 10813 3481) (buffers 976 314) (heap 1024 241396 127693)) From unknown Sun Aug 17 10:17:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25555: 25.1.91; smerge-keep-current -vs- empty change Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 09 Sep 2017 23:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25555 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Tom Tromey Cc: 25555@debbugs.gnu.org Received: via spool by 25555-submit@debbugs.gnu.org id=B25555.15049993659050 (code B ref 25555); Sat, 09 Sep 2017 23:23:01 +0000 Received: (at 25555) by debbugs.gnu.org; 9 Sep 2017 23:22:45 +0000 Received: from localhost ([127.0.0.1]:58058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dqp5I-0002Lu-T7 for submit@debbugs.gnu.org; Sat, 09 Sep 2017 19:22:45 -0400 Received: from gproxy4-pub.mail.unifiedlayer.com ([69.89.23.142]:54438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dqp5G-0002Le-K3 for 25555@debbugs.gnu.org; Sat, 09 Sep 2017 19:22:43 -0400 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy4.mail.unifiedlayer.com (Postfix) with ESMTP id 6666117729D for <25555@debbugs.gnu.org>; Sat, 9 Sep 2017 17:22:35 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 7bNX1w00F2f2jeq01bNaDH; Sat, 09 Sep 2017 17:22:35 -0600 X-Authority-Analysis: v=2.2 cv=K/VSJ2eI c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=zstS-IiYAAAA:8 a=mDV3o1hIAAAA:8 a=2pAosli-svLPFpYfrN4A:9 a=4G6NA9xxw8l3yy4pmD5M:22 a=_FVE-zBwftR9WsbkzFJk:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6lS0iF/nQyUohRC7Ka7QbUOcsFdClC9p2TwKwZDMZZQ=; b=kKHtWfWrfMviTQFO4RajhKc7uK pbUUMx+vA+ZqjgNIH7HwkhwNSz/PYNM/xya4uOb5pYGM7ux+ZlKJHVKDIkdVjGh37/ujWlxtyTYUj 1FF6qH96NH0WIFFzcscv3MypM; Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:43152 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dqp55-003nE9-1y; Sat, 09 Sep 2017 17:22:31 -0600 From: Tom Tromey References: <87r33od36m.fsf@tromey.com> X-Attribution: Tom Date: Sat, 09 Sep 2017 17:22:28 -0600 In-Reply-To: <87r33od36m.fsf@tromey.com> (Tom Tromey's message of "Fri, 27 Jan 2017 06:48:17 -0700") Message-ID: <8760cra24r.fsf@bapiya> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.76.94 X-Exim-ID: 1dqp55-003nE9-1y X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-76-94.hlrn.qwest.net (bapiya) [75.166.76.94]:43152 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-Spam-Score: -2.8 (--) 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: -2.8 (--) This patch fixes the problem for me. Tom commit 55289e4ce3adb27a6c03cc42783265cf4d680f25 Author: Tom Tromey Date: Sat Sep 9 17:20:43 2017 -0600 Allow smerge-keep-current to work for empty hunks Bug#25555 * lisp/vc/smerge-mode.el (smerge-get-current): Allow point to be at match-end. * test/lisp/vc/smerge-mode-tests.el: New file. diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index f94f8a6..302adfe 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -725,7 +725,7 @@ smerge-get-current (let ((i 3)) (while (or (not (match-end i)) (< (point) (match-beginning i)) - (>= (point) (match-end i))) + (> (point) (match-end i))) (cl-decf i)) i)) diff --git a/test/lisp/vc/smerge-mode-tests.el b/test/lisp/vc/smerge-mode-tests.el new file mode 100644 index 0000000..204a4b9 --- /dev/null +++ b/test/lisp/vc/smerge-mode-tests.el @@ -0,0 +1,34 @@ +;; Copyright (C) 2017 Free Software Foundation, Inc + +;; Maintainer: emacs-devel@gnu.org + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Code: + +(require 'smerge-mode) + +(ert-deftest smerge-mode-test-empty-hunk () + "Regression test for bug #25555" + (with-temp-buffer + (insert "<<<<<<< one\n") + (save-excursion + (insert "=======\nLLL\n>>>>>>> end\n")) + (smerge-mode) + (smerge-keep-current) + (should (equal (buffer-substring (point-min) (point-max)) "")))) + +(provide 'smerge-mode-tests) From unknown Sun Aug 17 10:17:47 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tom Tromey Subject: bug#25555: closed (done) Message-ID: References: <87vakfa0u3.fsf@tromey.com> <87r33od36m.fsf@tromey.com> X-Gnu-PR-Message: they-closed 25555 X-Gnu-PR-Package: emacs Reply-To: 25555@debbugs.gnu.org Date: Tue, 19 Sep 2017 02:27:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1505788022-23038-1" This is a multi-part message in MIME format... ------------=_1505788022-23038-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #25555: 25.1.91; smerge-keep-current -vs- empty change which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 25555@debbugs.gnu.org. --=20 25555: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25555 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1505788022-23038-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 25555-done) by debbugs.gnu.org; 19 Sep 2017 02:26:35 +0000 Received: from localhost ([127.0.0.1]:47090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1du8F9-0005yz-0i for submit@debbugs.gnu.org; Mon, 18 Sep 2017 22:26:35 -0400 Received: from gproxy2-pub.mail.unifiedlayer.com ([69.89.18.3]:41512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1du8F6-0005ym-R3 for 25555-done@debbugs.gnu.org; Mon, 18 Sep 2017 22:26:33 -0400 Received: from cmgw4 (unknown [10.0.90.85]) by gproxy2.mail.unifiedlayer.com (Postfix) with ESMTP id 167841E0D44 for <25555-done@debbugs.gnu.org>; Mon, 18 Sep 2017 20:17:46 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id BEHi1w0112f2jeq01EHlMm; Mon, 18 Sep 2017 20:17:46 -0600 X-Authority-Analysis: v=2.2 cv=OZLoNlbY c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=FxKpEnC0CrsV8nijWlEA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Kaqahs4BGVl13mnQrGicPt81twyfd1kJCj63vVXngqk=; b=bk5LGgxmX4ooSxkMe1YfTlcc0q rFnL6+o0rjJ9RqB3eo4Z/ENMCDcNNkdu+l53ngySdf9VJgRIwti5Z4HJEheBsUD5Zx6+iOlFQUsAK v1DiXlPRxtiBBE+Ik/fe2jhJT; Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:59054 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1du86Y-000IRK-FJ; Mon, 18 Sep 2017 20:17:42 -0600 From: Tom Tromey To: 25555-done@debbugs.gnu.org Subject: done X-Attribution: Tom Date: Mon, 18 Sep 2017 20:17:40 -0600 Message-ID: <87vakfa0u3.fsf@tromey.com> MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.76.94 X-Exim-ID: 1du86Y-000IRK-FJ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-76-94.hlrn.qwest.net (bapiya) [75.166.76.94]:59054 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 25555-done 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: -2.3 (--) Fix checked in. Tom ------------=_1505788022-23038-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Jan 2017 13:48:43 +0000 Received: from localhost ([127.0.0.1]:47142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cX6tO-00076s-NG for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cX6tN-00076f-5h for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX6tG-0005ht-Kl for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:36 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_50,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cX6tG-0005hm-HA for submit@debbugs.gnu.org; Fri, 27 Jan 2017 08:48:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX6tE-0007JJ-5c for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:48:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX6tB-0005eb-0j for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:48:32 -0500 Received: from gproxy7-pub.mail.unifiedlayer.com ([70.40.196.235]:33964) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1cX6tA-0005dk-Cn for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:48:28 -0500 Received: (qmail 5845 invoked by uid 0); 27 Jan 2017 13:48:22 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy7.mail.unifiedlayer.com with SMTP; 27 Jan 2017 13:48:22 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id dRoH1u00P2f2jeq01RoLR4; Fri, 27 Jan 2017 06:48:21 -0700 X-Authority-Analysis: v=2.1 cv=H75InYoi c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IgFoBzBjUZAA:10 a=AEsz7X4E7GpudvaP-NoA:9 a=6LgQRQO-2gy4s518:21 a=ejUoyZbuxKlO5GQl:21 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vUJIdSay5Br31y2NSDz9Le8XNsN3Q9hRXwKuYc1jOsM=; b=V6Hukr2saAWOQsbpPxHMbMWdMN NdTkjXVwdW5taYwtbLuJWbnZXouGUu2ExJk76sM6dPbF25C+xuEMBCKbkIZmYZEzZ8T7o8Wu6Mr7h M8R1wyotkOTrWAY3aB6mpnd0b; Received: from 174-16-146-181.hlrn.qwest.net ([174.16.146.181]:40284 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1cX6t0-0002Vl-Jh; Fri, 27 Jan 2017 06:48:18 -0700 From: Tom Tromey To: bug-gnu-emacs@gnu.org Subject: 25.1.91; smerge-keep-current -vs- empty change X-Attribution: Tom Date: Fri, 27 Jan 2017 06:48:17 -0700 Message-ID: <87r33od36m.fsf@tromey.com> MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 174.16.146.181 X-Exim-ID: 1cX6t0-0002Vl-Jh X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-146-181.hlrn.qwest.net (pokyo) [174.16.146.181]:40284 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] 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.5 (----) 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.5 (----) I'm using smerge to fix up some files after a rebase. I have a change that looks like: <<<<<<< 9f33cac3f07100fe4835ade224e10f3ce58affdc ======= ... lots of stuff here >>>>>>> Bug 1060419 - make log_print use Printf.h, r?froydnj I want to use smerge to keep the original change -- which is empty. However C-c ^ RET (aka smerge-keep-current) on either the "<<<" or "===" line says: smerge-keep-current: Not inside a version Tom In GNU Emacs 25.1.91.3 (x86_64-unknown-linux-gnu, GTK+ Version 3.20.9) of 2017-01-27 built on pokyo Repository revision: f87e6256c014434024793f02e4b51052357724c0 Windowing system distributor 'Fedora Project', version 11.0.11804000 System Description: Fedora release 24 (Twenty Four) Configured using: 'configure --prefix=/home/tromey/Emacs/install --with-file-notifications=no' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GCONF GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: C++/l Minor modes in effect: bug-reference-prog-mode: t erc-spelling-mode: t erc-truncate-mode: t diff-auto-refine-mode: t flyspell-mode: t which-function-mode: t projectile-global-mode: t projectile-mode: t erc-notify-mode: t erc-notifications-mode: t erc-services-mode: t erc-list-mode: t erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-networks-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-netsplit-mode: t erc-hl-nicks-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-move-to-prompt-mode: t erc-readonly-mode: t savehist-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t auto-fill-function: tromey-c++-do-auto-fill transient-mark-mode: t abbrev-mode: t Recent messages: C-c C-g is undefined ^ runs the command self-insert-command C-c ^ a runs the command smerge-keep-all smerge-keep-current: Not inside a version Mark set C-c ^ C-g is undefined Mark set [2 times] smerge-keep-current: Not inside a version [2 times] Quit Type C-x 1 to delete the help window. Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/25.1.91/lisp/play/bubbles Features: (shadow mail-hist eieio-opt speedbar sb-image ezimage dframe emacsbug smerge-mode git-rebase-mode gnus-html url-cache mm-url flow-fill git-commit-mode derived log-edit pcvs-util term/xterm xterm copyright misearch multi-isearch add-log bug-reference cc-mode cc-fonts cc-guess cc-menus cc-cmds erc-spelling erc-truncate url-http url url-proxy url-privacy url-history url-auth url-cookie url-domsuf url-gw url-expand url-methods bbdb-gui bbdb-hooks bbdb-rmail rmailsum rmail vc-mtn vc-hg vc-git diff-mode vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs sort gnus-cite smiley shr-color url-util url-parse url-vars shr dom browse-url mm-archive gnus-bcklg gnus-async qp gnus-ml disp-table gnus-topic nndraft nnmh nnfolder utf-7 bbdb-gnus bbdb-snarf mail-extr bbdb-com network-stream nsm starttls gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg nntp gnus-cache gnus-registry registry eieio-compat eieio-base gnus-art mm-uu mml2015 mm-view mml-smime smime dig mailcap gnus-sum gnus-group gnus-undo smtpmail sendmail gnus-start gnus-cloud nnimap nnmail mail-source tls gnutls utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range message idna rfc822 mml mml-sec epg mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev gmm-utils mailheader gnus-win gnus gnus-ems nnheader mail-utils flyspell ispell diminish appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs which-func imenu edmacro kmacro projectile grep compile ibuf-ext ibuffer minimap autorevert filenotify desktop frameset cus-start cus-load erc-notify erc-desktop-notifications notifications dbus xml erc-services erc-list erc-menu erc-join erc-ring erc-networks erc-pcomplete pcomplete erc-track erc-match erc-netsplit erc-hl-nicks easy-mmode color erc-button erc-fill erc-stamp wid-edit erc-goodies erc erc-backend erc-compat format-spec auth-source cl-seq eieio gnus-util mm-util help-fns mail-prsvr password-cache thingatpt pp status dired-aux dired-x dired warnings advice vc-dir ewoc vc vc-dispatcher flycheck json map find-func rx subr-x dash cc-styles cc-align cc-engine cc-vars cc-defs bbdb cl timezone ange-ftp comint ansi-color ring server savehist finder-inf bbdb-autoloads dwarf-mode-autoloads eieio-core cl-macs lisppaste-autoloads pydoc-info-autoloads info-look weblogger-autoloads info package epg-config seq byte-opt gv bytecomp byte-compile cl-extra help-mode easymenu cconv cl-loaddefs pcase cl-lib 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 move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 2558550 1048482) (symbols 48 104945 1) (miscs 40 24265 2936) (strings 32 1221955 378296) (string-bytes 1 55754709) (vectors 16 102146) (vector-slots 8 1892301 171245) (floats 8 901 569) (intervals 56 10813 3481) (buffers 976 314) (heap 1024 241396 127693)) ------------=_1505788022-23038-1--