Added: save-excursion. Changed: expand-file-name -> file-truename