procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.

Browse source
This commit is contained in:
Glenn Morris 2013-12-27 12:24:25 -08:00
parent 5eedd0b92d
commit b1797e3eeb
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-27 Glenn Morris <rgm@gnu.org>
* emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.
2013-12-27 Lars Ingebrigtsen <larsi@gnus.org>
* net/shr.el (shr-insert): Don't infloop if the width is zero.

7
lisp/emacs-lisp/lisp-mode.el
View file

@ -474,9 +474,10 @@ font-lock keywords will not be case sensitive."
. lisp-font-lock-syntactic-face-function)))
(setq-local prettify-symbols-alist lisp--prettify-symbols-alist)
;; electric
(when elisp
(setq-local electric-pair-text-pairs
(cons '(?\` . ?\') electric-pair-text-pairs)))
(and elisp
(boundp 'electric-pair-text-pairs)
(setq-local electric-pair-text-pairs
(cons '(?\` . ?\') electric-pair-text-pairs)))
(setq-local electric-pair-skip-whitespace 'chomp)
(setq-local electric-pair-open-newline-between-pairs nil))