summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-12-06 18:07:27 +0100
committerAndrea Corallo <akrl@sdf.org>2020-12-06 18:07:27 +0100
commit715a1ca1744f9a5918376bf7662c81302f0b20c0 (patch)
treee6ea1ac67e88ead92df65087d3f41b8e544f5e86 /lisp/emacs-lisp/lisp-mode.el
parent27f666e111a34d64de81a214024e1e30928b416e (diff)
parent40e11743ca3803bdc2c6c612f35ab695efb3eb8b (diff)
downloademacs-715a1ca1744f9a5918376bf7662c81302f0b20c0.tar.gz
emacs-715a1ca1744f9a5918376bf7662c81302f0b20c0.tar.bz2
emacs-715a1ca1744f9a5918376bf7662c81302f0b20c0.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index cc40af7a41c..081ef8d441a 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -634,7 +634,7 @@ font-lock keywords will not be case sensitive."
;; and should make no difference for explicit fill
;; because lisp-fill-paragraph should do the job.
;; I believe that newcomment's auto-fill code properly deals with it -stef
- ;;(set (make-local-variable 'adaptive-fill-mode) nil)
+ ;;(setq-local adaptive-fill-mode nil)
(setq-local indent-line-function 'lisp-indent-line)
(setq-local indent-region-function 'lisp-indent-region)
(setq-local comment-indent-function #'lisp-comment-indent)