From d57865426976094a01654c224c9a499a3410ebce Mon Sep 17 00:00:00 2001 From: Zhang Chiyuan Date: Fri, 7 Mar 2008 12:39:40 +0000 Subject: [PATCH] boundp should be fboundp --- snippets/c++-mode/beginend | 4 ++-- snippets/c++-mode/inc | 4 ++-- snippets/c++-mode/inc.1 | 4 ++-- snippets/c-mode/inc | 4 ++-- snippets/c-mode/inc.1 | 4 ++-- yasnippet.el | 5 +++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/snippets/c++-mode/beginend b/snippets/c++-mode/beginend index aa45495..68303e2 100644 --- a/snippets/c++-mode/beginend +++ b/snippets/c++-mode/beginend @@ -1,3 +1,3 @@ -#name : v.begin(), v.end() -# -- +#name : v.begin(), v.end() +# -- ${1:v}.begin(), $1.end \ No newline at end of file diff --git a/snippets/c++-mode/inc b/snippets/c++-mode/inc index 61fd09b..c18a4d2 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/inc.1 b/snippets/c++-mode/inc.1 index de64090..f85c08a 100644 --- a/snippets/c++-mode/inc.1 +++ b/snippets/c++-mode/inc.1 @@ -1,3 +1,3 @@ -#name : #include <...> -# -- +#name : #include <...> +# -- #include <$1> \ No newline at end of file diff --git a/snippets/c-mode/inc b/snippets/c-mode/inc index 61fd09b..c18a4d2 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/inc.1 b/snippets/c-mode/inc.1 index de64090..f85c08a 100644 --- a/snippets/c-mode/inc.1 +++ b/snippets/c-mode/inc.1 @@ -1,3 +1,3 @@ -#name : #include <...> -# -- +#name : #include <...> +# -- #include <$1> \ No newline at end of file diff --git a/yasnippet.el b/yasnippet.el index f4d9be5..8613259 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -608,7 +608,7 @@ an example: If POINT is not given, default is to current point. If `posn-at-point' is not available (like in Emacs 21.3), t is returned simply." - (if (boundp 'posn-at-point) + (if (fboundp 'posn-at-point) (let ((x-y (posn-x-y (posn-at-point (or point (point)))))) (list (list (+ (car x-y) 10) (+ (cdr x-y) 20)) @@ -618,7 +618,8 @@ t is returned simply." (defun yas/popup-for-template (templates) "Show a popup menu listing templates to let the user select one." (if window-system - (car (x-popup-menu (yas/point-to-coord) (yas/fake-keymap-for-popup templates))) + (car (x-popup-menu (yas/point-to-coord) + (yas/fake-keymap-for-popup templates))) ;; no window system, simply select the first one (cdar templates)))