unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Zhiwei Chen <chenzhiwei03@kuaishou.com>
To: "47279@debbugs.gnu.org" <47279@debbugs.gnu.org>
Cc: "condy0919@gmail.com" <condy0919@gmail.com>
Subject: bug#47279: 28.0.50; hideif wrong-type-argument in org src block
Date: Sun, 21 Mar 2021 03:25:50 +0000	[thread overview]
Message-ID: <B82E0868-0956-4FD9-949A-E3FB02D864A3@kuaishou.com> (raw)
In-Reply-To: <87im5maxnm.fsf@gmail.com>


[-- Attachment #1.1: Type: text/plain, Size: 42 bytes --]

a trivial patch


--
Zhiwei Chen



[-- Attachment #1.2: Type: text/html, Size: 1040 bytes --]

[-- Attachment #2: 0001-Fix-hide-if-wrong-type-argument-in-org-src-block-bug.patch --]
[-- Type: application/octet-stream, Size: 1297 bytes --]

From b28ba5a8bda62b0effc05a49f6edd42dfc1db9f1 Mon Sep 17 00:00:00 2001
From: Zhiwei Chen <chenzhiwei03@kuaishou.com>
Date: Sun, 21 Mar 2021 11:16:57 +0800
Subject: [PATCH] Fix hide-if wrong-type-argument in org src block bug#47279

---
 lisp/progmodes/hideif.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 923f85fd4d..bd18f49df8 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -1743,12 +1743,13 @@ hif-add-new-defines
 (defun hide-ifdef-guts ()
   "Does most of the work of `hide-ifdefs'.
 It does not do the work that's pointless to redo on a recursive entry."
-  ;; (message "hide-ifdef-guts")
   (save-excursion
     (let* ((case-fold-search t) ; Ignore case for `hide-ifdef-header-regexp'
+           (buf-name (buffer-file-name))
            (expand-header (and hide-ifdef-expand-reinclusion-protection
+                               buf-name
                                (string-match hide-ifdef-header-regexp
-                                             (buffer-file-name))
+                                             buf-name)
                                (zerop hif-recurse-level)))
            (case-fold-search nil)
            min max)
-- 
2.24.3 (Apple Git-128)


  reply	other threads:[~2021-03-21  3:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-20 11:10 bug#47279: 28.0.50; hideif wrong-type-argument in org src block Zhiwei Chen
2021-03-21  3:25 ` Zhiwei Chen [this message]
2021-03-21  7:09   ` Lars Ingebrigtsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=B82E0868-0956-4FD9-949A-E3FB02D864A3@kuaishou.com \
    --to=chenzhiwei03@kuaishou.com \
    --cc=47279@debbugs.gnu.org \
    --cc=condy0919@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).