From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Merge in revno 100770 Date: Thu, 15 Jul 2010 19:38:54 +0300 Message-ID: <83r5j4g0o1.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1279212082 29128 80.91.229.12 (15 Jul 2010 16:41:22 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 15 Jul 2010 16:41:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 15 18:41:21 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OZRUq-0007yd-Gk for ged-emacs-devel@m.gmane.org; Thu, 15 Jul 2010 18:41:17 +0200 Original-Received: from localhost ([127.0.0.1]:53988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZRUj-0005gi-TE for ged-emacs-devel@m.gmane.org; Thu, 15 Jul 2010 12:41:09 -0400 Original-Received: from [140.186.70.92] (port=46740 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZRUd-0005fB-4V for emacs-devel@gnu.org; Thu, 15 Jul 2010 12:41:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZRUa-0008Et-S1 for emacs-devel@gnu.org; Thu, 15 Jul 2010 12:41:02 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:48751) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZRUa-0008Ej-Io for emacs-devel@gnu.org; Thu, 15 Jul 2010 12:41:00 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0L5L00F00Y9M5C00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 15 Jul 2010 19:40:51 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.120.144]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L5L00B56YC1SAC0@a-mtaout22.012.net.il>; Thu, 15 Jul 2010 19:40:50 +0300 (IDT) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:127377 Archived-At: This merge from the emacs-23 branch: 100770: Chong Yidong 2010-07-10 [merge] Merge changes from emacs-23 branch. somehow managed to revert changes I did in fringe.c for bidi-aware display of continuation bitmaps on the fringes (because obviously, there's no such code on the branch). Specifically, it was due to the merge of this bugfix commit on the branch: 99634.2.281: YAMAMOTO Mitsuharu 2010-07-05 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325). Do we know how could that happen? Was that some snafu during manual resolution of text conflicts, or a problem in Bazaar's automatic merges? For the record, the changes that were reverted are these, which were part of a merge-commit I did in revno 99950 on the trunk: === modified file 'src/fringe.c' --- src/fringe.c 2010-04-10 16:28:30 +0000 +++ src/fringe.c 2010-04-17 12:33:05 +0000 @@ -1090,7 +1090,8 @@ update_window_fringes (w, keep_current_p : LEFT_FRINGE (2, Qtop, 0)); else if (row->indicate_eob_p && EQ (boundary_bot, Qleft)) left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p); - else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) + else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)) + || (row->reversed_p && row->continued_p)) left = LEFT_FRINGE (4, Qcontinuation, 0); else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) left = LEFT_FRINGE (5, Qempty_line, 0); @@ -1117,7 +1118,8 @@ update_window_fringes (w, keep_current_p : RIGHT_FRINGE (2, Qtop, 0)); else if (row->indicate_eob_p && EQ (boundary_bot, Qright)) right = RIGHT_FRINGE (3, Qbottom, row->ends_at_zv_p); - else if (row->continued_p) + else if ((!row->reversed_p && row->continued_p) + || (row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))) right = RIGHT_FRINGE (4, Qcontinuation, 0); else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) right = RIGHT_FRINGE (6, Qup, 0);