From 3c2baa1b95442c114f717aaf2d017986bc07a270 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Sat, 27 Jan 2024 14:01:47 +0100 Subject: [PATCH 1/2] Avoid signaling errors in emoji.el on empty input * lisp/international/emoji.el (emoji--read-emoji): Signal user-error on empty input. (Bug#68671) Do not merge to master. --- lisp/international/emoji.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el index 8134214bba5..3bb5c36e4c7 100644 --- a/lisp/international/emoji.el +++ b/lisp/international/emoji.el @@ -680,11 +680,12 @@ We prefer the earliest unique letter." strings)))) (complete-with-action action table string pred))) nil t))) - (when (cl-plusp (length name)) - (let ((glyph (if emoji-alternate-names - (cadr (split-string name "\t")) - (gethash name emoji--all-bases)))) - (cons glyph (gethash glyph emoji--derived)))))) + (if (cl-plusp (length name)) + (let ((glyph (if emoji-alternate-names + (cadr (split-string name "\t")) + (gethash name emoji--all-bases)))) + (cons glyph (gethash glyph emoji--derived))) + (user-error "You didn't specify an emoji")))) (defun emoji--choose-emoji () (pcase-let ((`(,glyph . ,derived) (emoji--read-emoji))) From b2db82c5aecd2d6f5f34941cc973177311465683 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Wed, 2 Aug 2023 21:51:18 -0700 Subject: [PATCH 2/2] * doc/lispref/package.texi (Multi-file Packages): Document ".elpaignore". (cherry picked from commit 744a10a4d722a361bc21561b4162045e4ec97ed6) --- doc/lispref/package.texi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index 6f52a33d194..ebe578932bf 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -284,6 +284,13 @@ variable @code{load-file-name} (@pxref{Loading}). Here is an example: (expand-file-name file superfrobnicator-base)) @end smallexample + If your project contains files that you don't wish to distribute to +users (e.g.@: regression tests), you can add them to an +@file{.elpaignore} file. In this file, each line lists a file or +wildcard matching files to ignore when producing your package's tar +file on ELPA. (ELPA will pass this file to @command{tar} with the +@code{-X} option.) + @node Package Archives @section Creating and Maintaining Package Archives @cindex package archive