From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.bugs Subject: bug#16145: ERC disregards data to be logged when reconnecting Date: Sun, 05 Oct 2014 11:22:25 +0000 Message-ID: <877g0e7ocu.fsf@violet.siamics.net> References: <87sitvxzl4.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1412508201 24936 80.91.229.3 (5 Oct 2014 11:23:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Oct 2014 11:23:21 +0000 (UTC) To: 16145@debbugs.gnu.org, control@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Oct 05 13:23:16 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 1XajuF-0002v4-Mz for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Oct 2014 13:23:15 +0200 Original-Received: from localhost ([::1]:47096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XajuE-0001UD-UH for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Oct 2014 07:23:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xaju7-0001T8-N6 for bug-gnu-emacs@gnu.org; Sun, 05 Oct 2014 07:23:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xaju3-0007ux-5W for bug-gnu-emacs@gnu.org; Sun, 05 Oct 2014 07:23:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xaju2-0007up-Ph for bug-gnu-emacs@gnu.org; Sun, 05 Oct 2014 07:23:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Xaju2-000857-E7 for bug-gnu-emacs@gnu.org; Sun, 05 Oct 2014 07:23:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 05 Oct 2014 11:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16145 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 16145-submit@debbugs.gnu.org id=B16145.141250816131024 (code B ref 16145); Sun, 05 Oct 2014 11:23:02 +0000 Original-Received: (at 16145) by debbugs.gnu.org; 5 Oct 2014 11:22:41 +0000 Original-Received: from localhost ([127.0.0.1]:33500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xajtg-00084I-On for submit@debbugs.gnu.org; Sun, 05 Oct 2014 07:22:41 -0400 Original-Received: from fely.am-1.org ([78.47.74.50]:35158) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xajtb-00083y-W0; Sun, 05 Oct 2014 07:22:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:Sender:References:Subject:To:From; bh=xs7lW7tVMVvzZoaycEGW6SA/5TX6RDIyRfruMb0tLw8=; b=mUCGU8ej3o34lIDZVBceTkoKu66Uazy2lTWwzX+qCfuMXuCTlP0w4aDujWjkrXW1tzl4pbMCNfkjXI2mUISf6cNe70ShdR0erhR/INMLSeY5ZHNffX0VuzqHJugv1oGbvyhb78dizNAkY67AuHdU9qjJWvrrHcs07nBERwEihUY=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xajta-0006O0-CH; Sun, 05 Oct 2014 11:22:34 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XajtS-000182-JU; Sun, 05 Oct 2014 18:22:26 +0700 In-Reply-To: <87sitvxzl4.fsf@violet.siamics.net> (Ivan Shmakov's message of "Sat, 14 Dec 2013 14:43:35 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) 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:94155 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable tag 16145 + patch thanks I hereby suggest the patch MIMEd. (In the same spirit as the one for Bug#18599.) 2014-10-05 Ivan Shmakov * erc.el (erc-initialize-log-marker): Only initialize erc-last-saved-position if not already a marker. (Closes #16145.) --=20 FSF associate member #7257 http://boycottsystemd.org/ =E2=80=A6 3013 B6A0= 230E 334A --=-=-= Content-Type: text/plain Content-Disposition: inline --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2052,9 +2052,10 @@ defun erc-initialize-log-marker (buffer) "Initialize the `erc-last-saved-position' marker to a sensible position. BUFFER is the current buffer." (with-current-buffer buffer - (setq erc-last-saved-position (make-marker)) - (move-marker erc-last-saved-position - (1- (marker-position erc-insert-marker))))) + (unless (markerp erc-last-saved-position) + (setq erc-last-saved-position (make-marker)) + (move-marker erc-last-saved-position + (1- (marker-position erc-insert-marker)))))) ;; interactive startup --=-=-=--