* Re: [Emacs-diffs] master e55a467: Use a new user option instead of hard-coding shell display.
[not found] ` <E1Y3SZq-0008NY-3X@vcs.savannah.gnu.org>
@ 2014-12-23 17:20 ` Dmitry Gutov
2014-12-23 18:25 ` Sam Steingold
2014-12-28 4:06 ` Stefan Monnier
1 sibling, 1 reply; 6+ messages in thread
From: Dmitry Gutov @ 2014-12-23 17:20 UTC (permalink / raw)
To: emacs-devel, Sam Steingold
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'.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Emacs-diffs] master e55a467: Use a new user option instead of hard-coding shell display.
2014-12-23 17:20 ` [Emacs-diffs] master e55a467: Use a new user option instead of hard-coding shell display Dmitry Gutov
@ 2014-12-23 18:25 ` Sam Steingold
0 siblings, 0 replies; 6+ messages in thread
From: Sam Steingold @ 2014-12-23 18:25 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: emacs-devel
> * 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Emacs-diffs] master e55a467: Use a new user option instead of hard-coding shell display.
[not found] ` <E1Y3SZq-0008NY-3X@vcs.savannah.gnu.org>
2014-12-23 17:20 ` [Emacs-diffs] master e55a467: Use a new user option instead of hard-coding shell display Dmitry Gutov
@ 2014-12-28 4:06 ` Stefan Monnier
2015-01-04 3:24 ` Stefan Monnier
2015-01-06 16:25 ` Sam Steingold
1 sibling, 2 replies; 6+ messages in thread
From: Stefan Monnier @ 2014-12-28 4:06 UTC (permalink / raw)
To: emacs-devel; +Cc: Sam Steingold
> * 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-06 21:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20141223164454.32174.85774@vcs.savannah.gnu.org>
[not found] ` <E1Y3SZq-0008NY-3X@vcs.savannah.gnu.org>
2014-12-23 17:20 ` [Emacs-diffs] master e55a467: Use a new user option instead of hard-coding shell display Dmitry Gutov
2014-12-23 18:25 ` Sam Steingold
2014-12-28 4:06 ` Stefan Monnier
2015-01-04 3:24 ` Stefan Monnier
2015-01-06 16:25 ` Sam Steingold
2015-01-06 21:07 ` Stefan Monnier
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).