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

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

[Dmitry Gutov]

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'.

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

[Sam Steingold]

> * Dmitry Gutov <qthgbi@lnaqrk.eh> [2014-12-23 19:20:58 +0200]:
>
> This looks like a bad merge.

sorry, should be fixed.
I have no idea how this could have happened.

>
> 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'.
>

-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://memri.org http://islamexposedonline.com
http://jihadwatch.org http://americancensorship.org http://iris.org.il
Don't use force -- get a bigger hammer.

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

[Stefan Monnier]

>     * lisp/shell.el (shell-display-buffer-actions): New user option.

How is this different from using, say,

   (add-to-list 'display-buffer-alist
                '("\\*shell\\*" <shell-display-buffer-actions>))

The whole idea of display-buffer-alist was to group all those options
instead of having every package that calls display-buffer invent its own
config var.


        Stefan

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

[Stefan Monnier]

Ping?


        Stefan


>>>>> "Stefan" == Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> * lisp/shell.el (shell-display-buffer-actions): New user option.
> How is this different from using, say,

>    (add-to-list 'display-buffer-alist
>                 '("\\*shell\\*" <shell-display-buffer-actions>))

> The whole idea of display-buffer-alist was to group all those options
> instead of having every package that calls display-buffer invent its own
> config var.


>         Stefan

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

[Sam Steingold]

> * Stefan Monnier <zbaavre@veb.hzbagerny.pn> [2014-12-27 23:06:26 -0500]:
>
>>     * lisp/shell.el (shell-display-buffer-actions): New user option.
>
> How is this different from using, say,
>
>    (add-to-list 'display-buffer-alist
>                 '("\\*shell\\*" <shell-display-buffer-actions>))
>
> The whole idea of display-buffer-alist was to group all those options
> instead of having every package that calls display-buffer invent its
> own config var.

I forgot (or, maybe, never knew) about `display-buffer-alist'.
Sorry.
Would you like me to remove `shell-display-buffer-actions'?

-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://americancensorship.org http://think-israel.org
http://www.memritv.org http://mideasttruth.com http://honestreporting.com
Bill Gates is not god and Microsoft is not heaven.

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

[Stefan Monnier]

> Would you like me to remove `shell-display-buffer-actions'?

If it can be replaced by

    (add-to-list 'display-buffer-alist
                 '("\\*shell\\*" <shell-display-buffer-actions>))

then, yes, I think it's better to remove it.  Thank you.


        Stefan