[elpa] externals/package-x 63632d58bd 39/56: Merge from origin/emacs-26

[Philip Kaludercic]

branch: externals/package-x
commit 63632d58bd584bcd09168b8dc05197924cb1b087
Merge: 71ebeabf64 e8c6fd7d12
Author: Glenn Morris <r...@gnu.org>
Commit: Glenn Morris <r...@gnu.org>

    Merge from origin/emacs-26
    
    8fbe462 (origin/emacs-26) ; * doc/lispref/positions.texi (List Motion...
    1d9efc0 Add index for "\( in strings" (Bug#25195)
    304e96f Fix doc-string of 'fit-window-to-buffer' (Bug#36848)
    d4c4987 Update view-mode docstring
    d6ca1fc ; * lisp/term.el: Add missing / to esc seq commentary.
    b3e2073 Fix subproc listening when setting filter to non-t (Bug#36591)
    f671950 * etc/NEWS.25: Belatedly announce rcirc-reconnect-delay.
    7f42277 Mention term.el's \032 dir tracking in commentary (Bug#19524)
    e8c6fd7 Remove upload functionality of package-x from the elisp manual
    78e6c2a * etc/AUTHORS: Update.
    086a56e Clarify Gravatar docs
    0592467 * doc/lispref/display.texi (Defining Faces): Say a face can't...
    
    # Conflicts:
    #       doc/emacs/programs.texi
    #       etc/AUTHORS
    #       lisp/term.el
---
 lisp/emacs-lisp/package-x.el | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index a84c63d871..e26b6b99c1 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -47,6 +47,8 @@
 
 (defcustom package-archive-upload-base "/path/to/archive"
   "The base location of the archive to which packages are uploaded.
+The commands in the package-x library will use this as base
+location.
 This should be an absolute directory name.  If the archive is on
 another machine, you may specify a remote name in the usual way,
 e.g. \"/ssh:f...@example.com:/var/www/packages/\".
@@ -273,7 +275,9 @@ if it exists."
 (defun package-upload-buffer ()
   "Upload the current buffer as a single-file Emacs Lisp package.
 If `package-archive-upload-base' does not specify a valid upload
-destination, prompt for one."
+destination, prompt for one.
+Signal an error if the current buffer is not visiting a simple
+package (a \".el\" file)."
   (interactive)
   (save-excursion
     (save-restriction
@@ -287,8 +291,13 @@ destination, prompt for one."
 Interactively, prompt for FILE.  The package is considered a
 single-file package if FILE ends in \".el\", and a multi-file
 package if FILE ends in \".tar\".
+Automatically extract package attributes and update the archive's
+contents list with this information.
 If `package-archive-upload-base' does not specify a valid upload
-destination, prompt for one."
+destination, prompt for one.  If the directory does not exist, it
+is created.  The directory need not have any initial contents
+\(i.e., you can use this command to populate an initially empty
+archive)."
   (interactive "fPackage file name: ")
   (with-temp-buffer
     (insert-file-contents file)