headers
hap 497 | 1 Oct 2009 01:38
Picon

How to configure git diff tool to use emacs diff tool

Hi,

One can configure git merge tool to use vimdiff

$git config --global merge.tool vimdiff

How can I change it to use emacs diff? And is it possible to use
emacsclient for diff?
http://www.emacswiki.org/emacs/EmacsClient#toc1 (so that I can speed
things up by not launching a new emacs every time).

Thank you.
Permalink | Reply | 4 comments |
headers
Tim X | 1 Oct 2009 01:01

Re: font selection

Frédéric Boiteux <fboiteux <at> free.fr> writes:

> 	Hello,
>
>   I've recently shifted to Emacs23, and have some problems with font
> selection, until I remember it's set in X resources. Is it possible to select
> fonts from the init.el / custom.el specific Emacs config files ? it would be
> simpler from my POV…
>
>   Thanks for any tip about this, else full thanks to the emacs devs !
> 	Fred.
>
You can use the font selection option from the 'Options' menu. This
will provide a GTK font selection box and if, after selecting a font,
you save it, it will be saved into your .emacs file.

Tim
>
>
>

--

-- 
tcross (at) rapttech dot com dot au
Permalink | Reply | 0 comments |
headers
Tim X | 1 Oct 2009 01:07

Re: New config file

emacsuser <mekhala.acharya <at> bms.com> writes:

> Thank you so much guys. I finally got it to work with all your input.:-)
> Placing my config file in .emacs.d or  using the -l option (either one
> works) helped. Of course since I needed tor retain the .emacs I used the -l
> and it works perfectly. This problem arose because the .emacs files is being
> accessed from 2 servers which map to the same .emacs .So I decided to write
> a 2 shell scripts which calls 2 different .emacs files. Will not go into the
> gory details.
>
> Thanks again,
> Miki
>
> Richard Riley-3 wrote:
>> 
>> emacsuser <mekhala.acharya <at> bms.com> writes:
>> 
>>> Hi,
>>>
>>> I am relatively new to emacs. I have been trying to get it to work on
>>> Linux.
>>> I was told to rename the config file .emacs to something other than
>>> .emacs.
>>> So I called it .emacs-ks. After customizing it, I called it using :
>>> emacs -u .emacs-ks
>>> It loads an emacs session ((not with the default serttings of .emacs).
>>> But I
>>> have to type M-x load file, then give .emacs-ks. Only then does the
>>> config
>>> settings take effect. I wasn't to be able to call .emacs-ks  without
(Continue reading)

Permalink | Reply | 0 comments |
headers
LanX | 1 Oct 2009 01:36

In emacs 23 compile-mode doesn't recognize (c)perl error messages

Hi

I did a fresh install of gnu emacs 23 on my ubuntu box and everything
seems to work fine, but when running mode-compile from cperl-mode the
error messages are not recognized.

That means the errors are not highlighted, clicking has no effect
("there is no error") and
M-x next-error only produces "Moved past last error".

Any idea?

Cheers
  Rolf
Permalink | Reply | 11 comments |
headers
LanX | 1 Oct 2009 02:21

Re: In emacs 23 compile-mode doesn't recognize (c)perl error messages

Hi

just wanted to add that I did an upgrade to cperl-mode 6.2, but the
problem remains.

The emacs 23 is a snapshot installation  parallel to my "normal" emacs
22, does this lead to conflicts?

Cheers
  Rolf
Permalink | Reply | 1 comment |
headers
Andreas Politz | 1 Oct 2009 04:23
Picon

Re: How to configure git diff tool to use emacs diff tool

hap 497 <hap497 <at> gmail.com> writes:

> Hi,
>
> One can configure git merge tool to use vimdiff
>
> $git config --global merge.tool vimdiff
>
> How can I change it to use emacs diff? And is it possible to use
> emacsclient for diff?
> http://www.emacswiki.org/emacs/EmacsClient#toc1 (so that I can speed
> things up by not launching a new emacs every time).
>
> Thank you.

