[Emacs-diffs] /srv/bzr/emacs/trunk r108747: * lisp/files.el (file-name-base): New convenience function.

[Sam Steingold]

------------------------------------------------------------
revno: 108747
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Tue 2012-06-26 12:23:01 -0400
message:
  * 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.
modified:
  doc/lispref/files.texi
  lisp/ChangeLog
  lisp/autoinsert.el
  lisp/cus-dep.el
  lisp/doc-view.el
  lisp/eshell/esh-cmd.el
  lisp/files.el
  lisp/image-dired.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
  lisp/woman.el

=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi    2012-06-17 05:13:40 +0000
+++ b/doc/lispref/files.texi    2012-06-26 16:23:01 +0000
@@ -1846,6 +1846,17 @@
 not an extension.
 @end defun
 
address@hidden file-name-base &optional filename
+This function is the composition of @code{file-name-sans-extension}
+and @code{file-name-nondirectory}.  For example,
+
address@hidden
+(file-name-base "/my/home/foo.c")
+    @result{} "foo"
address@hidden example
+
+The @var{filename} argument defaults to @code{buffer-file-name}.
address@hidden defun
 
 @node Relative File Names
 @subsection Absolute and Relative File Names

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-26 07:13:40 +0000
+++ b/lisp/ChangeLog    2012-06-26 16:23:01 +0000
@@ -1,3 +1,14 @@
+2012-06-26  Sam Steingold  <address@hidden>
+
+       * files.el (file-name-base): New convenience function.
+       * autoinsert.el, cus-dep.el, doc-view.el, image-dired.el,
+       * woman.el, eshell/esh-cmd.el, progmodes/ada-xref.el,
+       * progmodes/cc-defs.el, progmodes/cperl-mode.el,
+       * progmodes/flymake.el, progmodes/gud.el, progmodes/idlwave.el,
+       * textmodes/ispell.el, textmodes/reftex-ref.el,
+       * textmodes/tex-mode.el: Use it.
+       Did not touch cedet and org because they are maintained elsewhere.
+
 2012-06-26  Martin Rudalics  <address@hidden>
 
        * calendar/calendar.el (calendar-exit): Don't try to delete or

=== modified file 'lisp/autoinsert.el'
--- a/lisp/autoinsert.el        2012-05-04 06:13:18 +0000
+++ b/lisp/autoinsert.el        2012-06-26 16:23:01 +0000
@@ -140,14 +140,14 @@
      "
 .\\\" You may distribute this file under the terms of the GNU Free
 .\\\" Documentation License.
-.TH " (file-name-sans-extension (file-name-nondirectory (buffer-file-name)))
+.TH " (file-name-base)
      " " (file-name-extension (buffer-file-name))
      " " (format-time-string "%Y-%m-%d ")
      "\n.SH NAME\n"
-     (file-name-sans-extension (file-name-nondirectory (buffer-file-name)))
+     (file-name-base)
      " \\- " str
      "\n.SH SYNOPSIS
-.B " (file-name-sans-extension (file-name-nondirectory (buffer-file-name)))
+.B " (file-name-base)
      "\n"
      _
      "
