branch: master
commit 890bd7edcd4390f5a00131871633e67dc3b84219
Merge: a467019 d619107
Author: João Távora <[email protected]>
Commit: João Távora <[email protected]>
Merge pull request #569 from npostavs/doc-obsolete
README fixes, mark yas-initialize as obsolete
---
README.mdown | 17 ++---------------
yasnippet.el | 1 +
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/README.mdown b/README.mdown
index 75ca37a..5806994 100644
--- a/README.mdown
+++ b/README.mdown
@@ -41,18 +41,7 @@ In a recent emacs `M-x list-packages` is the recommended way
to list and install
## Install with el-get
El-get is a nice way to get the most recent version, too. See
-https://github.com/dimitri/el-get for instructions. Be sure to install the
-"master" branch since the 3.x series still use the old googlecode code, base.
-Consider using this "local" recipe.
-
- (push '(:name yasnippet
- :website "https://github.com/capitaomorte/yasnippet.git"
- :description "YASnippet is a template system for Emacs."
- :type github
- :pkgname "capitaomorte/yasnippet"
- :features "yasnippet"
- :compile "yasnippet.el")
- el-get-sources)
+https://github.com/dimitri/el-get for instructions.
## Use `yas-minor-mode` on a per-buffer basis
@@ -60,9 +49,7 @@ To use YASnippet as a non-global minor mode, replace
`(yas-global-mode 1)` with
`(yas-reload-all)` to load the snippet tables. Then add a call to
`(yas-minor-mode)` to the major-modes where you to enable YASnippet.
- (add-hook 'prog-mode-hook
- '(lambda ()
- (yas-minor-mode)))
+ (add-hook 'prog-mode-hook #'yas-minor-mode)
# Where are the snippets?
diff --git a/yasnippet.el b/yasnippet.el
index 95c96e4..16278cc 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -4434,6 +4434,7 @@ and return the directory. Return nil if not found."
(defun yas-initialize ()
"For backward compatibility, enable `yas-minor-mode' globally."
+ (declare (obsolete "Use (yas-global-mode 1) instead." "0.8"))
(yas-global-mode 1))
(defvar yas--backported-syms '(;; `defcustom's