master updated (bce98395ce -> a2ecf73545)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  bce98395ce Make emerge-define-key-if-possible obsolete
       new  e93a1a835e * lisp/vc/emerge.el (emerge-show-file-name): Make 
obsolete.
       new  a2ecf73545 ; * lisp/play/5x5.el (5x5-defvar-local): Improve 
obsoletion.


Summary of changes:
 lisp/play/5x5.el  | 12 +++---------
 lisp/vc/emerge.el |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)