From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#19102: 24.4; outline-move-subtree-up/down error at last and second-last subtree Date: Tue, 25 Nov 2014 21:43:02 -0500 Message-ID: References: <87lhn7s522.fsf@rosalinde.fritz.box> <83lhn789tq.fsf@gnu.org> <87h9xvruan.fsf@rosalinde.fritz.box> <83tx1v6mur.fsf@gnu.org> <87a93nrlql.fsf@rosalinde.fritz.box> <83lhn76iex.fsf@gnu.org> <8761easv3s.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416969870 19893 80.91.229.3 (26 Nov 2014 02:44:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2014 02:44:30 +0000 (UTC) Cc: paul@tilk.co, 19102@debbugs.gnu.org To: Stephen Berman Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 26 03:44:22 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 1XtSaa-00022D-Sk for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Nov 2014 03:44:21 +0100 Original-Received: from localhost ([::1]:60244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtSaa-0004u7-HC for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Nov 2014 21:44:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtSaQ-0004tm-Aq for bug-gnu-emacs@gnu.org; Tue, 25 Nov 2014 21:44:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtSaI-0004eN-Pt for bug-gnu-emacs@gnu.org; Tue, 25 Nov 2014 21:44:10 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtSaI-0004eJ-Mz for bug-gnu-emacs@gnu.org; Tue, 25 Nov 2014 21:44:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XtSaI-00019o-AQ for bug-gnu-emacs@gnu.org; Tue, 25 Nov 2014 21:44:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 Nov 2014 02:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19102 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19102-submit@debbugs.gnu.org id=B19102.14169697874367 (code B ref 19102); Wed, 26 Nov 2014 02:44:02 +0000 Original-Received: (at 19102) by debbugs.gnu.org; 26 Nov 2014 02:43:07 +0000 Original-Received: from localhost ([127.0.0.1]:45457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XtSZO-00018N-Pp for submit@debbugs.gnu.org; Tue, 25 Nov 2014 21:43:07 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:43860) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XtSZM-00018E-8h for 19102@debbugs.gnu.org; Tue, 25 Nov 2014 21:43:04 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sAQ2h2DR025301; Tue, 25 Nov 2014 21:43:03 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id AE5CD653E; Tue, 25 Nov 2014 21:43:02 -0500 (EST) In-Reply-To: <8761easv3s.fsf@rosalinde.fritz.box> (Stephen Berman's message of "Wed, 19 Nov 2014 23:07:03 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5136=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5136> : inlines <1561> : streams <1348711> : uri <1836156> 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:96590 Archived-At: > + (maybe-forward-char (lambda () > + (and (eobp) (not (bolp)) (newline)) > + (and (eolp) (not (bolp)) (forward-char 1)))) If we add a newline, we know don't want to do a `forward-char'. So: (if (and (eobp) (not (bolp))) (newline) (and (eolp) (not (bolp)) (forward-char 1))))) Also, I don't understand the (not (bolp)) test in the second line: the code it replaces only tested (= (char-after) ?\n). So I think it'd be better to use: (if (and (eobp) (not (bolp))) (newline) (if (eq (char-after) ?\n) (forward-char 1))))) And to be closer to the original code, I'd swap the two tests. And I'd use `insert' rather than `newline' since I don't want to run abbrev expansions and things like that. (if (eq (char-after) ?\n) (forward-char 1) (if (and (eobp) (not (bolp))) (insert "\n"))))) > + (empty-last-line (save-excursion > + (goto-char (point-max)) > + (and (bolp) (eolp)))) At point-max, we know that (eolp) is non-nil, so you can just write (empty-last-line (save-excursion (goto-char (point-max)) (bolp)))) > - (error "Cannot move past superior level"))) > + (with-demoted-errors "%s" > + (message "Cannot move past superior level")))) This is wrong. Did you mean maybe to replace `error' with `user-error' instead, maybe? > + ;; If we added a newline to move forward, delete it. > + (save-excursion > + (goto-char (point-max)) > + (when (and (bolp) (eolp) (not empty-last-line)) > + (delete-char -1))))) Let's not bother. There's no harm in adding a missing final newline when we modify such a line-oriented file. Stefan