From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#17884: 24.3.92; `vc-next-action' discards commit message Date: Mon, 14 Jul 2014 15:31:12 -0400 Message-ID: <6rr41nivpb.fsf@fencepost.gnu.org> References: <53C09C9C.1040302@cs.ucla.edu> <53C0A6D0.3060806@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1405366338 15958 80.91.229.3 (14 Jul 2014 19:32:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Jul 2014 19:32:18 +0000 (UTC) Cc: rcopley@gmail.com, 17884@debbugs.gnu.org To: Paul Eggert Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jul 14 21:32:10 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X6lyo-0003gS-WC for geb-bug-gnu-emacs@m.gmane.org; Mon, 14 Jul 2014 21:32:07 +0200 Original-Received: from localhost ([::1]:59589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6lyo-0006L6-5t for geb-bug-gnu-emacs@m.gmane.org; Mon, 14 Jul 2014 15:32:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6lyl-0006Ku-15 for bug-gnu-emacs@gnu.org; Mon, 14 Jul 2014 15:32:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X6lyk-0001Bh-65 for bug-gnu-emacs@gnu.org; Mon, 14 Jul 2014 15:32:02 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6lyj-0001Bd-W6 for bug-gnu-emacs@gnu.org; Mon, 14 Jul 2014 15:32:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1X6lyj-0005Yk-O3 for bug-gnu-emacs@gnu.org; Mon, 14 Jul 2014 15:32:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 14 Jul 2014 19:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17884 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17884-submit@debbugs.gnu.org id=B17884.140536628721286 (code B ref 17884); Mon, 14 Jul 2014 19:32:01 +0000 Original-Received: (at 17884) by debbugs.gnu.org; 14 Jul 2014 19:31:27 +0000 Original-Received: from localhost ([127.0.0.1]:54937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X6ly5-0005XB-NU for submit@debbugs.gnu.org; Mon, 14 Jul 2014 15:31:26 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:33279 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X6lxy-0005Wv-Em for 17884@debbugs.gnu.org; Mon, 14 Jul 2014 15:31:19 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1X6lxw-0001mi-Rb; Mon, 14 Jul 2014 15:31:12 -0400 X-Spook: CDMA Saddam Hussein spy War on Terrorism Mafia e-cash X-Ran: Wg\D",1iyEe"RdfT|U%o]\IPF+d1+6@1(v^2b+7PRgeNnbOMXc-Td{;W'%9]884>,%v)9W X-Hue: magenta X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Sat, 12 Jul 2014 16:25:20 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:91548 Archived-At: I applied this, which hopefully covers it. --- a/lisp/vc/vc-dispatcher.el 2014-07-12 02:24:02 +0000 +++ b/lisp/vc/vc-dispatcher.el 2014-07-14 19:29:29 +0000 @@ -591,12 +591,19 @@ ;; Set up key bindings for use while editing log messages +(declare-function log-edit-empty-buffer-p "log-edit" ()) + (defun vc-log-edit (fileset mode backend) "Set up `log-edit' for use on FILE." (setq default-directory (buffer-local-value 'default-directory vc-parent-buffer)) + (require 'log-edit) (log-edit 'vc-finish-logentry - (= (point-min) (point-max)) + ;; Setup a new log message if the log buffer is "empty", + ;; or was previously used for a different set of files. + (or (log-edit-empty-buffer-p) + (and (local-variable-p 'vc-log-fileset) + (not (equal vc-log-fileset fileset)))) `((log-edit-listfun . (lambda () ;; FIXME: Should expand the list ;; for directories.