From: Stephen Berman <stephen.berman@gmx.net>
To: 20895@debbugs.gnu.org
Subject: bug#20895: [patch] lexical binding broke part of sgml-mode.el
Date: Thu, 25 Jun 2015 12:42:35 +0200 [thread overview]
Message-ID: <87mvzoax2c.fsf@gmx.net> (raw)
The following change broke some functionality in sgml-mode.el:
commit 84e0b7dad6f1a8e53261f9b96f5a9080fea681a4
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Apr 13 15:51:15 2015 -0400
[...]
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
To see the bug, visit an (X)HTML file and insert a tag (`C-c C-t') that
takes an attribute, such `p' or `a'.
The following patch fixes the problems I have encountered, but I'm not
sure if further adjustments are needed, so I'll defer to whoever knows
the code better about whether to commit it as is.
2015-06-25 Stephen Berman <stephen.berman@gmx.net>
* sgml-mode.el (sgml-attributes, sgml-value): Make them work with
lexical binding.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 2ffe9c1..dbb9662 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -759,9 +759,9 @@ If QUIET, do not print a message when there are no attributes for TAG."
(insert ?\s)
(insert (funcall skeleton-transformation-function
(setq attribute
- (skeleton-read '(completing-read
+ (skeleton-read `(completing-read
"Attribute: "
- alist)))))
+ ',alist)))))
(if (string= "" attribute)
(setq i 0)
(sgml-value (assoc (downcase attribute) alist))
@@ -1177,13 +1177,13 @@ See `sgml-tag-alist' for info about attribute rules."
(if (and (eq (car alist) t) (not sgml-xml-mode))
(when (cdr alist)
(insert "=\"")
- (setq alist (skeleton-read '(completing-read "Value: " (cdr alist))))
+ (setq alist (skeleton-read `(completing-read "Value: " (cdr ',alist))))
(if (string< "" alist)
(insert alist ?\")
(delete-char -2)))
(insert "=\"")
(if (cdr alist)
- (insert (skeleton-read '(completing-read "Value: " alist)))
+ (insert (skeleton-read `(completing-read "Value: " ',alist)))
(when (null alist)
(insert (skeleton-read '(read-string "Value: ")))))
(insert ?\"))))
next reply other threads:[~2015-06-25 10:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 10:42 Stephen Berman [this message]
2015-06-25 13:03 ` bug#20895: [patch] lexical binding broke part of sgml-mode.el Dmitry Gutov
2015-06-25 13:27 ` Stephen Berman
2015-06-25 14:47 ` Dmitry Gutov
2015-06-25 19:28 ` Stephen Berman
2015-06-25 19:44 ` Eli Zaretskii
2015-06-25 14:34 ` Eli Zaretskii
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=87mvzoax2c.fsf@gmx.net \
--to=stephen.berman@gmx.net \
--cc=20895@debbugs.gnu.org \
/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).