logs archiveIRC Archive / Freenode / #emacs / 2015 / July / 21 / 1
benaiah
mrmyers: american standard accent (the "typical" or "newscaster" accent)
kovrik
Hi all! When merging in Magit and if there are conflicts, then Magit doesn't mark the whole commit as 'merge' commit, right? How can I mark it as 'merge' later (after resolving all conflicts)?
benaiah
kovrik: git conflicts generally require either a merge commit or a rebase, regardless of whether you use magit
so I'm not really understanding the question
kovrik
that's the problem: after I resolve all conflicts and push that commit, then do 'git cat-file -p <commit_hash>' - I see that there is only 1 parent
hence Magit commits it just as usual commit, not merge commit
jlf
actually, what i'd really like is some sort of general advice mechanism for js in the browser.. surely this exists already..?
kovrik
benaiah: and if I later do something like 'git log --no-merges rev1..rev2' - then I'll see that merge commits (because Magit didn't marked them as merge commits)
benaiah: magit docs say: 'With a prefix argument this does not actually create the merge commit, which makes it possible to inspect how conflicts were resolved and to adjust the commit message.'
benaiah: but I didn't set any prefix argument
benaiah: and I can't find any switch or something
mrmyers
beniah: Ah. Yea, I feel the same at times.
parsnip
is anyone proficient in the whole G G, G V, G v workflow in gnus?
i want to search a mailbox, and then make it persist with a virtual group. i got it to work some time ago, but cannot reproduce now.
jlf
pretty sure lars is
         

parsnip
heh
well, good point
i should get back into newsgroup'ing
wmanger
x
wasamasa
y
wmanger
x = sqrt(-1)
jlf
,xyproblem
fsbot
xyproblem is when you want to do X, and you think Y is how, so you ask about Y instead of X. See <http://www.perlmonks.org/index.pl?node_id=542341> or <http://mywiki.wooledge.org/XyProblem>
wmanger
NOPE, Imaginary!
jlf
tsk, true by definition for x=j
pi-alpha
bad day, here for the spa
benaiah
pi-alpha: spa's broken but there's a manure pile out back that
started bubbling for some reason
pi-alpha
sad to see this website not working: http://www.learn-c.org/
linux_dream
not working as in what?
pi-alpha
linux_dream: if i hit "run", gears spin.
linux_dream
same here
looks like wolfram alpha to me
Diiitto
pi-alpha: same goes for all the other "learn-" prefixed programming language learning sites
linux_dream
thinking infinitely
pi-alpha
so maybe wolfram stopped some thing they provided?
bumpkin
does anyone know of a command in emacs to find and open the C header file where a function is declared?
jlf
bumpkin: ,,tags
fsbot
jlf, hmm, tags are [0/5] Basically, a list of bookmarks in a file like ~/TAGS. Each bookmark corresponds to one function/variable definition. One TAGS file can cover many projects. You can also have multiple TAGS files.
[1] (info "(emacs)Tags"), ..[Type ,more]
         

bumpkin
,more
fsbot
[2] pretty primitive but it is useful for simple searching and refactoring, it already comes with Emacs, is pretty fast and it doesn't take a week to set up,
[3] see ,etags, ,gtags and ,ctags,
[4] See hasktags for Haskell, otags for OCaml
bumpkin
,ctags
fsbot
[->] ExuberantCtags -- [0] at http://www.emacswiki.org/emacs/ExuberantCtags
[1] see ,EmacsTags
bumpkin
jlf, thanks
jlf
np
pi-alpha
let's make a metalanguage for every language in every other language
blaenk
what's the preferred way to highlight tabs?
I see this highlight-chars package should I use that
pi-alpha
maybe M-x whitespace-mode, could adjust its variables
blaenk
thanks pi-alpha
pi-alpha
but maybe you can find a packages that would be more convenient.
i turn whitespace-mode on and off briefly once in a while.
blaenk
yeah seems like it'd be a nice toggle
I just want to be sure no stray tabs get in my stuff
pi-alpha
you know M-x M-p
wmanger
question: who's using Evil Mode, and how long did it take you to remove those training wheels?
wmanger``
*using = used
blaenk
pi-alpha: no I don't know M-x M-p, when I do that it opens M-x?
pi-alpha
blaenk: like an alarm goes off if a TAB exists? yeah that would be nice.
blaenk
yeah :)
what's M-x M-p though
pi-alpha
blaenk: like if you wanted to repeat a command, M-p goes through history of M-x
blaenk
ohhhh
sweet
wow I forgot about that haha
new to emacs and all
pi-alpha
so for instance i sometimes use it for menu-bar-mode, or other things, i want to enable and soon after switch back off again.
rrix
how can i get ob-python to spit a list out as a table?
blaenk
yeah that's great, thanks
pi-alpha
np
rrix
it is giving me a one line table with the u'crap' in it
blaenk
loving emacs
with evil mode though
at first I tried to go 100% emacs but some of these bindings are just insane, and I don't want to throw away my muscle memory from vim
I'm glad enough to have the best of both worlds
pi-alpha
nice, it's on my todo list to try to learn enough vim to leverage evil for speed.
bumpkin
jlf: reading about tags, trying to see if i understand it. Is it necessary to run etags and give it all the standard header files to look at, so that it can recognize those functions?
jlf: to sort of initialize a global TAGS file? then for each individual project, run etags again just on those header files?
jlf
bumpkin: i use ,,global,, myself via gtags.el
fsbot
hmm, global is the GNU GLOBAL source code tag system at http://www.gnu.org/software/global/
jlf
a lot of it depends on what PLs you're using
bumpkin
jlf: what's a PL?
mrmyers
Er, how do you turn company mode on?
bumpkin
mrmyers: M-x company-mode
mrmyers: I would assume
paulelms`
/nick paulelms
sorry
pi-alpha
mrmyers: there's a switch on the back
jlf
who are these fu*ktarded web monkeys that generate error pages for credit card and telephone number form data containing dashes instead of just s/-//g'ing the content and moving on?
koz_
jlf: There's apparently a lot of said retarded web monkeys.
kovrik
I don't like it when CVV number field is not a password field
defanor
what the `no` [linux] program is supposed to do? it's rather hard to google, and i don't have it
koz_
,greet kovrik
fsbot
Chào b¡n kovrik.
koz_
defanor: Tried 'man no'?
kovrik
defanor: say 'no'?
« prev 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 next »