Make FILENAME argument of 'file-name-base' mandatory
* lisp/files.el (file-name-base): Make FILENAME argument mandatory. * lisp/autoinsert.el (auto-insert-alist): * lisp/progmodes/cperl-mode.el (cperl-electric-pod): * lisp/progmodes/idlwave.el (idlwave-parse-definition): * lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes): Fix all callers.
This commit is contained in:
parent
535db535a9
commit
1eb4e5c3c8
7 changed files with 14 additions and 13 deletions
|
|
@ -2106,7 +2106,7 @@ Note that the @samp{.~3~} in the two last examples is the backup part,
|
|||
not an extension.
|
||||
@end defun
|
||||
|
||||
@defun file-name-base &optional filename
|
||||
@defun file-name-base filename
|
||||
This function is the composition of @code{file-name-sans-extension}
|
||||
and @code{file-name-nondirectory}. For example,
|
||||
|
||||
|
|
@ -2114,8 +2114,6 @@ and @code{file-name-nondirectory}. For example,
|
|||
(file-name-base "/my/home/foo.c")
|
||||
@result{} "foo"
|
||||
@end example
|
||||
|
||||
The @var{filename} argument defaults to @code{buffer-file-name}.
|
||||
@end defun
|
||||
|
||||
@node Relative File Names
|
||||
|
|
|
|||
3
etc/NEWS
3
etc/NEWS
|
|
@ -48,6 +48,9 @@ sets the XTerm window title. The default is to set the window title.
|
|||
|
||||
* Incompatible Lisp Changes in Emacs 27.1
|
||||
|
||||
** The FILENAME argument to 'file-name-base' is now mandatory and no
|
||||
longer defaults to 'buffer-file-name'.
|
||||
|
||||
|
||||
* Lisp Changes in Emacs 27.1
|
||||
|
||||
|
|
|
|||
|
|
@ -141,14 +141,14 @@ If this contains a %s, that will be replaced by the matching rule."
|
|||
"
|
||||
.\\\" You may distribute this file under the terms of the GNU Free
|
||||
.\\\" Documentation License.
|
||||
.TH " (file-name-base)
|
||||
.TH " (file-name-base (buffer-file-name))
|
||||
" " (file-name-extension (buffer-file-name))
|
||||
" " (format-time-string "%Y-%m-%d ")
|
||||
"\n.SH NAME\n"
|
||||
(file-name-base)
|
||||
(file-name-base (buffer-file-name))
|
||||
" \\- " str
|
||||
"\n.SH SYNOPSIS
|
||||
.B " (file-name-base)
|
||||
.B " (file-name-base (buffer-file-name))
|
||||
"\n"
|
||||
_
|
||||
"
|
||||
|
|
@ -211,7 +211,7 @@ If this contains a %s, that will be replaced by the matching rule."
|
|||
|
||||
|
||||
\(provide '"
|
||||
(file-name-base)
|
||||
(file-name-base (buffer-file-name))
|
||||
")
|
||||
\;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n")
|
||||
(("\\.texi\\(nfo\\)?\\'" . "Texinfo file skeleton")
|
||||
|
|
@ -219,7 +219,7 @@ If this contains a %s, that will be replaced by the matching rule."
|
|||
"\\input texinfo @c -*-texinfo-*-
|
||||
@c %**start of header
|
||||
@setfilename "
|
||||
(file-name-base) ".info\n"
|
||||
(file-name-base (buffer-file-name)) ".info\n"
|
||||
"@settitle " str "
|
||||
@c %**end of header
|
||||
@copying\n"
|
||||
|
|
|
|||
|
|
@ -4479,8 +4479,8 @@ extension, the value is \"\"."
|
|||
"")))))
|
||||
|
||||
(defun file-name-base (&optional filename)
|
||||
"Return the base name of the FILENAME: no directory, no extension.
|
||||
FILENAME defaults to `buffer-file-name'."
|
||||
"Return the base name of the FILENAME: no directory, no extension."
|
||||
(declare (advertised-calling-convention (filename) "27.1"))
|
||||
(file-name-sans-extension
|
||||
(file-name-nondirectory (or filename (buffer-file-name)))))
|
||||
|
||||
|
|
|
|||
|
|
@ -2314,7 +2314,7 @@ to nil."
|
|||
nil t)))) ; Only one
|
||||
(progn
|
||||
(forward-word-strictly 1)
|
||||
(setq name (file-name-base)
|
||||
(setq name (file-name-base (buffer-file-name))
|
||||
p (point))
|
||||
(insert " NAME\n\n" name
|
||||
" - \n\n=head1 SYNOPSIS\n\n\n\n"
|
||||
|
|
|
|||
|
|
@ -5240,7 +5240,7 @@ Can run from `after-save-hook'."
|
|||
class
|
||||
(cond ((not (boundp 'idlwave-scanning-lib))
|
||||
(list 'buffer (buffer-file-name)))
|
||||
; ((string= (downcase (file-name-base))
|
||||
; ((string= (downcase (file-name-base (buffer-file-name))
|
||||
; (downcase name))
|
||||
; (list 'lib))
|
||||
; (t (cons 'lib (file-name-nondirectory (buffer-file-name))))
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ also applies `reftex-translate-to-ascii-function' to the string."
|
|||
(save-match-data
|
||||
(cond
|
||||
((equal letter "f")
|
||||
(file-name-base))
|
||||
(file-name-base (buffer-file-name)))
|
||||
((equal letter "F")
|
||||
(let ((masterdir (file-name-directory (reftex-TeX-master-file)))
|
||||
(file (file-name-sans-extension (buffer-file-name))))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue