[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115774: * lisp/emacs-lisp/lisp-mode.el (lisp-mode-v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r115774: * lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap. |
Date: |
Fri, 27 Dec 2013 20:24:33 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115774
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-27 12:24:25 -0800
message:
* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emacs-lisp/lisp-mode.el lispmode.el-20091113204419-o5vbwnq5f7feedwu-205
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-27 15:43:54 +0000
+++ b/lisp/ChangeLog 2013-12-27 20:24:25 +0000
@@ -1,3 +1,7 @@
+2013-12-27 Glenn Morris <address@hidden>
+
+ * emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.
+
2013-12-27 Lars Ingebrigtsen <address@hidden>
* net/shr.el (shr-insert): Don't infloop if the width is zero.
=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el 2013-12-26 22:02:49 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el 2013-12-27 20:24:25 +0000
@@ -474,9 +474,10 @@
. 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115774: * lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.,
Glenn Morris <=