*** files.el	2007-08-27 16:44:01.000000000 +0200
--- files.el	2007-08-27 16:43:55.000000000 +0200
***************
*** 1268,1278 ****
  (defun create-file-buffer (filename)
    "Create a suitably named buffer for visiting FILENAME, and return it.
  FILENAME (sans directory) is used unchanged if that name is free;
! otherwise a string <2> or <3> or ... is appended to get an unused name."
    (let ((lastname (file-name-nondirectory filename)))
      (if (string= lastname "")
  	(setq lastname filename))
!     (generate-new-buffer lastname)))
  
  (defun generate-new-buffer (name)
    "Create and return a buffer with a name based on NAME.
--- 1268,1281 ----
  (defun create-file-buffer (filename)
    "Create a suitably named buffer for visiting FILENAME, and return it.
  FILENAME (sans directory) is used unchanged if that name is free;
! otherwise a string <2> or <3> or ... is appended to get an unused name.
! Spaces at the start of FILENAME (sans directory) are removed."
    (let ((lastname (file-name-nondirectory filename)))
      (if (string= lastname "")
  	(setq lastname filename))
!     (save-match-data
!       (string-match "^ *\\(.*\\)" lastname)
!       (generate-new-buffer (match-string 1 lastname)))))
  
  (defun generate-new-buffer (name)
    "Create and return a buffer with a name based on NAME.