Merge branch 'trigger-key-fallback-cleanup'

Conflicts:
	yasnippet.el

diff --cc yasnippet.el
index 6f337ae4a313fc98d374f36970c8e9a7d7302671,95c9f3aa812c849c28b773bfe74a9121a58316ef..f224fe1a559032f8b72b8ccfba082c9232acebd9
--- 1/yasnippet.el
--- 2/yasnippet.el
+++ b/yasnippet.el
@@@ -4275,14 -4166,13 +4192,13 @@@ When multiple expressions are found, on
  (put 'yas-expand  'function-documentation
       '(yas--expand-from-trigger-key-doc))
  (defun yas--expand-from-trigger-key-doc ()
 -  "A doc synthethizer for `yas--expand-from-trigger-key-doc'."
 +  "A doc synthesizer for `yas--expand-from-trigger-key-doc'."
    (let ((fallback-description
           (cond ((eq yas-fallback-behavior 'call-other-command)
-                 (let* ((yas-minor-mode nil)
-                        (fallback (key-binding (read-kbd-macro (yas--trigger-key-for-fallback)))))
+                 (let* ((fallback (yas--keybinding-beyond-yasnippet)))
                    (or (and fallback
                             (format " call command `%s'." (pp-to-string fallback)))
-                       " do nothing.")))
+                       " do nothing (`yas-expand' doesn't shadow\nanything)")))
                 ((eq yas-fallback-behavior 'return-nil)
                  ", do nothing.")
                 (t