master updated (caabc5a4ab -> 32d8fc999c)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  caabc5a4ab * lisp/nxml/rng-util.el (rng-collapse-space): Simplify.
       new  8caa91b2ce * lisp/vc/pcvs-util.el (cvs-partition): Simplify.
       new  06cb954ae3 Remove some compat code from ps-print.el
       new  32d8fc999c Avoid using aliases for color functions


Summary of changes:
 lisp/emulation/viper-init.el |  2 +-
 lisp/emulation/viper-util.el | 12 ++++++------
 lisp/faces.el                |  2 +-
 lisp/net/dictionary.el       |  2 +-
 lisp/obsolete/gs.el          |  2 +-
 lisp/progmodes/cperl-mode.el |  2 +-
 lisp/progmodes/ebnf2ps.el    |  1 -
 lisp/ps-print.el             |  3 +--
 lisp/vc/pcvs-util.el         |  8 ++++----
 lisp/woman.el                |  2 +-
 10 files changed, 17 insertions(+), 19 deletions(-)