emacs-diffs
[Top][All Lists]
Advanced

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

master 12cbe8e 09/11: ; Revert "Make `so-long' restore `view-mode'"


From: Phil Sainty
Subject: master 12cbe8e 09/11: ; Revert "Make `so-long' restore `view-mode'"
Date: Tue, 3 Aug 2021 07:44:27 -0400 (EDT)

branch: master
commit 12cbe8e50977fdbd342b9767e4e8bbd7430d3231
Author: Phil Sainty <psainty@orcon.net.nz>
Commit: Phil Sainty <psainty@orcon.net.nz>

    ; Revert "Make `so-long' restore `view-mode'"
    
    This reverts commit 3c2db0c541491fceb7081d5b54de5abec25e2f4b.
    
    A more general solution to bug#45084 has been implemented via
    new user options `so-long-mode-preserved-variables' and
    `so-long-mode-preserved-minor-modes'.
    
    See the previous commit (before this revert) for details.
---
 lisp/so-long.el | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lisp/so-long.el b/lisp/so-long.el
index a74a920..5b7086d 100644
--- a/lisp/so-long.el
+++ b/lisp/so-long.el
@@ -1758,8 +1758,7 @@ invoking the new action."
     (when so-long--active
       (so-long-revert))
     ;; Invoke the new action.
-    (let ((so-long--calling t)
-          (view-mode-active view-mode))
+    (let ((so-long--calling t))
       (so-long--ensure-enabled)
       ;; ACTION takes precedence if supplied.
       (when action
@@ -1788,10 +1787,7 @@ invoking the new action."
       ;; functions need to modify the buffer.  We use `inhibit-read-only' to
       ;; side-step the issue (and likewise in `so-long-revert').
       (let ((inhibit-read-only t))
-        (run-hooks 'so-long-hook))
-      ;; Restore `view-mode'.
-      (when view-mode-active
-        (view-mode)))))
+        (run-hooks 'so-long-hook)))))
 
 (defun so-long-revert ()
   "Revert the active `so-long-action' and run `so-long-revert-hook'.



reply via email to

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