From c9dd0b38ef5f3aac6918c9a4c0be5633cfa02320 Mon Sep 17 00:00:00 2001
From: Zhang Chiyuan <pluskid@gmail.com>
Date: Thu, 6 Mar 2008 10:31:10 +0000
Subject: [PATCH] use only ASCII character in snippet

---
 snippets/c++-mode/class  | 2 +-
 snippets/c++-mode/do     | 2 +-
 snippets/c++-mode/for    | 2 +-
 snippets/c++-mode/if     | 2 +-
 snippets/c++-mode/main   | 2 +-
 snippets/c++-mode/struct | 2 +-
 snippets/c-mode/Inc.yas  | 2 +-
 snippets/c-mode/do       | 2 +-
 snippets/c-mode/for      | 2 +-
 snippets/c-mode/if       | 2 +-
 snippets/c-mode/inc      | 2 +-
 snippets/c-mode/main     | 2 +-
 snippets/c-mode/struct   | 2 +-
 yasnippet.el             | 9 +++++----
 14 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/snippets/c++-mode/class b/snippets/c++-mode/class
index 1aefd41..e4a7032 100644
--- a/snippets/c++-mode/class
+++ b/snippets/c++-mode/class
@@ -1,4 +1,4 @@
-#name : class бн { бн }
+#name : class ... { ... }
 # --
 class ${1:Name}
 {
diff --git a/snippets/c++-mode/do b/snippets/c++-mode/do
index e0bc20b..5f7a313 100644
--- a/snippets/c++-mode/do
+++ b/snippets/c++-mode/do
@@ -1,4 +1,4 @@
-#name : do { бн } while (бн)
+#name : do { ... } while (...)
 # --
 do
 {
diff --git a/snippets/c++-mode/for b/snippets/c++-mode/for
index 911107c..c4cade6 100644
--- a/snippets/c++-mode/for
+++ b/snippets/c++-mode/for
@@ -1,4 +1,4 @@
-#name : for (бн; бн; бн) { бн }
+#name : for (...; ...; ...) { ... }
 # --
 for (${1:int i = 0}; ${2:i < N}; ${3:++i})
 {
diff --git a/snippets/c++-mode/if b/snippets/c++-mode/if
index 6a93419..c3fe10d 100644
--- a/snippets/c++-mode/if
+++ b/snippets/c++-mode/if
@@ -1,4 +1,4 @@
-#name : if ( бн ) { бн }
+#name : if (...) { ... }
 # --
 if (${1:condition})
 {
diff --git a/snippets/c++-mode/main b/snippets/c++-mode/main
index e1824b2..ab4cd1e 100644
--- a/snippets/c++-mode/main
+++ b/snippets/c++-mode/main
@@ -1,4 +1,4 @@
-#name: int main(argc, argv) { бн }
+#name: int main(argc, argv) { ... }
 # --
 int main(int argc, char const *argv)
 {
diff --git a/snippets/c++-mode/struct b/snippets/c++-mode/struct
index 8cc1a25..f50dabf 100644
--- a/snippets/c++-mode/struct
+++ b/snippets/c++-mode/struct
@@ -1,4 +1,4 @@
-#name : struct бн { бн }
+#name : struct ... { ... }
 # --
 struct ${1:name}
 {
diff --git a/snippets/c-mode/Inc.yas b/snippets/c-mode/Inc.yas
index cdcc8f1..de64090 100644
--- a/snippets/c-mode/Inc.yas
+++ b/snippets/c-mode/Inc.yas
@@ -1,3 +1,3 @@
-#name : #include <бн>
+#name : #include <...>
 # --
 #include <$1>
\ No newline at end of file
diff --git a/snippets/c-mode/do b/snippets/c-mode/do
index e0bc20b..5f7a313 100644
--- a/snippets/c-mode/do
+++ b/snippets/c-mode/do
@@ -1,4 +1,4 @@
-#name : do { бн } while (бн)
+#name : do { ... } while (...)
 # --
 do
 {
diff --git a/snippets/c-mode/for b/snippets/c-mode/for
index 911107c..c4cade6 100644
--- a/snippets/c-mode/for
+++ b/snippets/c-mode/for
@@ -1,4 +1,4 @@
-#name : for (бн; бн; бн) { бн }
+#name : for (...; ...; ...) { ... }
 # --
 for (${1:int i = 0}; ${2:i < N}; ${3:++i})
 {
diff --git a/snippets/c-mode/if b/snippets/c-mode/if
index 6a93419..c3fe10d 100644
--- a/snippets/c-mode/if
+++ b/snippets/c-mode/if
@@ -1,4 +1,4 @@
-#name : if ( бн ) { бн }
+#name : if (...) { ... }
 # --
 if (${1:condition})
 {
diff --git a/snippets/c-mode/inc b/snippets/c-mode/inc
index d43d6bb..61fd09b 100644
--- a/snippets/c-mode/inc
+++ b/snippets/c-mode/inc
@@ -1,3 +1,3 @@
-#name : #include "бн"
+#name : #include "..."
 # --
 #include "$1"
\ No newline at end of file
diff --git a/snippets/c-mode/main b/snippets/c-mode/main
index 2be6ccb..a2205a3 100644
--- a/snippets/c-mode/main
+++ b/snippets/c-mode/main
@@ -1,4 +1,4 @@
-#name: int main(argc, argv) { бн }
+#name: int main(argc, argv) { ... }
 # --
 int main(int argc, char *argv)
 {
diff --git a/snippets/c-mode/struct b/snippets/c-mode/struct
index 8cc1a25..f50dabf 100644
--- a/snippets/c-mode/struct
+++ b/snippets/c-mode/struct
@@ -1,4 +1,4 @@
-#name : struct бн { бн }
+#name : struct ... { ... }
 # --
 struct ${1:name}
 {
diff --git a/yasnippet.el b/yasnippet.el
index 75653af..61042e9 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -523,10 +523,11 @@ an example:
 (defun yas/directory-files (directory file?)
   "Return directory files or subdirectories in full path."
   (remove-if (lambda (file)
-	       (and (not (string-match "/\\.[^/]*$" file))
-		    (if file?
-			(not (file-directory-p file))
-		      (file-directory-p file))))
+	       (or (string-match "^\\."
+				 (file-name-nondirectory file))
+		   (if file?
+		       (file-directory-p file)
+		     (not (file-directory-p file)))))
 	     (directory-files directory t)))
 
 (defun yas/make-menu-binding (template)