fix indent (was 3 spaces) of snippets for python-mode

diff --git a/doc/changelog.rst b/doc/changelog.rst
index c6743b6b4f1ac689f3147b56911e03a9cfda25d7..d6af2e0b296093d95831ee5e84a19ad9e9306550 100644 (file)
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,12 @@ ChangeLog
 :Contact: pluskid@gmail.com
 :Date: 2008-03-22
 
+0.5.2 / 2008-04-20
+==================
+
+* Fix a bug for comparing string to symbol using ``string=`` (which
+  will fire an error).
+
 0.5.1 / 2008-04-14
 ==================
 

diff --git a/snippets/text-mode/python-mode/class b/snippets/text-mode/python-mode/class
index a45923b33cc264fb629f3491957a769e9dbc766c..de303cc55acd1f02a1809b91bf1d77a5e08a4763 100644 (file)
--- a/snippets/text-mode/python-mode/class
+++ b/snippets/text-mode/python-mode/class
@@ -5,50 +5,50 @@
 # contributor: Yasser González Fernández <yglez@uh.cu>
 # --
 class ${1:ClassName}(${2:object}):
-   """$3
-   """
+    """$3
+    """
 
-   def __init__(self, $4):
-       """$5
-       ${4:$
-       (let* ((indent
-               (concat "\n" (make-string (current-column) 32)))
-              (args
-               (mapconcat
-                '(lambda (x)
-                   (if (not (string= (nth 0 x) ""))
-                       (concat "- " (char-to-string 96) (nth 0 x)
-                               (char-to-string 96) ":")))
-                (mapcar
+    def __init__(self, $4):
+        """$5
+        ${4:$
+        (let* ((indent
+                (concat "\n" (make-string (current-column) 32)))
+               (args
+                (mapconcat
                  '(lambda (x)
-                    (mapcar
-                     (lambda (x)
-                       (replace-regexp-in-string "\s*$" ""
-                        (replace-regexp-in-string "^\s*" "" x))) x))
-                 (mapcar '(lambda (x) (split-string x "="))
-                         (split-string text ",")))
-                indent)))
-         (if (string= args "")
-             (make-string 3 34)
-           (mapconcat
-            'identity
-            (list "" "Arguments:" args (make-string 3 34))
-            indent)))
-       }
-       ${4:$
-       (mapconcat
-        '(lambda (x)
-           (if (not (string= (nth 0 x) ""))
-               (concat "self._" (nth 0 x) " = " (nth 0 x))))
-        (mapcar
+                    (if (not (string= (nth 0 x) ""))
+                        (concat "- " (char-to-string 96) (nth 0 x)
+                                (char-to-string 96) ":")))
+                 (mapcar
+                  '(lambda (x)
+                     (mapcar
+                      (lambda (x)
+                        (replace-regexp-in-string "\s*$" ""
+                         (replace-regexp-in-string "^\s*" "" x))) x))
+                  (mapcar '(lambda (x) (split-string x "="))
+                          (split-string text ",")))
+                 indent)))
+          (if (string= args "")
+              (make-string 3 34)
+            (mapconcat
+             'identity
+             (list "" "Arguments:" args (make-string 3 34))
+             indent)))
+        }
+        ${4:$
+        (mapconcat
          '(lambda (x)
-            (mapcar
-             '(lambda (x)
-                (replace-regexp-in-string "\s*$" ""
-                 (replace-regexp-in-string "^\s*" "" x)))
-             x))
-         (mapcar '(lambda (x) (split-string x "="))
-                 (split-string text ",")))
-        (concat "\n" (make-string (current-column) 32)))
-       }
-       $0
+            (if (not (string= (nth 0 x) ""))
+                (concat "self._" (nth 0 x) " = " (nth 0 x))))
+         (mapcar
+          '(lambda (x)
+             (mapcar
+              '(lambda (x)
+                 (replace-regexp-in-string "\s*$" ""
+                  (replace-regexp-in-string "^\s*" "" x)))
+              x))
+          (mapcar '(lambda (x) (split-string x "="))
+                  (split-string text ",")))
+         (concat "\n" (make-string (current-column) 32)))
+        }
+        $0

