Mark display-comint-buffer-action as obsolete after adding a category.

* lisp/window.el (display-comint-buffer-action):
Append '(category . comint)' to the default value.  Mark as obsolete.
(display-tex-shell-buffer-action):
Append '(category . tex-shell)' to the default value.  Mark as obsolete.
(bug#69983)

(cherry picked from commit 4e22ad8cef0710bf5ce3bf99deb8dd6e30d4078c)

diff --git a/etc/NEWS b/etc/NEWS
index ae9cd337c768122670402bbc9070f4d1aa46a369..80382ee623529d043bca42bd9b6938ba2c2cac60 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -288,6 +288,13 @@ by adding '(category . symbol)' to the condition part of
 It specifies whether the window of the displayed buffer should be
 selected or deselected at the end of executing the current command.
 
+---
+*** User option 'display-comint-buffer-action' is now obsolete.
+You can use a '(category . comint)' condition in 'display-buffer-alist'
+to match buffers displayed by comint-related commands.  Another
+user option 'display-tex-shell-buffer-action' is obsolete too
+for which you can use '(category . tex-shell)'.
+
 +++
 *** New variable 'window-restore-killed-buffer-windows'.
 It specifies how 'set-window-configuration' and 'window-state-put'

diff --git a/lisp/window.el b/lisp/window.el
index 27ed69f41c9badfe5cf215920bb79f72af3d7e6d..ee6085afa9fa4880c6c515f5eacd2e62f9d81307 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -8935,7 +8935,8 @@ currently selected window; otherwise it will be displayed in
 another window."
   (pop-to-buffer buffer display-buffer--same-window-action norecord))
 
-(defcustom display-comint-buffer-action display-buffer--same-window-action
+(defcustom display-comint-buffer-action
+  (append display-buffer--same-window-action '((category . comint)))
   "`display-buffer' action for displaying comint buffers."
   :type display-buffer--action-custom-type
   :risky t
@@ -8943,8 +8944,14 @@ another window."
   :group 'windows
   :group 'comint)
 
+(make-obsolete-variable
+ 'display-comint-buffer-action
+ "use a `(category . comint)' condition in `display-buffer-alist'."
+ "30.1")
+
 (defcustom display-tex-shell-buffer-action '(display-buffer-in-previous-window
-                                             (inhibit-same-window . t))
+                                             (inhibit-same-window . t)
+                                             (category . tex-shell))
   "`display-buffer' action for displaying TeX shell buffers."
   :type display-buffer--action-custom-type
   :risky t
@@ -8952,6 +8959,11 @@ another window."
   :group 'windows
   :group 'tex-run)
 
+(make-obsolete-variable
+ 'display-tex-shell-buffer-action
+ "use a `(category . tex-shell)' condition in `display-buffer-alist'."
+ "30.1")
+
 (defvar read-buffer-to-switch-current-buffer nil
   "Buffer that `read-buffer-to-switch' ignores as a completion candidate.