diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-11-02 09:27:40 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-11-02 09:27:40 -0800 |
| commit | 018e0c36fbae6570e58a95d2ac47c0577a496f91 (patch) | |
| tree | 058be5b8f0a5145d8739e240058c37d1d267afbf /lisp/emacs-lisp | |
| parent | e654b41c6f9eae424736bc8845d92b9dd97ccd3e (diff) | |
| parent | 1fc9de4b81ceacabef6aafe48ecaabaf76f34bb2 (diff) | |
| download | emacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.tar.gz emacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.tar.bz2 emacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.zip | |
Merge from origin/emacs-27
1fc9de4b81 Improve reproducibility of generated -pkg.el files
da6234e2df Make sure pixel sizes are zero when setting window size fo...
2d15296db1 Fix failure of 'emacs --daemon' on Cygwin
8abce5b0c6 CC Mode: Only recognize foo (*bar) as a function pointer w...
85d1d8d768 Fix NEWS entry for fix of Bug#44080
2443b15a91 * src/buffer.c (syms_of_buffer) <fill-column>: Improve doc...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 23692aab32a..fbab6debd5d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -982,7 +982,8 @@ untar into a directory named DIR; otherwise, signal an error." (write-region (concat ";;; Generated package description from " - (replace-regexp-in-string "-pkg\\.el\\'" ".el" pkg-file) + (replace-regexp-in-string "-pkg\\.el\\'" ".el" + (file-name-nondirectory pkg-file)) " -*- no-byte-compile: t -*-\n" (prin1-to-string (nconc |