From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.bugs Subject: bug#25555: 25.1.91; smerge-keep-current -vs- empty change Date: Fri, 27 Jan 2017 06:48:17 -0700 Message-ID: <87r33od36m.fsf@tromey.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1485528473 5182 195.159.176.226 (27 Jan 2017 14:47:53 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 27 Jan 2017 14:47:53 +0000 (UTC) To: 25555@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 27 15:47:49 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cX7oP-0000BX-5o for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Jan 2017 15:47:37 +0100 Original-Received: from localhost ([::1]:45842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX7oU-0005Nw-CT for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Jan 2017 09:47:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX6tq-0007k9-Ch for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:49:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX6tn-0005zy-8d for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:49:10 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48944) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cX6tn-0005zp-41 for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:49:07 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cX6th-00077Q-Q3 for bug-gnu-emacs@gnu.org; Fri, 27 Jan 2017 08:49:01 -0500 X-Loop: help-debbugs@gnu.org 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: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.148552492327338 (code B ref -1); Fri, 27 Jan 2017 13:49:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Jan 2017 13:48:43 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-Received: (qmail 5845 invoked by uid 0); 27 Jan 2017 13:48:22 -0000 Original-Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy7.mail.unifiedlayer.com with SMTP; 27 Jan 2017 13:48:22 -0000 Original-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; Original-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 X-Attribution: Tom 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:128683 Archived-At: 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))