Re: [Emacs-diffs] master e55a467: Use a new user option instead of hard-coding shell display.

[Dmitry Gutov <dgutov@yandex.ru>]

This looks like a bad merge.

On 12/23/2014 06:44 PM, Sam Steingold wrote:

> diff --git a/lisp/ChangeLog b/lisp/ChangeLog
> index 12430b6..b7c4596 100644
> --- a/lisp/ChangeLog
> +++ b/lisp/ChangeLog
> @@ -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'.