diff --git a/snippets/text-mode/python-mode/def b/snippets/text-mode/python-mode/def
index 0f1542f73e344eac46cc7e6ace7ab59f283d0abe..d6cc16b2f376447c3224aa4cbccef66636e48b7a 100644 (file)
--- a/snippets/text-mode/python-mode/def
+++ b/snippets/text-mode/python-mode/def
@@ -4,31 +4,31 @@
 # contributor: Yasser González Fernández <yglez@uh.cu>
 # --
 def ${1:name}($2):
-   """$3
-   ${2:$
-   (let* ((indent
-           (concat "\n" (make-string (current-column) 32)))
-          (args
-           (mapconcat
-            '(lambda (x)
-               (if (not (string= (nth 0 x) ""))
-                   (concat "- " (char-to-string 96) (nth 0 x)
-                           (char-to-string 96) ":")))
-            (mapcar
+    """$3
+    ${2:$
+    (let* ((indent
+            (concat "\n" (make-string (current-column) 32)))
+           (args
+            (mapconcat
              '(lambda (x)
-                (mapcar
-                 '(lambda (x)
-                    (replace-regexp-in-string "\s*$" ""
-                     (replace-regexp-in-string "^\s*" "" x)))
-                 x))
-             (mapcar '(lambda (x) (split-string x "="))
-                     (split-string text ",")))
-            indent)))
-     (if (string= args "")
-         (make-string 3 34)
-       (mapconcat
-        'identity
-        (list "" "Arguments:" args (make-string 3 34))
-        indent)))
-   }
-   $0
+                (if (not (string= (nth 0 x) ""))
+                    (concat "- " (char-to-string 96) (nth 0 x)
+                            (char-to-string 96) ":")))
+             (mapcar
+              '(lambda (x)
+                 (mapcar
+                  '(lambda (x)
+                     (replace-regexp-in-string "\s*$" ""
+                      (replace-regexp-in-string "^\s*" "" x)))
+                  x))
+              (mapcar '(lambda (x) (split-string x "="))
+                      (split-string text ",")))
+             indent)))
+      (if (string= args "")
+          (make-string 3 34)
+        (mapconcat
+         'identity
+         (list "" "Arguments:" args (make-string 3 34))
+         indent)))
+    }
+    $0

diff --git a/snippets/text-mode/python-mode/defm b/snippets/text-mode/python-mode/defm
index 0e5390341db74392c58b10cfb3dbaa5d91dd42f2..24df67c9721799964a423bf97df91b89fdb8fc6d 100644 (file)
--- a/snippets/text-mode/python-mode/defm
+++ b/snippets/text-mode/python-mode/defm
@@ -3,31 +3,31 @@
 # contributor: Yasser Gonz¨¢lez Fern¨¢ndez <yglez@uh.cu>\r
 # --\r
 def ${1:name}(self, $2):\r
-   """$3\r
-   ${2:$\r
-   (let* ((indent\r
-           (concat "\n" (make-string (current-column) 32)))\r
-          (args\r
-           (mapconcat\r
-            '(lambda (x)\r
-               (if (not (string= (nth 0 x) ""))\r
-                   (concat "- " (char-to-string 96) (nth 0 x)\r
-                           (char-to-string 96) ":")))\r
-            (mapcar\r
+    """$3\r
+    ${2:$\r
+    (let* ((indent\r
+            (concat "\n" (make-string (current-column) 32)))\r
+           (args\r
+            (mapconcat\r
              '(lambda (x)\r
-                (mapcar\r
-                 '(lambda (x)\r
-                    (replace-regexp-in-string "\s*$" ""\r
-                     (replace-regexp-in-string "^\s*" "" x)))\r
-                 x))\r
-             (mapcar '(lambda (x) (split-string x "="))\r
-                     (split-string text ",")))\r
-            indent)))\r
-     (if (string= args "")\r
-         (make-string 3 34)\r
-       (mapconcat\r
-        'identity\r
-        (list "" "Arguments:" args (make-string 3 34))\r
-        indent)))\r
-   }\r
-   $0\r
+                (if (not (string= (nth 0 x) ""))\r
+                    (concat "- " (char-to-string 96) (nth 0 x)\r
+                            (char-to-string 96) ":")))\r
+             (mapcar\r
+              '(lambda (x)\r
+                 (mapcar\r
+                  '(lambda (x)\r
+                     (replace-regexp-in-string "\s*$" ""\r
+                      (replace-regexp-in-string "^\s*" "" x)))\r
+                  x))\r
+              (mapcar '(lambda (x) (split-string x "="))\r
+                      (split-string text ",")))\r
+             indent)))\r
+      (if (string= args "")\r
+          (make-string 3 34)\r
+        (mapconcat\r
+         'identity\r
+         (list "" "Arguments:" args (make-string 3 34))\r
+         indent)))\r
+    }\r
+    $0\r

