From: npostavs@users.sourceforge.net
To: "João Távora" <joaotavora@gmail.com>
Cc: 24901@debbugs.gnu.org, Reuben Thomas <rrt@sc3d.org>
Subject: bug#24901: Caught mistake in elec-pair.el patch
Date: Thu, 17 Aug 2017 08:35:39 -0400 [thread overview]
Message-ID: <871soaz810.fsf@users.sourceforge.net> (raw)
In-Reply-To: <CALDnm51psEGj_+_zAsSeAFgBtk1kri6wr=-f9DvuwV0YOw80cw@mail.gmail.com> ("João Távora"'s message of "Thu, 17 Aug 2017 11:32:10 +0100")
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
João Távora <joaotavora@gmail.com> writes:
> Turns out it's not so simple, because electric-pair-text-pairs is autoloaded
> and thus relying on electric-quote-chars is a problem.
>
> Loading loaddefs.el (source)...
> Symbol's value as variable is void: electric-quote-chars
> Makefile:535: recipe for target 'emacs' failed
>
> I could:
>
> 1. Add an autoload to electric-quote-chars. (Unfortunately I seem to fail at that,
> just adding the cookie isn't enough, it has to go into ldefs-boot.el somehow).
Or remove the autoload from electric-pair-text-pairs?
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 1885 bytes --]
From 57a68d001c0851ce10b1b8be47bc8db12b7789f1 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Thu, 17 Aug 2017 07:06:47 -0400
Subject: [PATCH] * lisp/elec-pair.el (electric-pair-text-pairs): Don't
autoload (Bug#24901).
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode): Require `elec-pair'
explicitly in the interactive case.
---
lisp/elec-pair.el | 1 -
lisp/progmodes/elisp-mode.el | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 87e82e24fb..f990851185 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -42,7 +42,6 @@ electric-pair-pairs
:group 'electricity
:type '(repeat (cons character character)))
-;;;###autoload
(defcustom electric-pair-text-pairs
'((?\" . ?\" )
((nth 0 electric-quote-chars) . (nth 1 electric-quote-chars))
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 47739f5957..0bf8857960 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -231,9 +231,12 @@ emacs-lisp-mode
(defvar project-vc-external-roots-function)
(lisp-mode-variables nil nil 'elisp)
(add-hook 'after-load-functions #'elisp--font-lock-flush-elisp-buffers)
- (setq-local electric-pair-text-pairs
- (append '((?\` . ?\') (?‘ . ?’)) electric-pair-text-pairs))
- (setq-local electric-quote-string t)
+ (unless noninteractive
+ (require 'elec-pair)
+ (defvar electric-pair-text-pairs)
+ (setq-local electric-pair-text-pairs
+ (append '((?\` . ?\') (?‘ . ?’)) electric-pair-text-pairs))
+ (setq-local electric-quote-string t))
(setq imenu-case-fold-search nil)
(add-function :before-until (local 'eldoc-documentation-function)
#'elisp-eldoc-documentation-function)
--
2.14.1
next prev parent reply other threads:[~2017-08-17 12:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CALDnm513tFORnxwH7a_hn7Birk-s7z44ftxO2uitMM7Rb2dQKA@mail.gmail.com>
2017-08-13 11:03 ` bug#24901: Fwd: Caught mistake in elec-pair.el patch João Távora
[not found] ` <CAOnWdojZmNrAN1ioAPk_YTik0LU-qz26SrA3pmocJznuB-Bd4A@mail.gmail.com>
2017-08-17 10:32 ` bug#24901: " João Távora
2017-08-17 12:35 ` npostavs [this message]
2017-08-17 13:32 ` João Távora
2017-08-17 14:05 ` Noam Postavsky
2017-08-17 14:23 ` Eli Zaretskii
2017-08-17 15:36 ` João Távora
2017-08-17 15:49 ` Noam Postavsky
2017-08-17 16:57 ` João Távora
2017-08-18 1:51 ` npostavs
2017-08-18 19:21 ` Reuben Thomas
2017-08-18 22:46 ` João Távora
2017-08-19 0:41 ` Noam Postavsky
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871soaz810.fsf@users.sourceforge.net \
--to=npostavs@users.sourceforge.net \
--cc=24901@debbugs.gnu.org \
--cc=joaotavora@gmail.com \
--cc=rrt@sc3d.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.