From 0e7ea945ce99924be746ba5c9c0825cdd53dee43 Mon Sep 17 00:00:00 2001 From: Phil Hudson Date: Mon, 13 Apr 2015 15:08:24 +0100 Subject: [PATCH] Replaced 'shadow' with 'override' throughout documentation It is hoped that this will add clarity. * yasnippet.el, doc/snippet-organization.org (documentation): Replaced 'shadow' with 'override' globally. --- doc/snippet-organization.org | 2 +- yasnippet.el | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/snippet-organization.org b/doc/snippet-organization.org index ee55a8efb..abe62adca 100644 --- a/doc/snippet-organization.org +++ b/doc/snippet-organization.org @@ -48,7 +48,7 @@ '("~/Downloads/interesting-snippets"))) #+end_src - Collections appearing earlier in the list shadow snippets with same names + Collections appearing earlier in the list override snippets with same names appearing in collections later in the list. [[sym:yas-new-snippet][=yas-new-snippet=]] always stores snippets in the first collection. diff --git a/yasnippet.el b/yasnippet.el index 16278cca3..45702e459 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -41,7 +41,7 @@ ;; stored. Can also be a list of directories. In that case, ;; when used for bulk (re)loading of snippets (at startup or ;; via `yas-reload-all'), directories appearing earlier in -;; the list shadow other dir's snippets. Also, the first +;; the list override other dir's snippets. Also, the first ;; directory is taken as the default for storing the user's ;; new snippets. ;; @@ -165,7 +165,7 @@ Each element, a string or a symbol whose value is a string, designates a top-level directory where per-mode snippet directories can be found. -Elements appearing earlier in the list shadow later elements' +Elements appearing earlier in the list override later elements' snippets. The first directory is taken as the default for storing snippet's @@ -4292,7 +4292,7 @@ When multiple expressions are found, only the last one counts." (or (and fallback (format "call command `%s'." (pp-to-string fallback))) - "do nothing (`yas-expand' doesn't shadow\nanything)."))) + "do nothing (`yas-expand' doesn't override\nanything)."))) ((eq yas-fallback-behavior 'return-nil) "do nothing.") (t "defer to `yas-fallback-behavior' (which see).")))) -- 2.39.2