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.
This commit is contained in:
Phil Hudson 2015-04-13 15:08:24 +01:00
parent 23133da7d9
commit 0e7ea945ce
2 changed files with 4 additions and 4 deletions

View File

@ -48,7 +48,7 @@
'("~/Downloads/interesting-snippets"))) '("~/Downloads/interesting-snippets")))
#+end_src #+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 appearing in collections later in the list. [[sym:yas-new-snippet][=yas-new-snippet=]] always stores
snippets in the first collection. snippets in the first collection.

View File

@ -41,7 +41,7 @@
;; stored. Can also be a list of directories. In that case, ;; stored. Can also be a list of directories. In that case,
;; when used for bulk (re)loading of snippets (at startup or ;; when used for bulk (re)loading of snippets (at startup or
;; via `yas-reload-all'), directories appearing earlier in ;; 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 ;; directory is taken as the default for storing the user's
;; new snippets. ;; 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 designates a top-level directory where per-mode snippet
directories can be found. directories can be found.
Elements appearing earlier in the list shadow later elements' Elements appearing earlier in the list override later elements'
snippets. snippets.
The first directory is taken as the default for storing snippet's 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 (or (and fallback
(format "call command `%s'." (format "call command `%s'."
(pp-to-string fallback))) (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) ((eq yas-fallback-behavior 'return-nil)
"do nothing.") "do nothing.")
(t "defer to `yas-fallback-behavior' (which see).")))) (t "defer to `yas-fallback-behavior' (which see)."))))