From efb4f12c9083ad3930eaf5da8929d4e6b33609eb Mon Sep 17 00:00:00 2001 From: "Mohammed Sadik P. K" Date: Mon, 28 Aug 2017 07:34:25 +0530 Subject: [PATCH] Let file-name-base succeed when buffer-file-name is nil FILENAME is an optional argument for file-name-base. So it shouldn't fail when no filename is associated with current buffer. * lisp/files.el (file-name-base): Don't fail when buffer-file-name is nil. --- lisp/files.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index 872fc46e87..d75d402545 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4467,8 +4467,9 @@ file-name-extension (defun file-name-base (&optional filename) "Return the base name of the FILENAME: no directory, no extension. FILENAME defaults to `buffer-file-name'." - (file-name-sans-extension - (file-name-nondirectory (or filename (buffer-file-name))))) + (let ((filename (or filename (buffer-file-name)))) + (and filename + (file-name-sans-extension (file-name-nondirectory filename))))) (defcustom make-backup-file-name-function #'make-backup-file-name--default-function -- 2.11.0