It seems obvious, how to do this.  The emacs function is `ediff-files' and it
takes 2 arguments, namely the files to run diff on.  Combine this with
the --eval option of emacs(client) in a shell.

$ cat ~/bin/ediff
#!/bin/sh

emacsclient --eval "(ediff-files \"$1\" \"$2\")"

-ap
Permalink | Reply | 2 comments |
headers
Eli Zaretskii | 1 Oct 2009 05:55
Picon

Re: [Emacs 23] Does not show euro sign

> From: leandro noferini <lnoferin-MANISUDICIE <at> cybervalley.org>
> Date: Wed, 30 Sep 2009 22:30:05 +0200
> 
> eamcs 23 from  debian unstable on terminal does  not show correctly euro
> sign showing instead something like a little "star".
> 
> The other characters are shown correctly.
> 
> What could I check?

Type "M-: (terminal-coding-system) RET" and see what it displays.
Permalink | Reply | 0 comments |
headers
Kevin Rodgers | 1 Oct 2009 05:53
Picon

Re: [Emacs 23] Does not show euro sign

Joost Kremers wrote:
> leandro noferini wrote:
>> eamcs 23 from  debian unstable on terminal does  not show correctly euro
>> sign showing instead something like a little "star".
>>
>> The other characters are shown correctly.
>>
>> What could I check?
> 
> the font used by your terminal. and perhaps your locale settings.

Put point before the euro sign and type `C-u C-x =' to see the font
used to display it.

--

-- 
Kevin Rodgers
Denver, Colorado, USA
Permalink | Reply | 0 comments |
headers
n179911 | 1 Oct 2009 07:14
Picon

Re: How to configure git diff tool to use emacs diff tool

I tried you script. When I run it at command line with 2 different files:

$ /Users/paul/bin/ediff.sh src/ComposeMessageActivity.java src/NewActivity.java

it works.

But after i set that up to git merge.tool
$ git config --global merge.tool /Users/paul/bin/ediff.sh
$ git diff
It does not invoke the ediff. It still uses the shell diff tool.

Thank you for any idea.

On Wed, Sep 30, 2009 at 7:23 PM, Andreas Politz <politza <at> fh-trier.de> wrote:
> hap 497 <hap497 <at> gmail.com> writes:
>
>> Hi,
>>
>> One can configure git merge tool to use vimdiff
>>
>> $git config --global merge.tool vimdiff
>>
>> How can I change it to use emacs diff? And is it possible to use
>> emacsclient for diff?
>> http://www.emacswiki.org/emacs/EmacsClient#toc1 (so that I can speed
>> things up by not launching a new emacs every time).
>>
>> Thank you.
>
> It seems obvious, how to do this.  The emacs function is `ediff-files' and it
(Continue reading)

Permalink | Reply | 1 comment |
headers
Andreas Politz | 1 Oct 2009 09:10
Picon

Re: How to configure git diff tool to use emacs diff tool

n179911 <n179911 <at> gmail.com> writes:

> On Wed, Sep 30, 2009 at 7:23 PM, Andreas Politz <politza <at> fh-trier.de> wrote:
>> hap 497 <hap497 <at> gmail.com> writes:
>>
>>> Hi,
>>>
>>> One can configure git merge tool to use vimdiff
>>>
>>> $git config --global merge.tool vimdiff
>>>
>>> How can I change it to use emacs diff? And is it possible to use
>>> emacsclient for diff?
>>> http://www.emacswiki.org/emacs/EmacsClient#toc1 (so that I can speed
>>> things up by not launching a new emacs every time).
>>>
>>> Thank you.
>>
>> It seems obvious, how to do this.  The emacs function is `ediff-files' and it
>> takes 2 arguments, namely the files to run diff on.  Combine this with
>> the --eval option of emacs(client) in a shell.
>>
>> $ cat ~/bin/ediff
>> #!/bin/sh
>>
>> emacsclient --eval "(ediff-files \"$1\" \"$2\")"
>>
>> -ap
>>
>>
(Continue reading)

Permalink | Reply | 0 comments |

Gmane