diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2025-02-22 17:52:15 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2025-02-22 17:52:15 +0200 |
| commit | ef8fdd269a244f94f970f51c909eff5de4702048 (patch) | |
| tree | 0ab3207caa7509cff7b60d68057f57f7bcf88c9f /lisp/emacs-lisp | |
| parent | ce28916282800b2e4a5f8e244616e25f9e81831a (diff) | |
| parent | 72d7f1922611e01d01fbe407a577ab95afb0ddd7 (diff) | |
| download | emacs-ef8fdd269a244f94f970f51c909eff5de4702048.tar.gz emacs-ef8fdd269a244f94f970f51c909eff5de4702048.tar.bz2 emacs-ef8fdd269a244f94f970f51c909eff5de4702048.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-lib.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package-vc.el | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 4a83e9d6a7c..2a952b57646 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -286,7 +286,7 @@ This function is considered deprecated in favor of the built-in function "Return t if INTEGER is odd. This function is considered deprecated in favor of the built-in function -`evenp' that was added in Emacs 31.1.") +`oddp' that was added in Emacs 31.1.") (defalias 'cl-evenp #'evenp "Return t if INTEGER is even. diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index a18841fb64d..7455bfba69e 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -271,7 +271,11 @@ asynchronously." (defun package-vc--generate-description-file (pkg-desc pkg-file) "Generate a package description file for PKG-DESC and write it to PKG-FILE." (let ((name (package-desc-name pkg-desc))) - ;; Infer the subject if missing. + (when (equal (package-desc-summary pkg-desc) package--default-summary) + ;; We unset the package description if it is just the default + ;; summary, so that the following heuristic can take effect. + (setf (package-desc-summary pkg-desc) nil)) + ;; Infer the package description if missing. (unless (package-desc-summary pkg-desc) (setf (package-desc-summary pkg-desc) (let ((main-file (package-vc--main-file pkg-desc))) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index dc6f71af7db..2a1045b18ed 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -4525,7 +4525,7 @@ of an installed ELPA package. The return value is a string (or nil in case we can't find it). It works in more cases if the call is in the file which contains the `Version:' header." - ;; In a sense, this is a lie, but it does just what we want: precompute + ;; In a sense, this is a lie, but it does just what we want: precomputes ;; the version at compile time and hardcodes it into the .elc file! (declare (pure t)) ;; Hack alert! |