mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

Use a new user option instead of hard-coding shell display.

Browse Source 
* lisp/shell.el (shell-display-buffer-actions): New user option.
(shell): Pass it to `pop-to-buffer' instead of hard-coding
`pop-to-buffer-same-window'.
This commit is contained in:
Sam Steingold 2014-12-23 11:44:45 -05:00
parent 29c5e2cea2
commit e55a467ec0
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/ChangeLog
View File

@ -1,26 +1,8 @@
2014-12-23 Stefan Monnier <monnier@iro.umontreal.ca>
2014-12-23 Sam Steingold <sds@gnu.org>
* progmodes/js.el (js--syntax-propertize-regexp-syntax-table): New var.
(js-syntax-propertize-regexp): Use it to recognize "slash in
a character class" (bug#19397).
2014-12-22 Stefan Monnier <monnier@iro.umontreal.ca>
* completion.el: Use post-self-insert-hook (bug#19400).
(completion-separator-self-insert-command)
(completion-separator-self-insert-autofilling): Remove.
(completion-separator-chars): New var.
(completion-c-mode-hook, completion-setup-fortran-mode): Use it instead
of changing the keymap.
(completion--post-self-insert): New function.
(dynamic-completion-mode): Use it instead of rebinding keys.
(cmpl--completion-string): Rename from completion-string.
(add-completion-to-head, delete-completion): Let-bind it explicitly.
2014-12-22 Bozhidar Batsov <bozhidar@batsov.com>
* progmodes/ruby-mode.el (ruby--string-region): Simplify code
by leveraging `syntax-ppss'.
* shell.el (shell-display-buffer-actions): New user option.
(shell): Pass it to `pop-to-buffer' instead of hard-coding
`pop-to-buffer-same-window'.
2014-12-22 Artur Malabarba <bruce.connor.am@gmail.com>

9
lisp/shell.el
View File

@ -308,6 +308,13 @@ for Shell mode only."
(const :tag "on" t))
:group 'shell)
(defcustom shell-display-buffer-actions display-buffer-base-action
"The `display-buffer' actions for the `*shell*' buffer."
:type display-buffer--action-custom-type
:risky t
:version "25.1"
:group 'shell)
(defvar shell-dirstack nil
"List of directories saved by pushd in this buffer's shell.
Thus, this does not include the shell's current directory.")
@ -718,7 +725,7 @@ Otherwise, one argument `-i' is passed to the shell.
;; The buffer's window must be correctly set when we call comint (so
;; that comint sets the COLUMNS env var properly).
(pop-to-buffer-same-window buffer)
(pop-to-buffer buffer shell-display-buffer-actions)
(unless (comint-check-proc buffer)
(let* ((prog (or explicit-shell-file-name
(getenv "ESHELL") shell-file-name))