@@ -207,7 +207,7 @@
 
 
 \(provide '"
-       (file-name-sans-extension (file-name-nondirectory (buffer-file-name)))
+       (file-name-base)
        ")
 \;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n")
     (("\\.texi\\(nfo\\)?\\'" . "Texinfo file skeleton")
@@ -215,8 +215,7 @@
      "\\input texinfo   @c -*-texinfo-*-
 @c %**start of header
 @setfilename "
-     (file-name-sans-extension
-      (file-name-nondirectory (buffer-file-name))) ".info\n"
+     (file-name-base) ".info\n"
       "@settitle " str "
 @c %**end of header
 @copying\n"

=== modified file 'lisp/cus-dep.el'
--- a/lisp/cus-dep.el   2012-01-19 07:21:25 +0000
+++ b/lisp/cus-dep.el   2012-06-26 16:23:01 +0000
@@ -53,9 +53,7 @@
               (default-directory (expand-file-name subdir))
               (preloaded (concat "\\`"
                                  (regexp-opt (mapcar
-                                              (lambda (f)
-                                                (file-name-sans-extension
-                                                 (file-name-nondirectory f)))
+                                              'file-name-base
                                               preloaded-file-list) t)
                                  "\\.el\\'")))
           (dolist (file files)

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2012-04-26 12:43:28 +0000
+++ b/lisp/doc-view.el  2012-06-26 16:23:01 +0000
@@ -961,8 +961,7 @@
        ;; ODF files have to be converted to PDF before Ghostscript can
        ;; process it.
        (let ((pdf (expand-file-name "doc.pdf" doc-view-current-cache-dir))
-             (opdf (expand-file-name (concat (file-name-sans-extension
-                                              (file-name-nondirectory 
doc-view-buffer-file-name))
+             (opdf (expand-file-name (concat (file-name-base 
doc-view-buffer-file-name)
                                              ".pdf")
                                      doc-view-current-cache-dir))
              (png-file png-file))

=== modified file 'lisp/eshell/esh-cmd.el'
--- a/lisp/eshell/esh-cmd.el    2012-05-09 00:29:00 +0000
+++ b/lisp/eshell/esh-cmd.el    2012-06-26 16:23:01 +0000
@@ -1220,9 +1220,7 @@
     (if (and file
             (string-match "\\(em\\|esh\\)-\\(.*\\)\\(\\.el\\)?\\'" file))
        (let ((module-sym
-              (intern (file-name-sans-extension
-                       (file-name-nondirectory
-                        (concat "eshell-" (match-string 2 file)))))))
+              (intern (file-name-base (concat "eshell-" (match-string 2 
file))))))
          (if (and (functionp sym)
                   (or (null module-sym)
                       (eshell-using-module module-sym)

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-06-22 21:24:54 +0000
+++ b/lisp/files.el     2012-06-26 16:23:01 +0000
@@ -4083,6 +4083,12 @@
         (if period
             "")))))
 
+(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)))))
+
 (defcustom make-backup-file-name-function nil
   "A function to use instead of the default `make-backup-file-name'.
 A value of nil gives the default `make-backup-file-name' behavior.

=== modified file 'lisp/image-dired.el'
--- a/lisp/image-dired.el       2012-01-19 07:21:25 +0000
+++ b/lisp/image-dired.el       2012-06-26 16:23:01 +0000
@@ -602,14 +602,14 @@
                  (md5 (file-name-as-directory (file-name-directory f)))))
            (format "%s%s%s.thumb.%s"
                    (file-name-as-directory (expand-file-name 
(image-dired-dir)))
-                   (file-name-sans-extension (file-name-nondirectory f))
+                   (file-name-base f)
                    (if md5-hash (concat "_" md5-hash) "")
                    (file-name-extension f))))
         ((eq 'per-directory image-dired-thumbnail-storage)
          (let ((f (expand-file-name file)))
            (format "%s.image-dired/%s.thumb.%s"
                    (file-name-directory f)
-                   (file-name-sans-extension (file-name-nondirectory f))
+                   (file-name-base f)
                    (file-name-extension f))))))
 
 (defun image-dired-create-thumb (original-file thumbnail-file)

=== modified file 'lisp/progmodes/ada-xref.el'
--- a/lisp/progmodes/ada-xref.el        2012-04-09 13:05:48 +0000
+++ b/lisp/progmodes/ada-xref.el        2012-06-26 16:23:01 +0000
@@ -1544,9 +1544,7 @@
   ;;      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 @@
       (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 @@
                ;;  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))

=== modified file 'lisp/progmodes/cc-defs.el'
--- a/lisp/progmodes/cc-defs.el 2012-04-27 17:49:31 +0000
+++ b/lisp/progmodes/cc-defs.el 2012-06-26 16:23:01 +0000
@@ -1818,9 +1818,7 @@
               (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

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/cperl-mode.el      2012-06-26 16:23:01 +0000
@@ -2322,8 +2322,7 @@
                                                 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"

=== modified file 'lisp/progmodes/flymake.el'
--- a/lisp/progmodes/flymake.el 2012-06-08 16:39:49 +0000
+++ b/lisp/progmodes/flymake.el 2012-06-26 16:23:01 +0000
@@ -408,7 +408,7 @@
 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

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2012-04-22 13:58:00 +0000
+++ b/lisp/progmodes/gud.el     2012-06-26 16:23:01 +0000
@@ -2763,10 +2763,9 @@
                                                  (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)

=== modified file 'lisp/progmodes/idlwave.el'
--- a/lisp/progmodes/idlwave.el 2012-05-04 05:14:14 +0000
+++ b/lisp/progmodes/idlwave.el 2012-06-26 16:23:01 +0000
@@ -5235,9 +5235,7 @@
          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))))

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2012-06-02 10:56:09 +0000
+++ b/lisp/textmodes/ispell.el  2012-06-26 16:23:01 +0000
@@ -1064,8 +1064,7 @@
        (insert-file-contents alias-file)
        ;; Look for a line "add FOO.multi", extract FOO
        (when (search-forward-regexp "^add \\([^.]+\\)\\.multi" nil t)
-         (let* ((aliasname (file-name-sans-extension
-                            (file-name-nondirectory alias-file)))
+         (let* ((aliasname (file-name-base alias-file))
                 (already-exists-p (assoc aliasname alist))
                 (realname (match-string 1))
                 (realdict (assoc realname alist)))

=== modified file 'lisp/textmodes/reftex-ref.el'
--- a/lisp/textmodes/reftex-ref.el      2012-01-19 07:21:25 +0000
+++ b/lisp/textmodes/reftex-ref.el      2012-06-26 16:23:01 +0000
@@ -313,8 +313,7 @@
               (save-match-data
                 (cond
                  ((equal letter "f")
-                  (file-name-sans-extension
-                   (file-name-nondirectory (buffer-file-name))))
+                  (file-name-base))
                  ((equal letter "F")
                   (let ((masterdir (file-name-directory 
(reftex-TeX-master-file)))
                         (file (file-name-sans-extension (buffer-file-name))))
@@ -323,8 +322,7 @@
                         (substring file (length masterdir))
                       file)))
                  ((equal letter "m")
-                  (file-name-sans-extension
-                   (file-name-nondirectory (reftex-TeX-master-file))))
+                  (file-name-base (reftex-TeX-master-file)))
                  ((equal letter "M")
                   (file-name-nondirectory
                    (substring (file-name-directory (reftex-TeX-master-file))

=== modified file 'lisp/textmodes/tex-mode.el'
--- a/lisp/textmodes/tex-mode.el        2012-06-13 13:56:57 +0000
+++ b/lisp/textmodes/tex-mode.el        2012-06-26 16:23:01 +0000
@@ -1984,8 +1984,7 @@
       (let* ((dir (file-name-directory tex-last-temp-file))
             (list (and (file-directory-p dir)
                        (file-name-all-completions
-                        (file-name-sans-extension
-                         (file-name-nondirectory tex-last-temp-file))
+                        (file-name-base tex-last-temp-file)
                         dir))))
        (while list
          (if not-all

=== modified file 'lisp/woman.el'
--- a/lisp/woman.el     2012-04-21 05:54:39 +0000
+++ b/lisp/woman.el     2012-06-26 16:23:01 +0000
@@ -2679,8 +2679,7 @@
        ;; then use the WoMan search mechanism to find the filename ...
        (setq filename
              (woman-file-name
-              (file-name-sans-extension
-               (file-name-nondirectory name))))
+              (file-name-base name)))
        ;; Cannot find the file, so ...
        (kill-buffer (current-buffer))
        (error "File `%s' not found" name))