emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 65c90040eb0: Revert "Use 'emacs-lisp-compilation-mode' in native


From: Eli Zaretskii
Subject: master 65c90040eb0: Revert "Use 'emacs-lisp-compilation-mode' in native compilation buffers"
Date: Thu, 6 Jul 2023 11:01:17 -0400 (EDT)

branch: master
commit 65c90040eb08cd551120eda0e6647b59b25563d5
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Revert "Use 'emacs-lisp-compilation-mode' in native compilation buffers"
    
    This reverts commit 40492581f96626e405e4b453456b8c9b83822c97.
    It caused a recursive-load error when native-compiling files.
    (Bug#64391)
---
 lisp/emacs-lisp/comp.el | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 77584b692a4..22fb08e4688 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1133,8 +1133,7 @@ with `message'.  Otherwise, log with 
`comp-log-to-buffer'."
          (log-buffer
              (or (get-buffer comp-log-buffer-name)
                  (with-current-buffer (get-buffer-create comp-log-buffer-name)
-                   (unless (derived-mode-p 'compilation-mode)
-                     (emacs-lisp-compilation-mode))
+                   (setf buffer-read-only t)
                    (current-buffer))))
          (log-window (get-buffer-window log-buffer))
          (inhibit-read-only t)
@@ -4086,8 +4085,7 @@ display a message."
                              :buffer (with-current-buffer
                                          (get-buffer-create
                                           comp-async-buffer-name)
-                                       (unless (derived-mode-p 
'compilation-mode)
-                                         (emacs-lisp-compilation-mode))
+                                       (setf buffer-read-only t)
                                       (current-buffer))
                              :command (list
                                        (expand-file-name invocation-name
@@ -4121,8 +4119,6 @@ display a message."
     (run-hooks 'native-comp-async-all-done-hook)
     (with-current-buffer (get-buffer-create comp-async-buffer-name)
       (save-excursion
-        (unless (derived-mode-p 'compilation-mode)
-          (emacs-lisp-compilation-mode))
         (let ((inhibit-read-only t))
           (goto-char (point-max))
           (insert "Compilation finished.\n"))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]