diff --git a/snippets/text-mode/python-mode/propg b/snippets/text-mode/python-mode/propg
index e7c4d1e3f0cb9259db39dba8321894a403eac410..7e994b61cb2d3d51997fc2492aa7e42ce41c574f 100644 (file)
--- a/snippets/text-mode/python-mode/propg
+++ b/snippets/text-mode/python-mode/propg
@@ -2,7 +2,7 @@
 #name : _get_foo ... foo=property(...)\r
 # --\r
 def _get_${1:foo}(self):\r
-   return self._$1\r
+    return self._$1\r
 \r
 $1 = property(_get_$1)\r
 \r

diff --git a/snippets/text-mode/python-mode/propsg b/snippets/text-mode/python-mode/propsg
index 016166146cc91a70d8265263c1ffd40ff7e63cc9..e09d82af994e66d9d4d5b9019e07d3ddb9dcb3fd 100644 (file)
--- a/snippets/text-mode/python-mode/propsg
+++ b/snippets/text-mode/python-mode/propsg
@@ -2,10 +2,10 @@
 #name : _get_foo ... _set_foo ... foo=property(...)\r
 # --\r
 def _set_${1:foo}(self, value):\r
-   self._$1 = value\r
+    self._$1 = value\r
 \r
 def _get_$1(self):\r
-   return self._$1\r
+    return self._$1\r
 \r
 $1 = property(_get_$1, _set_$1)\r
 \r

diff --git a/snippets/text-mode/ruby-mode/r b/snippets/text-mode/ruby-mode/r
index 27696d8ad2c66c30a5d2a0623a7bb239369b17a7..b8d68d35269e8921d5486adba990b90e94540b98 100644 (file)
--- a/snippets/text-mode/ruby-mode/r
+++ b/snippets/text-mode/ruby-mode/r
@@ -1,3 +1,3 @@
 #name : attr_reader ...
 # --
-attr_reader :${attr_names}
\ No newline at end of file
+attr_reader :
\ No newline at end of file

diff --git a/snippets/text-mode/ruby-mode/rw b/snippets/text-mode/ruby-mode/rw
index a46977ff5f51b616f748e20a0c32c0c90e8192c1..aadf605f1c73381532ee808ef8ca21c32699ce8f 100644 (file)
--- a/snippets/text-mode/ruby-mode/rw
+++ b/snippets/text-mode/ruby-mode/rw
@@ -1,3 +1,3 @@
 #name : attr_accessor ...
 # --
-attr_accessor :{attr_names}
\ No newline at end of file
+attr_accessor :
\ No newline at end of file

diff --git a/snippets/text-mode/ruby-mode/w b/snippets/text-mode/ruby-mode/w
index fda3faa5f5c650039169fa21ee2f02bb9ee7c242..d680f25473772b9300063e4f4ffc6b19facaee37 100644 (file)
--- a/snippets/text-mode/ruby-mode/w
+++ b/snippets/text-mode/ruby-mode/w
@@ -1,3 +1,3 @@
 #name : attr_writer ...
 # --
-attr_writer :${attr_names}
\ No newline at end of file
+attr_writer :
\ No newline at end of file

diff --git a/yasnippet.el b/yasnippet.el
index 357e49a30451d880b3c4d4ef46caba495f80bda0..d5bf41af8502cd8269f9519d513365e65f27f237 100644 (file)
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3,7 +3,7 @@
 ;; Copyright 2008 pluskid
 ;; 
 ;; Author: pluskid <pluskid@gmail.com>
-;; Version: 0.5.1
+;; Version: 0.5.2
 ;; X-URL: http://code.google.com/p/yasnippet/
 
 ;; This file is free software; you can redistribute it and/or modify
@@ -178,7 +178,7 @@ to expand.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal variables
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defvar yas/version "0.5.1")
+(defvar yas/version "0.5.2")
 
 (defvar yas/snippet-tables (make-hash-table)
   "A hash table of snippet tables corresponding to each major-mode.")