From unknown Sun Jun 22 03:56:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Aug 2017 12:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 28121 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 28121@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.150297343918475 (code B ref -1); Thu, 17 Aug 2017 12:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Aug 2017 12:37:19 +0000 Received: from localhost ([127.0.0.1]:42077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diK34-0004nu-Qp for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diK33-0004ne-CN for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diK2v-0007At-LU for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:12 -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.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]:32985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diK2v-0007Aj-IB for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diK2t-0004v1-H1 for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diK2n-00078v-5t for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:07 -0400 Received: from gproxy1-pub.mail.unifiedlayer.com ([69.89.25.95]:56758 helo=outbound-ss-1812.hostmonster.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diK2m-00075K-Mm for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:01 -0400 Received: from cmgw4 (cmgw5 [10.0.90.85]) by gproxy1.mail.unifiedlayer.com (Postfix) with ESMTP id CFB7A175ACF for ; Thu, 17 Aug 2017 06:36:42 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id yCce1v00J2f2jeq01CchvV; Thu, 17 Aug 2017 06:36:42 -0600 X-Authority-Analysis: v=2.2 cv=ELV26xRC c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=KeKAF7QvOSUA:10 a=5NLwTgN6oZApuwjsfmsA:9 a=PKdVIKhllUTcY5eB:21 a=JZ9qWHU3KVvRb9Ki: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=0vR0wJ6OTRfUVE+uE5HDrB8nFcAwCfFx4YRDJ8qjl5E=; b=a3AYycHqNGQBjTVuwFW+OJQzyg ArQ+2Pld9i0ttYh0vz9cIq6xAjyg8W9C6LlEalVQPqy2xBGxS6bkFdSDEUBHVIM023izSAR+VYIUh UyCY+6D7l2eY46Y7liI3n9hgL; Received: from 75-166-24-97.hlrn.qwest.net ([75.166.24.97]:47414 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1diK2Q-001qGF-9R; Thu, 17 Aug 2017 06:36:38 -0600 From: Tom Tromey X-Attribution: Tom Date: Thu, 17 Aug 2017 06:36:37 -0600 Message-ID: <87mv6yxtey.fsf@pokyo> 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: 75.166.24.97 X-Exim-ID: 1diK2Q-001qGF-9R X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-24-97.hlrn.qwest.net (pokyo) [75.166.24.97]:47414 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes 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 have a vc-dir buffer opened for my project. I did a "git rebase" (externally) which resulted in a merge conflict. I typed "g" in the vc-dir buffer to refresh. vc-dir showed me which files were in conflict. I edited one of the files, and upon saving, I expected emacs to refresh the file's state in the vc-dir buffer, to reflect that the file was no longer in conflict. However, this did not happen. I had to "g" again to refresh. Tom In GNU Emacs 26.0.50 (build 7, x86_64-pc-linux-gnu, GTK+ Version 3.22.17) of 2017-08-15 built on pokyo Repository revision: 5c3d0ce3e09bf070bb3c89caa9d88f25d4a39283 Windowing system distributor 'Fedora Project', version 11.0.11903000 System Description: Fedora release 25 (Twenty Five) Recent messages: user-error: No more Flycheck errors There are unresolved conflicts in /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js Mark set C-c ! C-g is undefined Parsing error: Unexpected token << scroll-up-command: End of buffer Saving file /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js... Wrote /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js (No files need saving) Finding changes in /home/tromey/firefox-git/artifact/...done Configured using: 'configure --prefix=/home/tromey/Emacs/install --with-modules' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 MODULES LIBSYSTEMD Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: JS Minor modes in effect: shell-dirtrack-mode: t erc-spelling-mode: t erc-truncate-mode: t bug-reference-prog-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 flycheck-mode: t savehist-mode: t cl-old-struct-compat-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: do-auto-fill transient-mark-mode: t Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/26.0.50/lisp/play/bubbles Features: (shadow emacsbug gnus-draft xref project ffap gnus-fun flow-fill gnus-html help-fns radix-tree url-cache mailalias mail-hist nnir url-http url-auth url-gw bbdb-gui bbdb-hooks bbdb-rmail rmailsum sort gnus-cite smiley shr-color mm-archive gnus-async gnus-bcklg qp gnus-ml disp-table log-view git-commit-mode git-rebase-mode term/xterm xterm log-edit pcvs-util find-file find-dired webjump smerge-mode idutils dabbrev conf-mode dxr vc-mtn vc-hg org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view jka-compr image-mode org-bibtex bibtex org-bbdb org-w3m org-element avl-tree generator org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle org-src ob-ref ob-lob ob-table ob-keys ob-exp ob-comint tramp tramp-compat tramp-loaddefs trampver ucs-normalize shell ob-core ob-eval org-compat org-macs org-loaddefs misearch multi-isearch erc-spelling erc-truncate copyright add-log cursor-sensor mhtml-mode css-mode smie eww mm-url url-queue url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util shr svg browse-url vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs bug-reference vc-git diff-mode js sgml-mode dom cc-mode cc-fonts cc-guess cc-menus cc-cmds 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-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 puny rfc822 mml mml-sec epa derived epg mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader gnus-win gnus nnheader gnus-util rmail rmail-loaddefs rfc2047 rfc2045 ietf-drums mail-utils mm-util mail-prsvr flyspell ispell diminish appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs which-func imenu edmacro kmacro projectile grep compile ibuf-ext ibuffer ibuffer-loaddefs autorevert filenotify desktop frameset cus-start cus-load erc-notify erc-desktop-notifications erc-services notifications dbus xml 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 thingatpt pp dired-aux dired-x dired dired-loaddefs warnings advice vc-dir ewoc vc vc-dispatcher flycheck cl-extra json map find-func help-mode 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 lisppaste-autoloads pydoc-info-autoloads info-look weblogger-autoloads info package easymenu epg-config url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache url-vars seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors 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 composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray 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 3608081 1981311) (symbols 48 114749 278) (miscs 40 27480 8552) (strings 32 1440341 110031) (string-bytes 1 67194821) (vectors 16 141780) (vector-slots 8 3761937 295549) (floats 8 587 1735) (intervals 56 86486 2893) (buffers 992 167)) From unknown Sun Jun 22 03:56:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 20 Aug 2017 21:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28121 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Tom Tromey , 28121@debbugs.gnu.org Received: via spool by 28121-submit@debbugs.gnu.org id=B28121.15032627931180 (code B ref 28121); Sun, 20 Aug 2017 21:00:02 +0000 Received: (at 28121) by debbugs.gnu.org; 20 Aug 2017 20:59:53 +0000 Received: from localhost ([127.0.0.1]:47009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1djXK5-0000Iy-Ad for submit@debbugs.gnu.org; Sun, 20 Aug 2017 16:59:53 -0400 Received: from mail-wr0-f174.google.com ([209.85.128.174]:36090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1djXK4-0000Im-CX for 28121@debbugs.gnu.org; Sun, 20 Aug 2017 16:59:52 -0400 Received: by mail-wr0-f174.google.com with SMTP id f8so47107507wrf.3 for <28121@debbugs.gnu.org>; Sun, 20 Aug 2017 13:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=zcKPQqNzRBUudBjduIh0R+q3XmHLbovavgcipDOUvIU=; b=axhdFLTAae38lCcIC+cz9wUuUtgsODHFACstvXWwn81LAZgiHC0W6S843hXaVeDNJV ba3IjF+suVMahlnG1tUVCECNhYv/z0pSQ4YaRzxwOIO+Snh1iM3ErFzsG5zgqiFvofBO sWoYEHnUzpKaNS29x166/cMXdBTQ23h2tb2R+MmKrvaPE0M4/e/ler58ZBatueUyxAnY Fit6M2o9sspjGg7F7wrkg/LXqriuPLHfw7G9+gF4jAZWqQXSZVBnkIswGs+R9aaHo/7+ 6ue0rw5V10IsaRIAxuRFzUw4fz+RZj2sofmk45nW2e2Xckpo/lyCYXHI8Am+XVBZvQp6 MdBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=zcKPQqNzRBUudBjduIh0R+q3XmHLbovavgcipDOUvIU=; b=khL1YQzFiXBLdu7421OwEdz+HF/OjpFaAn7YLynkb9GOMz2WL28YgkuEtR/p+GbwcP seoyE95AJE/vzMWznESlCHNqQM7WVubv2sqCGsN3jd8uhxQFaj4WbzkFQIO+MK5T0W/n QFg4qX4kBkh816FO+G1m8Axeg7Z11kHVu9zqoHv6OCizvHG6U4oofWucZbdVYcXXWL3I bB76dZWRTlyorHRZfe6MlHzH+/URKYVTvFkqEoMSFy+HjT5pNEHmOABcIHgN7hQ539dP a+yR1AocM4BY26lYc6A8/dhPeOvKu72f73urFPaWIXnaF9cskk/h3UK64cKuFo3LPmSu VAtQ== X-Gm-Message-State: AHYfb5hhHBGVnXNbwGJdGvYOjIpHDwxXcu3G94qmgrYhgBJ4kRJHcPIU v3JQpTnrAA9+JpAwUN8= X-Received: by 10.28.4.148 with SMTP id 142mr3912797wme.145.1503262786290; Sun, 20 Aug 2017 13:59:46 -0700 (PDT) Received: from [192.168.1.3] ([185.105.174.193]) by smtp.googlemail.com with ESMTPSA id r70sm8565516wmb.35.2017.08.20.13.59.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Aug 2017 13:59:45 -0700 (PDT) References: <87mv6yxtey.fsf@pokyo> From: Dmitry Gutov Message-ID: <4332a009-7d15-803d-952e-4505ce2cd6c6@yandex.ru> Date: Sun, 20 Aug 2017 23:59:43 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:56.0) Gecko/20100101 Thunderbird/56.0 MIME-Version: 1.0 In-Reply-To: <87mv6yxtey.fsf@pokyo> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) 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.1 (--) Hi Tom! On 8/17/17 3:36 PM, Tom Tromey wrote: > > I have a vc-dir buffer opened for my project. > I did a "git rebase" (externally) which resulted in a merge conflict. > I typed "g" in the vc-dir buffer to refresh. > > vc-dir showed me which files were in conflict. > > I edited one of the files, and upon saving, I expected emacs to refresh > the file's state in the vc-dir buffer, to reflect that the file was no > longer in conflict. Thanks for the report. I don't have time now to repro, but please try the following patch. Maybe add a third t to the arguments list if it doesn't help. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index cc3e295..6123b32 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -964,6 +964,7 @@ vc-git-resolve-when-done (vc-git-root buffer-file-name))) (vc-git-conflicted-files (vc-git-root buffer-file-name))) (vc-git-command nil 0 nil "reset")) + (vc-resynch-buffer buffer-file-name t t) ;; Remove the hook so that it is not called multiple times. (remove-hook 'after-save-hook 'vc-git-resolve-when-done t)))) From unknown Sun Jun 22 03:56:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Sep 2017 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28121 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: Tom Tromey , 28121@debbugs.gnu.org Received: via spool by 28121-submit@debbugs.gnu.org id=B28121.15051661021108 (code B ref 28121); Mon, 11 Sep 2017 21:42:02 +0000 Received: (at 28121) by debbugs.gnu.org; 11 Sep 2017 21:41:42 +0000 Received: from localhost ([127.0.0.1]:34216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drWSb-0000Ho-QY for submit@debbugs.gnu.org; Mon, 11 Sep 2017 17:41:41 -0400 Received: from gproxy3-pub.mail.unifiedlayer.com ([69.89.30.42]:54797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drWSZ-0000HW-Fb for 28121@debbugs.gnu.org; Mon, 11 Sep 2017 17:41:40 -0400 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy3.mail.unifiedlayer.com (Postfix) with ESMTP id 13F114025E for <28121@debbugs.gnu.org>; Mon, 11 Sep 2017 15:11:41 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 8MBZ1w0042f2jeq01MBcCP; Mon, 11 Sep 2017 15:11:41 -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=vaJtXVxTAAAA:8 a=zNa0DG5rk-nxdx9_4gMA: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: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=gWwHsdsdZnUc1D9ukN4A7UMr9xk2qt0t98xUVyzEQM8=; b=VL9Ngx0fFIksbJWyfuHQ7oG6hr KEMvWYxXCDU6gcMlXO3w1bw7qlcuvVoc1a/5nn+fdEMJ+y9IaBbV8M+sZHmHXkut53KahWAWnBt9b iQVso23M0eAMNJCFYyZmntzi/; Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:39242 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1drVzQ-001umv-RY; Mon, 11 Sep 2017 15:11:32 -0600 From: Tom Tromey References: <87mv6yxtey.fsf@pokyo> <4332a009-7d15-803d-952e-4505ce2cd6c6@yandex.ru> X-Attribution: Tom Date: Mon, 11 Sep 2017 15:11:32 -0600 In-Reply-To: <4332a009-7d15-803d-952e-4505ce2cd6c6@yandex.ru> (Dmitry Gutov's message of "Sun, 20 Aug 2017 23:59:43 +0300") Message-ID: <87wp552b5n.fsf@pokyo> 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: 1drVzQ-001umv-RY X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-76-94.hlrn.qwest.net (pokyo) [75.166.76.94]:39242 X-Source-Auth: tom+tromey.com X-Email-Count: 2 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 (--) >>>>> "Dmitry" == Dmitry Gutov writes: Dmitry> Thanks for the report. I don't have time now to repro, but please try Dmitry> the following patch. Maybe add a third t to the arguments list if it Dmitry> doesn't help. Dmitry> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el Dmitry> index cc3e295..6123b32 100644 Dmitry> --- a/lisp/vc/vc-git.el Dmitry> +++ b/lisp/vc/vc-git.el Dmitry> @@ -964,6 +964,7 @@ vc-git-resolve-when-done Dmitry> (vc-git-root Dmitry> buffer-file-name))) Dmitry> (vc-git-conflicted-files (vc-git-root buffer-file-name))) Dmitry> (vc-git-command nil 0 nil "reset")) Dmitry> + (vc-resynch-buffer buffer-file-name t t) Dmitry> ;; Remove the hook so that it is not called multiple times. Dmitry> (remove-hook 'after-save-hook 'vc-git-resolve-when-done t)))) I finally got around to trying this last night, and it worked for me. Could you check it in? thanks, Tom From unknown Sun Jun 22 03:56:50 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#28121: closed (Re: bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved) Message-ID: References: <5fbc71f9-9e89-fd17-22c3-abdb16820786@yandex.ru> <87mv6yxtey.fsf@pokyo> X-Gnu-PR-Message: they-closed 28121 X-Gnu-PR-Package: emacs Reply-To: 28121@debbugs.gnu.org Date: Tue, 12 Sep 2017 23:34:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1505259241-25400-1" This is a multi-part message in MIME format... ------------=_1505259241-25400-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #28121: 26.0.50; vc-dir doesn't update when conflict resolved 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 28121@debbugs.gnu.org. --=20 28121: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D28121 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1505259241-25400-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 28121-done) by debbugs.gnu.org; 12 Sep 2017 23:33:11 +0000 Received: from localhost ([127.0.0.1]:36610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drug2-0006aY-N7 for submit@debbugs.gnu.org; Tue, 12 Sep 2017 19:33:10 -0400 Received: from mail-lf0-f51.google.com ([209.85.215.51]:34481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drug1-0006aM-Nm for 28121-done@debbugs.gnu.org; Tue, 12 Sep 2017 19:33:10 -0400 Received: by mail-lf0-f51.google.com with SMTP id l196so30112125lfl.1 for <28121-done@debbugs.gnu.org>; Tue, 12 Sep 2017 16:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=v+7kpgN614zOtZCh585B79Wi3skLAQnkO/I2ZGqkPJU=; b=sG5gEew+a5Yby4PyDAp/8eGLubj5JK54pmp637uyoYe/ct5AA0qjMp1GrIFxNRcIMp wHFPSCKKfVUtlM74lI4EBcCvL1boTK8l3fTleZow0mpiBWNLcvioc0p2RRJk7n0YY1Ee 8k1pgwHHFlmpBXZF5AfvdQZbRpZNU+e2YbDXj2NJwXRxzHqxgFZ6PeLIP9MYzDqYUqWA oqE/NocHeBp/ogx4kwWOTOlcgME7/0E7NpMAPW2S+5aQBHTueiej9nw7G1Kd8MxaRx6Z OUu+HVk4lYXhfsg8fYxnxUuZi3GAfyOc2a8NxIkIQyXFZxBEyVz4CBIicdd8NUloZ9Zp lFNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=v+7kpgN614zOtZCh585B79Wi3skLAQnkO/I2ZGqkPJU=; b=fZf50R/rUTOWAkBri4k+CWAqv31yfE3kyWqKNOMTK+K2t5n8DjkRgtDGjqI1colcTg uO2I2bBYNv7vvZaVBH4gn+XZM2if5zijTf+PlzHUJywFcllrcaHaoFS9Umr6d85TnpvS ifcEJ5n2bmfBDhSfLJjWdGqLX2ZbgAWNOgvXJr5HiI2LFyAD9aUeLn+571nPevl+MhIp jHB8jXHwshSwlIHaYaUAWevOKtIXkrfhF2VBbFyiWikhQNfJEVpDfqABuv66HhKAoui3 K2mEyFUUeJ6yFIoEYU4or9olDsuweE/VydsvT2dNcMnEbmmzZ0CLVD63eVpJEl8Ed2IC 5T/A== X-Gm-Message-State: AHPjjUj3BUB+J7SzvdjY0LuzKvkqo4agIH4aT7ZWrVKoh6x7W/ENQxgh KXJCGgql/h7WE/Tblzc= X-Google-Smtp-Source: AOwi7QD0YooFezwOhoHbtCIWKNjQm1EtS1BJs4+UaPf0wMECj/+hJKWOUecDBHcVUI2O70P9SJIOhg== X-Received: by 10.46.27.214 with SMTP id c83mr5214167ljf.163.1505259183237; Tue, 12 Sep 2017 16:33:03 -0700 (PDT) Received: from [192.168.1.174] ([178.252.127.239]) by smtp.googlemail.com with ESMTPSA id f26sm2301205lfl.44.2017.09.12.16.33.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 16:33:01 -0700 (PDT) Subject: Re: bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved To: Tom Tromey References: <87mv6yxtey.fsf@pokyo> <4332a009-7d15-803d-952e-4505ce2cd6c6@yandex.ru> <87wp552b5n.fsf@pokyo> From: Dmitry Gutov Message-ID: <5fbc71f9-9e89-fd17-22c3-abdb16820786@yandex.ru> Date: Wed, 13 Sep 2017 02:33:00 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:56.0) Gecko/20100101 Thunderbird/56.0 MIME-Version: 1.0 In-Reply-To: <87wp552b5n.fsf@pokyo> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 2.2 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Version: 26.1 On 9/12/17 12:11 AM, Tom Tromey wrote: > I finally got around to trying this last night, and it worked for me. > Could you check it in? [...] Content analysis details: (2.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [209.85.215.51 listed in dnsbl.sorbs.net] 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [178.252.127.239 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.51 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.215.51 listed in list.dnswl.org] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dgutov[at]yandex.ru) 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 28121-done Cc: 28121-done@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: 2.2 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Version: 26.1 On 9/12/17 12:11 AM, Tom Tromey wrote: > I finally got around to trying this last night, and it worked for me. > Could you check it in? [...] Content analysis details: (2.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [178.252.127.239 listed in dnsbl.sorbs.net] 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [209.85.215.51 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.51 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.215.51 listed in list.dnswl.org] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dgutov[at]yandex.ru) 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Version: 26.1 On 9/12/17 12:11 AM, Tom Tromey wrote: > I finally got around to trying this last night, and it worked for me. > Could you check it in? Pushed. Thanks for checking! ------------=_1505259241-25400-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 17 Aug 2017 12:37:19 +0000 Received: from localhost ([127.0.0.1]:42077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diK34-0004nu-Qp for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diK33-0004ne-CN for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diK2v-0007At-LU for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:12 -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.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]:32985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diK2v-0007Aj-IB for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diK2t-0004v1-H1 for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diK2n-00078v-5t for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:07 -0400 Received: from gproxy1-pub.mail.unifiedlayer.com ([69.89.25.95]:56758 helo=outbound-ss-1812.hostmonster.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diK2m-00075K-Mm for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:01 -0400 Received: from cmgw4 (cmgw5 [10.0.90.85]) by gproxy1.mail.unifiedlayer.com (Postfix) with ESMTP id CFB7A175ACF for ; Thu, 17 Aug 2017 06:36:42 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id yCce1v00J2f2jeq01CchvV; Thu, 17 Aug 2017 06:36:42 -0600 X-Authority-Analysis: v=2.2 cv=ELV26xRC c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=KeKAF7QvOSUA:10 a=5NLwTgN6oZApuwjsfmsA:9 a=PKdVIKhllUTcY5eB:21 a=JZ9qWHU3KVvRb9Ki: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=0vR0wJ6OTRfUVE+uE5HDrB8nFcAwCfFx4YRDJ8qjl5E=; b=a3AYycHqNGQBjTVuwFW+OJQzyg ArQ+2Pld9i0ttYh0vz9cIq6xAjyg8W9C6LlEalVQPqy2xBGxS6bkFdSDEUBHVIM023izSAR+VYIUh UyCY+6D7l2eY46Y7liI3n9hgL; Received: from 75-166-24-97.hlrn.qwest.net ([75.166.24.97]:47414 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1diK2Q-001qGF-9R; Thu, 17 Aug 2017 06:36:38 -0600 From: Tom Tromey To: bug-gnu-emacs@gnu.org Subject: 26.0.50; vc-dir doesn't update when conflict resolved X-Attribution: Tom Date: Thu, 17 Aug 2017 06:36:37 -0600 Message-ID: <87mv6yxtey.fsf@pokyo> 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: 75.166.24.97 X-Exim-ID: 1diK2Q-001qGF-9R X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-24-97.hlrn.qwest.net (pokyo) [75.166.24.97]:47414 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes 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 have a vc-dir buffer opened for my project. I did a "git rebase" (externally) which resulted in a merge conflict. I typed "g" in the vc-dir buffer to refresh. vc-dir showed me which files were in conflict. I edited one of the files, and upon saving, I expected emacs to refresh the file's state in the vc-dir buffer, to reflect that the file was no longer in conflict. However, this did not happen. I had to "g" again to refresh. Tom In GNU Emacs 26.0.50 (build 7, x86_64-pc-linux-gnu, GTK+ Version 3.22.17) of 2017-08-15 built on pokyo Repository revision: 5c3d0ce3e09bf070bb3c89caa9d88f25d4a39283 Windowing system distributor 'Fedora Project', version 11.0.11903000 System Description: Fedora release 25 (Twenty Five) Recent messages: user-error: No more Flycheck errors There are unresolved conflicts in /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js Mark set C-c ! C-g is undefined Parsing error: Unexpected token << scroll-up-command: End of buffer Saving file /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js... Wrote /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js (No files need saving) Finding changes in /home/tromey/firefox-git/artifact/...done Configured using: 'configure --prefix=/home/tromey/Emacs/install --with-modules' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 MODULES LIBSYSTEMD Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: JS Minor modes in effect: shell-dirtrack-mode: t erc-spelling-mode: t erc-truncate-mode: t bug-reference-prog-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 flycheck-mode: t savehist-mode: t cl-old-struct-compat-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: do-auto-fill transient-mark-mode: t Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/26.0.50/lisp/play/bubbles Features: (shadow emacsbug gnus-draft xref project ffap gnus-fun flow-fill gnus-html help-fns radix-tree url-cache mailalias mail-hist nnir url-http url-auth url-gw bbdb-gui bbdb-hooks bbdb-rmail rmailsum sort gnus-cite smiley shr-color mm-archive gnus-async gnus-bcklg qp gnus-ml disp-table log-view git-commit-mode git-rebase-mode term/xterm xterm log-edit pcvs-util find-file find-dired webjump smerge-mode idutils dabbrev conf-mode dxr vc-mtn vc-hg org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view jka-compr image-mode org-bibtex bibtex org-bbdb org-w3m org-element avl-tree generator org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle org-src ob-ref ob-lob ob-table ob-keys ob-exp ob-comint tramp tramp-compat tramp-loaddefs trampver ucs-normalize shell ob-core ob-eval org-compat org-macs org-loaddefs misearch multi-isearch erc-spelling erc-truncate copyright add-log cursor-sensor mhtml-mode css-mode smie eww mm-url url-queue url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util shr svg browse-url vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs bug-reference vc-git diff-mode js sgml-mode dom cc-mode cc-fonts cc-guess cc-menus cc-cmds 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-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 puny rfc822 mml mml-sec epa derived epg mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader gnus-win gnus nnheader gnus-util rmail rmail-loaddefs rfc2047 rfc2045 ietf-drums mail-utils mm-util mail-prsvr flyspell ispell diminish appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs which-func imenu edmacro kmacro projectile grep compile ibuf-ext ibuffer ibuffer-loaddefs autorevert filenotify desktop frameset cus-start cus-load erc-notify erc-desktop-notifications erc-services notifications dbus xml 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 thingatpt pp dired-aux dired-x dired dired-loaddefs warnings advice vc-dir ewoc vc vc-dispatcher flycheck cl-extra json map find-func help-mode 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 lisppaste-autoloads pydoc-info-autoloads info-look weblogger-autoloads info package easymenu epg-config url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache url-vars seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors 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 composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray 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 3608081 1981311) (symbols 48 114749 278) (miscs 40 27480 8552) (strings 32 1440341 110031) (string-bytes 1 67194821) (vectors 16 141780) (vector-slots 8 3761937 295549) (floats 8 587 1735) (intervals 56 86486 2893) (buffers 992 167)) ------------=_1505259241-25400-1--