From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.bugs Subject: bug#24378: [PATCH] Remove obsolete comment from FETCH_MULTIBYTE_CHAR documentation Date: Tue, 6 Sep 2016 17:24:38 +0200 Message-ID: <1473175478-7858-1-git-send-email-mina86@mina86.com> References: <83poohay1n.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1473176054 23108 195.159.176.226 (6 Sep 2016 15:34:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 6 Sep 2016 15:34:14 +0000 (UTC) To: 24378@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Sep 06 17:34:10 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhIO0-0005Kj-TB for geb-bug-gnu-emacs@m.gmane.org; Tue, 06 Sep 2016 17:34:09 +0200 Original-Received: from localhost ([::1]:34429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhINy-00055k-Ne for geb-bug-gnu-emacs@m.gmane.org; Tue, 06 Sep 2016 11:34:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhIGF-0006tZ-5F for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 11:26:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhIGA-0003m6-F6 for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 11:26:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhIGA-0003m2-Bt for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 11:26:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bhIGA-0000Rn-5u for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 11:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 06 Sep 2016 15:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24378 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 24378-submit@debbugs.gnu.org id=B24378.14731755041636 (code B ref 24378); Tue, 06 Sep 2016 15:26:02 +0000 Original-Received: (at 24378) by debbugs.gnu.org; 6 Sep 2016 15:25:04 +0000 Original-Received: from localhost ([127.0.0.1]:51484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhIF8-0000Pt-4c for submit@debbugs.gnu.org; Tue, 06 Sep 2016 11:25:03 -0400 Original-Received: from mail-wm0-f50.google.com ([74.125.82.50]:38049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhIF1-0000Pd-1o for 24378@debbugs.gnu.org; Tue, 06 Sep 2016 11:24:56 -0400 Original-Received: by mail-wm0-f50.google.com with SMTP id 1so196580320wmz.1 for <24378@debbugs.gnu.org>; Tue, 06 Sep 2016 08:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GPqk0mZyTQAaP5sBIlGseEZrddApj160JKboPkgw04A=; b=c+AGNvHL1VL1r8zfwaC+m5IvubqLW8nZBSMM4fPPbQqpLHtAlD1rJSXNs6Gq3hLLWu fTWPgof4Z5AnChxUV9oZgEHKuPU9wJN68CykSiise4rUh3QWunzHvwFi1TXWhArLla5n IYQffGXwqcW5nTuW4ExFas31P/b9Gz1DrE4iR1XW4xXqKLH+1hDiQMZxbVeUv0SDvgk6 XqgjgcvNrSza4O1fc9N2/W7cymn8gvTybMrUMi/o0BxamoyTNfQAkUO7ubA1rKAZ/G05 dy0jqkpkZe662A4JwFVMr85A60h9oRj06d4tqwc7Tp8j3CL0HPzvQwtEwR8uI3hK9wCA RZlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GPqk0mZyTQAaP5sBIlGseEZrddApj160JKboPkgw04A=; b=mhdIu5t+mqLq5Tl/JY7uWZOsHuATU+WEYmhWRp2jUAMolin5VDWR+dJlVN1XZ2rp5L jhwWDgpUSPCfBlfQwHuVykWRoiwa/cvA682+ZNi7lrkQXyQHOIw4rgKccEEqxpEFWxWS ylzj+zFA8ViQKdBlHt/9uV/lxMzRDRVfHpR1ARuS/b/0Crl/C3oMywNvcTTxdhW1TcP8 TcboAthBxoa8YIW+I+DmL2LP3bj14nC61mXSrob1QmcFg+HMa5c2vz1dgKH6HttG1ndy zO7+a7ZzNbbFy7bdmP7HkQN1oxPveE6OBztrp+54Jx1V90DIZRisLK2ltnhOFUWQWW8r /ltw== X-Gm-Message-State: AE9vXwOrvD26i3ufzQHEY/bvt8wcd50uPQEt1xt2Euc30mHNZ+6zyn37bIAnKmmg/ZTEwKmO X-Received: by 10.28.198.130 with SMTP id w124mr3871903wmf.63.1473175485216; Tue, 06 Sep 2016 08:24:45 -0700 (PDT) Original-Received: from mpn.zrh.corp.google.com ([2620:0:105f:301:c096:945d:4464:fe41]) by smtp.gmail.com with ESMTPSA id ka5sm33217958wjb.7.2016.09.06.08.24.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2016 08:24:44 -0700 (PDT) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id CED9F1E0268; Tue, 6 Sep 2016 17:24:43 +0200 (CEST) X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <83poohay1n.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:123012 Archived-At: * src/buffer.h (FETCH_MULTIBYTE_CHAR): STRING_CHAR macro no longer unifies characters so the comment about byte-length changing is no longer accurate; remove it. While at it, change the function to use BYTE_POS_ADDR instead of open-coding it. --- src/buffer.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/buffer.h b/src/buffer.h index 87b7cee..fa4866e 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1182,23 +1182,12 @@ buffer_has_overlays (void) /* Return character code of multi-byte form at byte position POS. If POS doesn't point the head of valid multi-byte form, only the byte at - POS is returned. No range checking. - - WARNING: The character returned by this macro could be "unified" - inside STRING_CHAR, if the original character in the buffer belongs - to one of the Private Use Areas (PUAs) of codepoints that Emacs - uses to support non-unified CJK characters. If that happens, - CHAR_BYTES will return a value that is different from the length of - the original multibyte sequence stored in the buffer. Therefore, - do _not_ use FETCH_MULTIBYTE_CHAR if you need to advance through - the buffer to the next character after fetching this one. Instead, - use either FETCH_CHAR_ADVANCE or STRING_CHAR_AND_LENGTH. */ + POS is returned. No range checking. */ INLINE int FETCH_MULTIBYTE_CHAR (ptrdiff_t pos) { - unsigned char *p = ((pos >= GPT_BYTE ? GAP_SIZE : 0) - + pos + BEG_ADDR - BEG_BYTE); + unsigned char *p = BYTE_POS_ADDR (pos); return STRING_CHAR (p); } -- 2.8.0.rc3.226.g39d4020