Permalink
Browse files

Merge branch 'master' of https://github.com/gabrielelanaro/emacs-for-…

  • Loading branch information...
2 parents d9f58a5 + 3f2837d commit 35e970ad434408a8f83e35ef76fafb2275986e3b @paradoxxxzero committed May 26, 2011
Showing with 17 additions and 1 deletion.
  1. +9 −0 README.org
  2. +8 −0 epy-editing.el
  3. +0 −1 epy-init.el
  4. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/auto
  5. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/boolean
  6. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/char
  7. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/commaseparatedinteger
  8. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/date
  9. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/decimal
  10. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/dtime
  11. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/email
  12. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/file
  13. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/filepath
  14. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/fk
  15. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/float
  16. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/image
  17. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/integer
  18. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/ipaddress
  19. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/manytomany
  20. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/model
  21. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/nullboolean
  22. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/phonenumber
  23. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/positiveinteger
  24. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/positivesmallinteger
  25. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/sendmail
  26. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/slug
  27. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/smallinteger
  28. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/text
  29. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/time
  30. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/url
  31. 0 {extensions/yasnippet/snippets → snippets/django}/python-mode/xml
View
9 README.org
@@ -76,6 +76,7 @@ For further information and usage suggestions check:
There is another nice tutorial on how to install emacs-for-python
here:
[[http://maddemcode.com/python/emacs-and-python-the-definitive-answer/]]
+
*** Configuring the _flymake_ checker
New in version 0.3:
I changed the way you configure your checkers, now there is no
@@ -90,6 +91,13 @@ Obviously you can substitute the ``"flymake %f"`` with wathever you
want, you just have to keep in mind that ``%f`` will be substituted
with the file which is being checked.
+*** Adding the django snippets
+The django snippets comes as an option, you can load them using:
+
+: (epy-django-snippets)
+
+As a command using M-x or putting it in your .emacs.
+
** Installation with emacs-starter-kit
I've built up a little fork of emacs starter kit that is greatly
integrated with emacs-for-python, it seems the best solution to me!
@@ -99,6 +107,7 @@ The repo is at this address: [[http://github.com/gabrielelanaro/emacs-starter-ki
Remember that customization to emacs-starter-kit are done to a
custom.el file, and so you can substitute your distribution of
emacs-starter-kit and you have to copy just your customization file.
+
** License
This is mostly a distribution with some little tweaks, with respect of
View
8 epy-editing.el
@@ -20,6 +20,14 @@
;; Yasnippet - force the loading of the custom version of yasnippet
(require 'yasnippet (concat epy-install-dir "extensions/yasnippet/yasnippet"))
+;; this one is to activate django snippets
+(defun epy-django-snippets ()
+ "Load django snippets"
+ (interactive)
+ (yas/load-directory (concat epy-install-dir "snippets/django"))
+ )
+
+
(yas/initialize)
(yas/load-directory (concat epy-install-dir "extensions/yasnippet/snippets"))
(setq yas/prompt-functions '(yas/dropdown-prompt yas/ido-prompt yas/x-prompt))
View
1 epy-init.el
@@ -14,6 +14,5 @@
(require 'epy-completion)
(require 'epy-editing)
(require 'epy-bindings)
-;;TODO: adding epy-patches?
(provide 'epy-init)
View
0 ...sions/yasnippet/snippets/python-mode/auto → snippets/django/python-mode/auto
File renamed without changes.
View
0 ...ns/yasnippet/snippets/python-mode/boolean → snippets/django/python-mode/boolean
File renamed without changes.
View
0 ...sions/yasnippet/snippets/python-mode/char → snippets/django/python-mode/char
File renamed without changes.
View
0 ...nippets/python-mode/commaseparatedinteger → .../django/python-mode/commaseparatedinteger
File renamed without changes.
View
0 ...sions/yasnippet/snippets/python-mode/date → snippets/django/python-mode/date
File renamed without changes.
View
0 ...ns/yasnippet/snippets/python-mode/decimal → snippets/django/python-mode/decimal
File renamed without changes.
View
0 ...ions/yasnippet/snippets/python-mode/dtime → snippets/django/python-mode/dtime
File renamed without changes.
View
0 ...ions/yasnippet/snippets/python-mode/email → snippets/django/python-mode/email
File renamed without changes.
View
0 ...sions/yasnippet/snippets/python-mode/file → snippets/django/python-mode/file
File renamed without changes.
View
0 ...s/yasnippet/snippets/python-mode/filepath → snippets/django/python-mode/filepath
File renamed without changes.
View
0 extensions/yasnippet/snippets/python-mode/fk → snippets/django/python-mode/fk
File renamed without changes.
View
0 ...ions/yasnippet/snippets/python-mode/float → snippets/django/python-mode/float
File renamed without changes.
View
0 ...ions/yasnippet/snippets/python-mode/image → snippets/django/python-mode/image
File renamed without changes.
View
0 ...ns/yasnippet/snippets/python-mode/integer → snippets/django/python-mode/integer
File renamed without changes.
View
0 .../yasnippet/snippets/python-mode/ipaddress → snippets/django/python-mode/ipaddress
File renamed without changes.
View
0 ...yasnippet/snippets/python-mode/manytomany → snippets/django/python-mode/manytomany
File renamed without changes.
View
0 ...ions/yasnippet/snippets/python-mode/model → snippets/django/python-mode/model
File renamed without changes.
View
0 ...asnippet/snippets/python-mode/nullboolean → snippets/django/python-mode/nullboolean
File renamed without changes.
View
0 ...asnippet/snippets/python-mode/phonenumber → snippets/django/python-mode/phonenumber
File renamed without changes.
View
0 ...ppet/snippets/python-mode/positiveinteger → snippets/django/python-mode/positiveinteger
File renamed without changes.
View
0 ...snippets/python-mode/positivesmallinteger → ...s/django/python-mode/positivesmallinteger
File renamed without changes.
View
0 ...s/yasnippet/snippets/python-mode/sendmail → snippets/django/python-mode/sendmail
File renamed without changes.
View
0 ...sions/yasnippet/snippets/python-mode/slug → snippets/django/python-mode/slug
File renamed without changes.
View
0 ...snippet/snippets/python-mode/smallinteger → snippets/django/python-mode/smallinteger
File renamed without changes.
View
0 ...sions/yasnippet/snippets/python-mode/text → snippets/django/python-mode/text
File renamed without changes.
View
0 ...sions/yasnippet/snippets/python-mode/time → snippets/django/python-mode/time
File renamed without changes.
View
0 ...nsions/yasnippet/snippets/python-mode/url → snippets/django/python-mode/url
File renamed without changes.
View
0 ...nsions/yasnippet/snippets/python-mode/xml → snippets/django/python-mode/xml
File renamed without changes.

0 comments on commit 35e970a

Please sign in to comment.