master updated (a5197e2 -> 261d0f8)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  a5197e2   Fix problem of trashing files to an inconsistent trash 
directory
       new  846e867   Fix uniquify-trailing-separator-p + 
uniquify-strip-common-suffix
       new  261d0f8   cperl-mode: Don't interpret y_ as start of y// function.


Summary of changes:
 lisp/progmodes/cperl-mode.el            | 33 ++++++++++++++++++---------------
 lisp/uniquify.el                        | 22 ++++++++++++++--------
 test/lisp/progmodes/cperl-mode-tests.el | 26 ++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 23 deletions(-)