* lisp/files.el (file-name-base): New convenience function.

* lisp/autoinsert.el, lisp/cus-dep.el, lisp/doc-view.el, lisp/image-dired.el,
* lisp/woman.el, lisp/eshell/esh-cmd.el, lisp/progmodes/ada-xref.el,
* lisp/progmodes/cc-defs.el, lisp/progmodes/cperl-mode.el,
* lisp/progmodes/flymake.el, lisp/progmodes/gud.el, lisp/progmodes/idlwave.el,
* lisp/textmodes/ispell.el, lisp/textmodes/reftex-ref.el,
* lisp/textmodes/tex-mode.el: Use it.
Did not touch cedet and org because they are maintained elsewhere.

6 files changed, 11 insertions, 25 deletions

diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 146cc703e1a..1bee783bb17 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1544,9 +1544,7 @@ the project file."
   ;;      also a separate.
 
   (with-current-buffer (get-file-buffer file)
-    (let ((short-ali-file-name
-	   (concat (file-name-sans-extension (file-name-nondirectory file))
-		   ".ali"))
+    (let ((short-ali-file-name (concat (file-name-base file) ".ali"))
 	  ali-file-name
 	  is-spec)
 
@@ -1566,10 +1564,7 @@ the project file."
       (if is-spec
 	  (set 'ali-file-name
 	       (ada-find-ali-file-in-dir
-		(concat (file-name-sans-extension
-			 (file-name-nondirectory
-			  (ada-other-file-name)))
-			".ali"))))
+		(concat (file-name-base (ada-other-file-name)) ".ali"))))
 
 
       (setq ali-file-name
@@ -1584,15 +1579,12 @@ the project file."
 		;;  file_s.ada and file_b.ada), try to go to the other file
 		;;  and look for its ali file
 		(ada-find-ali-file-in-dir
-		 (concat (file-name-sans-extension
-			  (file-name-nondirectory (ada-other-file-name)))
-			 ".ali"))
+		 (concat (file-name-base (ada-other-file-name)) ".ali"))
 
 
 		;;  If we still don't have an ali file, try to get the one
 		;;  from the parent unit, in case we have a separate entity.
-		(let ((parent-name (file-name-sans-extension
-				    (file-name-nondirectory file))))
+		(let ((parent-name (file-name-base file)))
 
 		  (while (and (not ali-file-name)
 			      (string-match "^\\(.*\\)[.-][^.-]*" parent-name))
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 5d758b53b56..8bccb44f308 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1818,9 +1818,7 @@ system."
 	       (t
 		;; Being evaluated interactively.
 		(buffer-file-name)))))
-    (and file
-	 (file-name-sans-extension
-	  (file-name-nondirectory file)))))
+    (and file (file-name-base file))))
 
 (defmacro c-lang-defconst-eval-immediately (form)
   "Can be used inside a VAL in `c-lang-defconst' to evaluate FORM
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 9ea42db2a8c..e95b6fa288d 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -2322,8 +2322,7 @@ to nil."
 						 nil t)))) ; Only one
 		     (progn
 		       (forward-word 1)
-		       (setq name (file-name-sans-extension
-				   (file-name-nondirectory (buffer-file-name)))
+		       (setq name (file-name-base)
 			     p (point))
 		       (insert " NAME\n\n" name
 			       " - \n\n=head1 SYNOPSIS\n\n\n\n"
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 654fd3dba8d..a410f45eeb4 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -408,7 +408,7 @@ File contents are not checked."
 This function is used in sort to move most possible file names
 to the beginning of the list (File.h -> File.cpp moved to top)."
   (and (equal (file-name-sans-extension flymake-included-file-name)
-	      (file-name-sans-extension (file-name-nondirectory file-one)))
+	      (file-name-base file-one))
        (not (equal file-one file-two))))
 
 (defcustom flymake-check-file-limit 8192
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 7123a8dd7fc..0b67bbed7ea 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2763,10 +2763,9 @@ Obeying it means displaying in another window the specified file and line."
 						  (buffer-file-name)
 						(car frame)))))
 	 ((eq key ?F)
-	  (setq subst (file-name-sans-extension
-		       (file-name-nondirectory (if insource
-						   (buffer-file-name)
-						 (car frame))))))
+	  (setq subst (file-name-base (if insource
+                                          (buffer-file-name)
+                                        (car frame)))))
 	 ((eq key ?d)
 	  (setq subst (file-name-directory (if insource
 					       (buffer-file-name)
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 015f58df3fb..a35ffd3e45d 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -5235,9 +5235,7 @@ Can run from `after-save-hook'."
 	  class
 	  (cond ((not (boundp 'idlwave-scanning-lib))
 		 (list  'buffer (buffer-file-name)))
-;		((string= (downcase
-;			   (file-name-sans-extension
-;			    (file-name-nondirectory (buffer-file-name))))
+;		((string= (downcase (file-name-base))
 ;			  (downcase name))
 ;		 (list 'lib))
 ;		(t (cons 'lib (file-name-nondirectory (buffer-file-name))))