From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dario Gjorgjevski Newsgroups: gmane.emacs.bugs Subject: bug#36095: [PATCH] Do not use syntax-ppss-table in syntax-propertize when nil Date: Wed, 05 Jun 2019 11:15:48 +0200 Message-ID: <87a7ew1jgb.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="142147"; mail-complaints-to="usenet@blaine.gmane.org" To: 36095@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 05 11:17:33 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hYS33-000at0-47 for geb-bug-gnu-emacs@m.gmane.org; Wed, 05 Jun 2019 11:17:33 +0200 Original-Received: from localhost ([127.0.0.1]:38103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYS32-0008Tr-4P for geb-bug-gnu-emacs@m.gmane.org; Wed, 05 Jun 2019 05:17:32 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:58798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYS2Z-0008FZ-TV for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2019 05:17:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYS2Y-0008UY-NN for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2019 05:17:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:32912) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYS2Y-0008Tn-DS for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2019 05:17:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hYS2Y-0000GH-70 for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2019 05:17:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dario Gjorgjevski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 05 Jun 2019 09:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36095 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.1559726167904 (code B ref -1); Wed, 05 Jun 2019 09:17:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Jun 2019 09:16:07 +0000 Original-Received: from localhost ([127.0.0.1]:46453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hYS1f-0000EQ-6O for submit@debbugs.gnu.org; Wed, 05 Jun 2019 05:16:07 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:44039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hYS1c-0000DY-O3 for submit@debbugs.gnu.org; Wed, 05 Jun 2019 05:16:05 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:60883) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYS1X-0006OU-Km for submit@debbugs.gnu.org; Wed, 05 Jun 2019 05:15:59 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:58419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYS1W-0007Io-Ct for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2019 05:15:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYS1V-0006Ln-EO for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2019 05:15:58 -0400 Original-Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYS1V-0006ED-5Z for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2019 05:15:57 -0400 Original-Received: by mail-wr1-x430.google.com with SMTP id x4so18670266wrt.6 for ; Wed, 05 Jun 2019 02:15:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=s037AmDoKajK3Uj4G1zy/ZNxLVGphM7nX4arTnQ3xsM=; b=ORITzpz1WcVF3EcyV+pbc7vCs04i0uuXYPQqSO7qQejU7q9PKX8FexqbRIGGUDA4Xy +2M1whjhibXMmEP0qHWjOl+exXC2IYc1Yr1TGjSqCeD3BcpquCVUmkcp8L2ceRoOsa4F z9uerl4STqLMDyoZ0J465eD8PnMkdjN1TRQo0EvXsDSQDTRv8QRTRl7YEvGCKUuj754P o0cU2C5IUKJ0KiWlwipgCXSQmJmADB84qrMACfqvLY4/hKNR53/uZ1gguxHc+LUE0/r2 gpYjLRAdcVzS44S/4D1KJcpHjQUZBEHtTX6AexucJZcuX6ly0uDXWnCay0YpMzYjfDKp r/+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=s037AmDoKajK3Uj4G1zy/ZNxLVGphM7nX4arTnQ3xsM=; b=TwHofs2Rx/mn3UMAhZuE6udpoxzxcnMIOpmD8saYG2TF/88PgdbcfWpG4b/h6XeH6M Q9QlBwQVx9vK+0nyH1MSNBMTYYa5J1MfX6jACn4Hx9hI6R7EER+nkLO7PtI8uGF3EJlt v3UKCzXTurEmLLVGnhftA2xlx3CwTUnTghZXFwbgXIGtE/napi6HM9HZZMDm3Eg/TcWX 2qtL3IoUeL/YyhRCwShZ+FpbTXYr45/Y3hC6zQqLE6Jwv9o+Xy5ufrH/3Ut1TGIqfIqH uZk4pp+jxiGhoS3zR74Y3uapqILiA5whtei0MC03VJW0wqNJeOnkd99GUALATPZH+Vb0 lOOg== X-Gm-Message-State: APjAAAXaOeIkMRpYBu3vFq6QF6Q6xIPZK/FrcXNRmyqLegG8m7aPQ12r u1APMYgKoMK5jEiBsKoRMxJmYVWEZho= X-Google-Smtp-Source: APXvYqxt71wtg1V+DwWN0LJmgUsX33iVVBkkxvz8oLRaupgwZCMHhZMhyjm58aer6g+khcvpUizXpg== X-Received: by 2002:adf:aa09:: with SMTP id p9mr3085542wrd.59.1559726150945; Wed, 05 Jun 2019 02:15:50 -0700 (PDT) Original-Received: from dario-XPS-13-9370 (p4FE1B137.dip0.t-ipconnect.de. [79.225.177.55]) by smtp.gmail.com with ESMTPSA id z193sm28163891wmc.20.2019.06.05.02.15.49 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 05 Jun 2019 02:15:50 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 209.51.188.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:160140 Archived-At: --=-=-= Content-Type: text/plain Commit 0b3982b1a3 changed syntax-propertize to use syntax-ppss-table explicitly, similarly to syntax-ppss. However, it also attempts to do this when syntax-ppss-table is nil, resulting in an error. This patch fixes that. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Do-not-use-syntax-ppss-table-in-syntax-propertize-wh.patch Content-Description: Do not use syntax-ppss-table in syntax-propertize when nil >From bfa012db3b137262cbdfff827c3b8d367750e0ab Mon Sep 17 00:00:00 2001 From: Dario Gjorgjevski Date: Wed, 5 Jun 2019 11:07:49 +0200 Subject: [PATCH] Do not use syntax-ppss-table in syntax-propertize when nil * lisp/emacs-lisp/syntax.el (syntax-propertize): Use (syntax-table) instead of syntax-ppss-table when the latter is nil. --- lisp/emacs-lisp/syntax.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index 1aec1988ab..60ed531e63 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -304,7 +304,7 @@ syntax-propertize #'syntax-ppss-flush-cache 99 t)) (save-excursion (with-silent-modifications - (with-syntax-table syntax-ppss-table + (with-syntax-table (or syntax-ppss-table (syntax-table)) (make-local-variable 'syntax-propertize--done) ;Just in case! (let* ((start (max (min syntax-propertize--done (point-max)) (point-min))) -- 2.20.1 --=-=-= Content-Type: text/plain -- Dario Gjorgjevski :: :: 744A 4F0B 4F1C 9371 :: +48 1525 8666837 --=-=-=--