Re: [lyx/refs/heads/master] Merge branch 'master' of git.lyx.org:lyx

2012-04-29 Thread Jürgen Spitzmüller
2012/4/29 Vincent van Ravesteijn: > You can't undo this. > > You had local commits on master, and then you fetched the new commits from > the server. Now there are two ways of merging the local changes and the > changes from the server. Either you do a regular merge, or you can rebase > your local

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-04-29 Thread Ronen Abravanel
This will also require many instructions/ definition change, but it will be simpler change. Ronen On Sun, Apr 29, 2012 at 6:02 PM, Jean-Marc Lasgouttes wrote: > Le 29/04/12 16:55, Ronen Abravanel a écrit : > > Presumably, the "orginal" (prior to 2.02) behavior is a bug. But it's >> very usable

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-04-29 Thread Jean-Marc Lasgouttes
Le 29/04/12 16:55, Ronen Abravanel a écrit : Presumably, the "orginal" (prior to 2.02) behavior is a bug. But it's very usable bug. Specifically, all the "how to use LyX in Hebrew" manuals on the Internet (and there are many of these) use it, and will have to change. So, it will make sense to u

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-04-29 Thread Ronen Abravanel
Presumably, the "orginal" (prior to 2.02) behavior is a bug. But it's very usable bug. Specifically, all the "how to use LyX in Hebrew" manuals on the Internet (and there are many of these) use it, and will have to change. So, it will make sense to use the toggle-method, but it will annoy many pe

Re: [lyx/refs/heads/master] Reset the (running) change in PainterInfo

2012-04-29 Thread Richard Heck
On 04/29/2012 09:00 AM, v...@lyx.org wrote: Author: Vincent van Ravesteijn Date: Sun, 29 Apr 2012 13:44:58 +0200 New Commit: af4e31ec28c71815ca07bebd6e5c3893535f4bf8 URL: http://git.lyx.org/?p=lyx.git;a=commit;h=af4e31ec28c71815ca07bebd6e5c3893535f4bf8 Log: Reset the (running) change in Painter

Re: [lyx/refs/heads/master] BufferView::dispatch(): add a missing break

2012-04-29 Thread Richard Heck
On 04/29/2012 09:00 AM, v...@lyx.org wrote: Author: Vincent van Ravesteijn Date: Sun, 15 Apr 2012 20:28:09 +0200 New Commit: 3a395ca0f57ded024031c501ffe636ee38f1e248 URL: http://git.lyx.org/?p=lyx.git;a=commit;h=3a395ca0f57ded024031c501ffe636ee38f1e248 Log: BufferView::dispatch(): add a missing

Re: [lyx/refs/heads/master] Do not show deleted text in the html title

2012-04-29 Thread Richard Heck
On 04/29/2012 09:00 AM, v...@lyx.org wrote: Author: Vincent van Ravesteijn Date: Thu, 26 Apr 2012 16:29:58 +0200 New Commit: 77c8c159470d4d6cd7c433523a0581a3fdcd0f94 URL: http://git.lyx.org/?p=lyx.git;a=commit;h=77c8c159470d4d6cd7c433523a0581a3fdcd0f94 Log: Do not show deleted text in the html

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-04-29 Thread Stephan Witt
Am 29.04.2012 um 14:13 schrieb Vincent van Ravesteijn: > Op 29-4-2012 11:29, Stephan Witt schreef: >> This patch restores the font toggle feature if there is no selection. >> I looked into this and it is that way: >> >> Given one invokes the LFUN_LANGUAGE with a value different from current one

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-04-29 Thread Vincent van Ravesteijn
Op 29-4-2012 11:29, Stephan Witt schreef: This patch restores the font toggle feature if there is no selection. I looked into this and it is that way: Given one invokes the LFUN_LANGUAGE with a value different from current one at current position. Then the language is changed to the new value.

Re: [lyx/refs/heads/master] Merge branch 'master' of git.lyx.org:lyx

2012-04-29 Thread Vincent van Ravesteijn
Op 29-4-2012 12:08, Jürgen Spitzmüller schreef: Author: Jürgen Spitzmüller Date: Sun, 29 Apr 2012 11:51:07 +0200 New Commit: 8995a8387a03361b6a7ff44b447a90a6187b1a14 URL: http://git.lyx.org/?p=lyx.git;a=commit;h=8995a8387a03361b6a7ff44b447a90a6187b1a14 Log: Merge branch 'master' of git.lyx.org:

Re: [lyx/refs/heads/master] Merge branch 'master' of git.lyx.org:lyx

2012-04-29 Thread Jürgen Spitzmüller
> Author: Jürgen Spitzmüller > Date: Sun, 29 Apr 2012 11:51:07 +0200 > New Commit: 8995a8387a03361b6a7ff44b447a90a6187b1a14 > URL: > http://git.lyx.org/?p=lyx.git;a=commit;h=8995a8387a03361b6a7ff44b447a90a6187b1a14 > > Log: > Merge branch 'master' of git.lyx.org:lyx > > Conflicts: >        po/de.

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-04-29 Thread Stephan Witt
Am 27.04.2012 um 19:10 schrieb Stephan Witt: > Am 27.04.2012 um 17:33 schrieb Ronen Abravanel: > >> And a patch that perform my suggestion is attachted. >> >> Ronen Abravanel >> >> >> >> On Fri, Apr 27, 2012 at 6:04 PM, Ronen Abravanel wrote: >> It seems the change was done in order to fix: