unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: joaotavora@gmail.com (João Távora)
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: Akira Kitada <akitada@gmail.com>, Tassilo Horn <tsdh@gnu.org>,
	emacs-devel@gnu.org
Subject: Re: Getting rid of low-level assumptions in yasnippet
Date: Sat, 28 Mar 2015 15:59:12 +0000	[thread overview]
Message-ID: <m2vbhlt8of.fsf@gmail.com> (raw)
In-Reply-To: <jwva8z7zrfh.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Fri, 20 Mar 2015 10:18:12 -0400")

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

>> So unless you disagree, I'll remove them completely in the subtree merge
>> result and (temporarily) replace yasnippet/snippets with a copy of the
>> old snippet collection.
> Sure,

I finally did the sync, and some "giv mv"s after it looks OK. Here's the
summary:

    commit 39a27b6cd6ced60e81145efb18d72d6081eac9f7
    Merge: 73701d9 a467019
    Author: João Távora <joaotavora@gmail.com>
    Date:   Sat Mar 28 15:16:36 2015 +0000
     
        Update packages/yasnippet by merging from its external upstream subtree
        
        The snippet collection and the "yasmate" tool, realized in the
        upstream as git submodules, are removed in the merge result. The "old"
        snippet collection is however still in place in
        packages/yasnippet/snippets.
        
        Conflicts:
        	.gitignore
                <a lot of conflicts>


I couldn't be extra sure since the instructions in the README failed for
me. Both the "install in place" and the "locally deploy an archive"
failed with some errors. I didn't investigate much, compilation seems to
stop at ergoemacs.

    In toplevel form:
    packages/ergoemacs-mode/ergoemacs-macros.el:265:1:Error: Wrong type argument: listp, value
    make[1]: *** [packages/ergoemacs-mode/ergoemacs-macros.elc] Error 1
    make: *** [all-in-place] Error 2

I did load the package manually and it worked well though.

João





  reply	other threads:[~2015-03-28 15:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-19 19:49 Getting rid of low-level assumptions in yasnippet Stefan Monnier
2015-03-20 11:03 ` João Távora
2015-03-20 14:18   ` Stefan Monnier
2015-03-28 15:59     ` João Távora [this message]
2015-03-28 20:32       ` Stefan Monnier
2015-03-28 21:23         ` João Távora
2015-03-29 19:36           ` Matthew Fidler
2015-03-30  0:47             ` Stefan Monnier
2015-03-30 15:15               ` Matthew Fidler
2015-03-30 18:53                 ` Stefan Monnier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2vbhlt8of.fsf@gmail.com \
    --to=joaotavora@gmail.com \
    --cc=akitada@gmail.com \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@IRO.UMontreal.CA \
    --cc=tsdh@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).