diff --git a/elpa/cython-mode-0.29.22/cython-mode-pkg.el b/elpa/cython-mode-0.29.22/cython-mode-pkg.el deleted file mode 100644 index 015f83b..0000000 --- a/elpa/cython-mode-0.29.22/cython-mode-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; Generated package description from cython-mode.el -*- no-byte-compile: t -*- -(define-package "cython-mode" "0.29.22" "Major mode for editing Cython files" 'nil :commit "3e470fcc3a4e9a33b66d5db6ab761c773888a1ea") diff --git a/elpa/cython-mode-0.29.22/cython-mode-autoloads.el b/elpa/cython-mode-0.29.23/cython-mode-autoloads.el similarity index 100% rename from elpa/cython-mode-0.29.22/cython-mode-autoloads.el rename to elpa/cython-mode-0.29.23/cython-mode-autoloads.el diff --git a/elpa/cython-mode-0.29.23/cython-mode-pkg.el b/elpa/cython-mode-0.29.23/cython-mode-pkg.el new file mode 100644 index 0000000..0bf2c7c --- /dev/null +++ b/elpa/cython-mode-0.29.23/cython-mode-pkg.el @@ -0,0 +1,2 @@ +;;; Generated package description from cython-mode.el -*- no-byte-compile: t -*- +(define-package "cython-mode" "0.29.23" "Major mode for editing Cython files" 'nil :commit "17670781083e3ccfedb1af4adcec614d4599eef9") diff --git a/elpa/cython-mode-0.29.22/cython-mode.el b/elpa/cython-mode-0.29.23/cython-mode.el similarity index 99% rename from elpa/cython-mode-0.29.22/cython-mode.el rename to elpa/cython-mode-0.29.23/cython-mode.el index b195c82..c6591b5 100644 --- a/elpa/cython-mode-0.29.22/cython-mode.el +++ b/elpa/cython-mode-0.29.23/cython-mode.el @@ -1,6 +1,6 @@ ;;; cython-mode.el --- Major mode for editing Cython files -;; Package-Version: 0.29.22 -;; Package-Commit: 3e470fcc3a4e9a33b66d5db6ab761c773888a1ea +;; Package-Version: 0.29.23 +;; Package-Commit: 17670781083e3ccfedb1af4adcec614d4599eef9 ;; License: Apache-2.0 diff --git a/elpa/ghub-3.5.1/buck.el b/elpa/ghub-3.5.2/buck.el similarity index 98% rename from elpa/ghub-3.5.1/buck.el rename to elpa/ghub-3.5.2/buck.el index b6d1ba6..20208c9 100644 --- a/elpa/ghub-3.5.1/buck.el +++ b/elpa/ghub-3.5.2/buck.el @@ -1,10 +1,11 @@ ;;; buck.el --- minuscule client library for the Bitbucket API -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Jonas Bernoulli +;; Copyright (C) 2016-2021 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/ghub ;; Keywords: tools +;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is not part of GNU Emacs. diff --git a/elpa/ghub-3.5.1/dir b/elpa/ghub-3.5.2/dir similarity index 100% rename from elpa/ghub-3.5.1/dir rename to elpa/ghub-3.5.2/dir diff --git a/elpa/ghub-3.5.1/ghub-autoloads.el b/elpa/ghub-3.5.2/ghub-autoloads.el similarity index 100% rename from elpa/ghub-3.5.1/ghub-autoloads.el rename to elpa/ghub-3.5.2/ghub-autoloads.el diff --git a/elpa/ghub-3.5.1/ghub-graphql.el b/elpa/ghub-3.5.2/ghub-graphql.el similarity index 86% rename from elpa/ghub-3.5.1/ghub-graphql.el rename to elpa/ghub-3.5.2/ghub-graphql.el index c12620f..8cbe8cc 100644 --- a/elpa/ghub-3.5.1/ghub-graphql.el +++ b/elpa/ghub-3.5.2/ghub-graphql.el @@ -1,9 +1,11 @@ ;;; ghub-graphql.el --- access Github API using GrapthQL -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Jonas Bernoulli +;; Copyright (C) 2016-2021 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/ghub +;; Keywords: tools +;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is not part of GNU Emacs. @@ -154,9 +156,11 @@ behave as for `ghub-request' (which see)." body (baseRef name (repository nameWithOwner)) + baseRefOid (headRef name (repository (owner login) nameWithOwner)) + headRefOid (assignees [(:edges t)] id) (reviewRequests [(:edges t)] @@ -170,9 +174,38 @@ behave as for `ghub-request' (which see)." (labels [(:edges t)] id))))) +(defconst ghub-fetch-repository-review-threads + '(query + (repository + [(owner $owner String!) + (name $name String!)] + (pullRequests [(:edges t) + (:singular pullRequest number) + (orderBy ((field UPDATED_AT) (direction DESC)))] + number + baseRefOid + headRefOid + (reviewThreads [(:edges t)] + id + line + originalLine + diffSide + (resolvedBy login) + (comments [(:edges t)] + id + databaseId + (author login) + createdAt + updatedAt + body + (replyTo databaseId) + (originalCommit oid) + path)))))) + (cl-defun ghub-fetch-repository (owner name callback &optional until - &key username auth host forge errorback) + &key username auth host forge + headers errorback) "Asynchronously fetch forge data about the specified repository. Once all data has been collected, CALLBACK is called with the data as the only argument." @@ -185,11 +218,13 @@ data as the only argument." :auth auth :host host :forge forge + :headers headers :errorback errorback)) (cl-defun ghub-fetch-issue (owner name number callback &optional until - &key username auth host forge errorback) + &key username auth host forge + headers errorback) "Asynchronously fetch forge data about the specified issue. Once all data has been collected, CALLBACK is called with the data as the only argument." @@ -204,11 +239,13 @@ data as the only argument." :auth auth :host host :forge forge + :headers headers :errorback errorback)) (cl-defun ghub-fetch-pullreq (owner name number callback &optional until - &key username auth host forge errorback) + &key username auth host forge + headers errorback) "Asynchronously fetch forge data about the specified pull-request. Once all data has been collected, CALLBACK is called with the data as the only argument." @@ -223,6 +260,28 @@ data as the only argument." :auth auth :host host :forge forge + :headers headers + :errorback errorback)) + +(cl-defun ghub-fetch-review-threads (owner name number callback + &optional until + &key username auth host forge + headers errorback) + "Asynchronously fetch forge data about the review threads from a pull-request. +Once all data has been collected, CALLBACK is called with the +data as the only argument." + (ghub--graphql-vacuum (ghub--graphql-prepare-query + ghub-fetch-repository-review-threads + `(repository pullRequests (pullRequest . ,number))) + `((owner . ,owner) + (name . ,name)) + callback until + :narrow '(repository pullRequest) + :username username + :auth auth + :host host + :forge forge + :headers headers :errorback errorback)) ;;; Internal @@ -241,7 +300,7 @@ data as the only argument." (cl-defun ghub--graphql-vacuum (query variables callback &optional until &key narrow username auth host forge - errorback) + headers errorback) "Make a GraphQL request using QUERY and VARIABLES. See Info node `(ghub)GraphQL Support'." (unless host @@ -256,7 +315,7 @@ See Info node `(ghub)GraphQL Support'." (substring host 0 -3) host))) :method "POST" - :headers (ghub--headers nil host auth username forge) + :headers (ghub--headers headers host auth username forge) :handler 'ghub--graphql-handle-response :query query :variables variables diff --git a/elpa/ghub-3.5.1/ghub-pkg.el b/elpa/ghub-3.5.2/ghub-pkg.el similarity index 70% rename from elpa/ghub-3.5.1/ghub-pkg.el rename to elpa/ghub-3.5.2/ghub-pkg.el index a1c5551..8cdde98 100644 --- a/elpa/ghub-3.5.1/ghub-pkg.el +++ b/elpa/ghub-3.5.2/ghub-pkg.el @@ -1,8 +1,8 @@ -(define-package "ghub" "3.5.1" "Minuscule client libraries for Git forge APIs." +(define-package "ghub" "3.5.2" "Minuscule client libraries for Git forge APIs." '((emacs "25.1") (let-alist "1.0.5") (treepy "0.1.1")) - :commit "5fae5e31586a11a2025168030e0eb3876502611c" :authors + :commit "d6e6b0666104f3896d05d2b03d08d84d9dca096f" :authors '(("Jonas Bernoulli" . "jonas@bernoul.li")) :maintainer '("Jonas Bernoulli" . "jonas@bernoul.li") diff --git a/elpa/ghub-3.5.1/ghub.el b/elpa/ghub-3.5.2/ghub.el similarity index 99% rename from elpa/ghub-3.5.1/ghub.el rename to elpa/ghub-3.5.2/ghub.el index 93b3f88..6649d87 100644 --- a/elpa/ghub-3.5.1/ghub.el +++ b/elpa/ghub-3.5.2/ghub.el @@ -1,10 +1,11 @@ ;;; ghub.el --- minuscule client libraries for Git forge APIs -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Jonas Bernoulli +;; Copyright (C) 2016-2021 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/ghub ;; Keywords: tools +;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is not part of GNU Emacs. @@ -651,10 +652,10 @@ and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341.") (and payload (progn (unless (stringp payload) - ;; Unfortunately `json-encode-list' may modify the input. + ;; Unfortunately `json-encode' may modify the input. ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40693. ;; and https://github.com/magit/forge/issues/267 - (setq payload (json-encode-list (copy-tree payload)))) + (setq payload (json-encode (copy-tree payload)))) (encode-coding-string payload 'utf-8)))) (defun ghub--url-encode-params (params) diff --git a/elpa/ghub-3.5.1/ghub.info b/elpa/ghub-3.5.2/ghub.info similarity index 98% rename from elpa/ghub-3.5.1/ghub.info rename to elpa/ghub-3.5.2/ghub.info index 233b251..c0555e7 100644 --- a/elpa/ghub-3.5.1/ghub.info +++ b/elpa/ghub-3.5.2/ghub.info @@ -1,6 +1,6 @@ -This is ghub.info, produced by makeinfo version 6.5 from ghub.texi. +This is ghub.info, produced by makeinfo version 6.7 from ghub.texi. - Copyright (C) 2017-2020 Jonas Bernoulli + Copyright (C) 2017-2021 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -26,9 +26,9 @@ Ghub User and Developer Manual Ghub is an Emacs library that is used by various packages to access the APIs of various instances of various Git forge implementations. -This manual is for Ghub version 3.4.2 (v3.4.2-2-g2eb4898+1). +This manual is for Ghub version 3.5.2. - Copyright (C) 2017-2020 Jonas Bernoulli + Copyright (C) 2017-2021 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -342,7 +342,7 @@ contain unknown values such as your name. Just go to the general settings page of the respective host and then go from there. Except on ‘gitea’ and ‘gogs’ each token can be limited to certain -"scopes", i.e. it is possible to limit for which purposes any given +"scopes", i.e., it is possible to limit for which purposes any given token can be used. Before you create a token to be used for a certain package, you @@ -1183,26 +1183,26 @@ Appendix B Variable Index  Tag Table: Node: Top764 -Node: Introduction2310 -Node: Getting Started2715 -Node: Basic Concepts Arguments and Variables4397 -Node: Setting the Username8267 -Node: Creating and Storing a Token11158 -Node: Creating a Token11422 -Node: Storing a Token12441 -Node: Github Configuration Variables14286 -Node: API16000 -Node: Their APIs16238 -Node: Making REST Requests16969 -Node: Making GraphQL Requests26401 -Node: Github Convenience Wrappers33035 -Node: Non-Github Convenience Wrappers36742 -Node: Notes42248 -Node: Using Ghub in Personal Scripts42455 -Node: Using Ghub in Your Own Package43346 -Node: Forge Limitations and Notes44281 -Node: Function Index45254 -Node: Variable Index50903 +Node: Introduction2288 +Node: Getting Started2693 +Node: Basic Concepts Arguments and Variables4375 +Node: Setting the Username8245 +Node: Creating and Storing a Token11136 +Node: Creating a Token11400 +Node: Storing a Token12419 +Node: Github Configuration Variables14264 +Node: API15978 +Node: Their APIs16216 +Node: Making REST Requests16947 +Node: Making GraphQL Requests26379 +Node: Github Convenience Wrappers33013 +Node: Non-Github Convenience Wrappers36720 +Node: Notes42226 +Node: Using Ghub in Personal Scripts42433 +Node: Using Ghub in Your Own Package43324 +Node: Forge Limitations and Notes44259 +Node: Function Index45232 +Node: Variable Index50881  End Tag Table diff --git a/elpa/ghub-3.5.1/glab.el b/elpa/ghub-3.5.2/glab.el similarity index 98% rename from elpa/ghub-3.5.1/glab.el rename to elpa/ghub-3.5.2/glab.el index 98d2e95..87ed100 100644 --- a/elpa/ghub-3.5.1/glab.el +++ b/elpa/ghub-3.5.2/glab.el @@ -1,10 +1,11 @@ ;;; glab.el --- minuscule client library for the Gitlab API -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Jonas Bernoulli +;; Copyright (C) 2016-2021 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/ghub ;; Keywords: tools +;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is not part of GNU Emacs. diff --git a/elpa/ghub-3.5.1/gogs.el b/elpa/ghub-3.5.2/gogs.el similarity index 98% rename from elpa/ghub-3.5.1/gogs.el rename to elpa/ghub-3.5.2/gogs.el index 579ab56..41ecbfd 100644 --- a/elpa/ghub-3.5.1/gogs.el +++ b/elpa/ghub-3.5.2/gogs.el @@ -1,10 +1,11 @@ ;;; gogs.el --- minuscule client library for the Gogs API -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Jonas Bernoulli +;; Copyright (C) 2016-2021 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/ghub ;; Keywords: tools +;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is not part of GNU Emacs. diff --git a/elpa/ghub-3.5.1/gsexp.el b/elpa/ghub-3.5.2/gsexp.el similarity index 97% rename from elpa/ghub-3.5.1/gsexp.el rename to elpa/ghub-3.5.2/gsexp.el index 52578f1..ee85d96 100644 --- a/elpa/ghub-3.5.1/gsexp.el +++ b/elpa/ghub-3.5.2/gsexp.el @@ -1,10 +1,11 @@ ;;; gsexp.el --- GraphQl as S-expressions -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Jonas Bernoulli +;; Copyright (C) 2016-2021 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/ghub ;; Keywords: tools +;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is not part of GNU Emacs. diff --git a/elpa/ghub-3.5.1/gtea.el b/elpa/ghub-3.5.2/gtea.el similarity index 98% rename from elpa/ghub-3.5.1/gtea.el rename to elpa/ghub-3.5.2/gtea.el index 7e1e7be..9b2faac 100644 --- a/elpa/ghub-3.5.1/gtea.el +++ b/elpa/ghub-3.5.2/gtea.el @@ -1,10 +1,11 @@ ;;; gtea.el --- minuscule client library for the Gitea API -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Jonas Bernoulli +;; Copyright (C) 2016-2021 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/ghub ;; Keywords: tools +;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is not part of GNU Emacs. diff --git a/elpa/ivy-20210311.1638/colir.el b/elpa/ivy-20210518.1815/colir.el similarity index 100% rename from elpa/ivy-20210311.1638/colir.el rename to elpa/ivy-20210518.1815/colir.el diff --git a/elpa/ivy-20210311.1638/dir b/elpa/ivy-20210518.1815/dir similarity index 100% rename from elpa/ivy-20210311.1638/dir rename to elpa/ivy-20210518.1815/dir diff --git a/elpa/ivy-20210311.1638/elpa.el b/elpa/ivy-20210518.1815/elpa.el similarity index 100% rename from elpa/ivy-20210311.1638/elpa.el rename to elpa/ivy-20210518.1815/elpa.el diff --git a/elpa/ivy-20210311.1638/ivy-autoloads.el b/elpa/ivy-20210518.1815/ivy-autoloads.el similarity index 100% rename from elpa/ivy-20210311.1638/ivy-autoloads.el rename to elpa/ivy-20210518.1815/ivy-autoloads.el diff --git a/elpa/ivy-20210311.1638/ivy-faces.el b/elpa/ivy-20210518.1815/ivy-faces.el similarity index 100% rename from elpa/ivy-20210311.1638/ivy-faces.el rename to elpa/ivy-20210518.1815/ivy-faces.el diff --git a/elpa/ivy-20210311.1638/ivy-help.org b/elpa/ivy-20210518.1815/ivy-help.org similarity index 100% rename from elpa/ivy-20210311.1638/ivy-help.org rename to elpa/ivy-20210518.1815/ivy-help.org diff --git a/elpa/ivy-20210311.1638/ivy-overlay.el b/elpa/ivy-20210518.1815/ivy-overlay.el similarity index 100% rename from elpa/ivy-20210311.1638/ivy-overlay.el rename to elpa/ivy-20210518.1815/ivy-overlay.el diff --git a/elpa/ivy-20210311.1638/ivy-pkg.el b/elpa/ivy-20210518.1815/ivy-pkg.el similarity index 66% rename from elpa/ivy-20210311.1638/ivy-pkg.el rename to elpa/ivy-20210518.1815/ivy-pkg.el index ff75692..33bf113 100644 --- a/elpa/ivy-20210311.1638/ivy-pkg.el +++ b/elpa/ivy-20210518.1815/ivy-pkg.el @@ -1,6 +1,6 @@ -(define-package "ivy" "20210311.1638" "Incremental Vertical completYon" +(define-package "ivy" "20210518.1815" "Incremental Vertical completYon" '((emacs "24.5")) - :commit "bb7965aa645982c9a80bd9e772538a210b645942" :authors + :commit "a5eade0c77b7dd78cdea0f246683c6cb00f7b7c6" :authors '(("Oleh Krehel" . "ohwoeowho@gmail.com")) :maintainer '("Oleh Krehel" . "ohwoeowho@gmail.com") diff --git a/elpa/ivy-20210311.1638/ivy.el b/elpa/ivy-20210518.1815/ivy.el similarity index 98% rename from elpa/ivy-20210311.1638/ivy.el rename to elpa/ivy-20210518.1815/ivy.el index 48ffa66..655d777 100644 --- a/elpa/ivy-20210311.1638/ivy.el +++ b/elpa/ivy-20210518.1815/ivy.el @@ -1894,6 +1894,7 @@ The child caller inherits and can override the settings of the parent.") unwind-fn index-fn sort-fn + sort-matches-fn format-fn display-fn display-transformer-fn @@ -1921,6 +1922,8 @@ The child caller inherits and can override the settings of the parent.") (ivy--alist-set 'ivy-index-functions-alist caller index-fn)) (when sort-fn (ivy--alist-set 'ivy-sort-functions-alist caller sort-fn)) + (when sort-matches-fn + (ivy--alist-set 'ivy-sort-matches-functions-alist caller sort-matches-fn)) (when format-fn (ivy--alist-set 'ivy-format-functions-alist caller format-fn)) (when display-fn @@ -2214,6 +2217,13 @@ customizations apply to the current completion session." (defvar Info-complete-menu-buffer) +(defun ivy--alist-to-cands (alist) + "Transform ALIST to a list of strings." + (let ((i -1)) + (mapcar (lambda (x) + (propertize x 'idx (cl-incf i))) + (all-completions "" alist)))) + (defun ivy--reset-state (state) "Reset the ivy to STATE. This is useful for recursive `ivy-read'." @@ -2335,10 +2345,7 @@ This is useful for recursive `ivy-read'." (setq collection (sort (copy-sequence collection) sort-fn)) (setq sort nil)) (setf (ivy-state-collection ivy-last) collection) - (setq coll (let ((i -1)) - (mapcar (lambda (x) - (propertize x 'idx (cl-incf i))) - (all-completions "" collection))))) + (setq coll (ivy--alist-to-cands collection))) ((or (functionp collection) (byte-code-function-p collection) (vectorp collection) @@ -2505,6 +2512,12 @@ behavior." (declare-function mc/all-fake-cursors "ext:multiple-cursors-core") +;; Kludge: Try to retain original minibuffer completion data. +(defvar ivy--minibuffer-table) +(defvar ivy--minibuffer-pred) +(defvar ivy--minibuffer-try nil + "Store original `try-completion' result for sole completions.") + (defun ivy-completion-in-region-action (str) "Insert STR, erasing the previous one. The previous string is between `ivy-completion-beg' and `ivy-completion-end'." @@ -2520,7 +2533,15 @@ The previous string is between `ivy-completion-beg' and `ivy-completion-end'." (delete-region beg end)) (setq ivy-completion-beg (point)) (insert (substring-no-properties str)) - (completion--done str 'exact) + (let ((minibuffer-completion-table (if (boundp 'ivy--minibuffer-table) + ivy--minibuffer-table + (ivy-state-collection ivy-last))) + (minibuffer-completion-predicate (if (boundp 'ivy--minibuffer-pred) + ivy--minibuffer-pred + (ivy-state-predicate ivy-last)))) + (completion--done str (cond ((eq ivy--minibuffer-try t) 'finished) + ((eq ivy-exit 'done) 'unknown) + ('exact)))) (setq ivy-completion-end (point)) (save-excursion (dolist (cursor fake-cursors) @@ -2560,8 +2581,12 @@ See `completion-in-region' for further information." (let* ((enable-recursive-minibuffers t) (str (buffer-substring-no-properties start end)) (completion-ignore-case (ivy--case-fold-p str)) - (comps - (completion-all-completions str collection predicate (- end start)))) + (md (completion-metadata str collection predicate)) + (reg (- end start)) + (comps (completion-all-completions str collection predicate reg md)) + (try (completion-try-completion str collection predicate reg md)) + (ivy--minibuffer-table collection) + (ivy--minibuffer-pred predicate)) (cond ((null comps) (message "No matches")) ((progn @@ -2588,8 +2613,9 @@ See `completion-in-region' for further information." (progn (unless (minibuffer-window-active-p (selected-window)) (setf (ivy-state-window ivy-last) (selected-window))) - (ivy-completion-in-region-action - (substring-no-properties (car comps)))) + (let ((ivy--minibuffer-try try)) + (ivy-completion-in-region-action + (substring-no-properties (car comps))))) (dolist (s comps) ;; Remove face `completions-first-difference'. (ivy--remove-props s 'face)) @@ -3042,6 +3068,26 @@ parts beyond their respective faces `ivy-confirm-face' and (funcall fn (ivy-state-prompt ivy-last)))) ivy--prompt))) +(defun ivy--break-lines (str width) + "Break each line in STR with newlines to fit into WIDTH columns." + (if (<= width 0) + str + (let (lines) + (dolist (line (split-string str "\n")) + (while (and line (> (string-width line) width)) + (let ((prefix "") (extra 0)) + (while (string-empty-p prefix) + ;; Grow `width' until it fits at least one char from `line'. + (setq prefix (truncate-string-to-width line (+ width extra))) + (setq extra (1+ extra))) + ;; Avoid introducing spurious newline if `prefix' and `line' are + ;; equal, i.e., if `line' couldn't be truncated to `width'. + (setq line (and (> (length line) (length prefix)) + (substring line (length prefix)))) + (push prefix lines))) + (when line (push line lines))) + (string-join (nreverse lines) "\n")))) + (defun ivy--insert-prompt () "Update the prompt according to `ivy--prompt'." (when (setq ivy--prompt (ivy-prompt)) @@ -3082,13 +3128,13 @@ parts beyond their respective faces `ivy-confirm-face' and (save-excursion (goto-char (point-min)) (delete-region (point-min) (minibuffer-prompt-end)) - (let ((len-n (length n-str)) - (len-d (length d-str)) + (let ((wid-n (string-width n-str)) + (wid-d (string-width d-str)) (ww (window-width))) (setq n-str - (cond ((> (+ len-n len-d) ww) + (cond ((> (+ wid-n wid-d) ww) (concat n-str "\n" d-str "\n")) - ((> (+ len-n len-d (length ivy-text)) ww) + ((> (+ wid-n wid-d (string-width ivy-text)) ww) (concat n-str d-str "\n")) (t (concat n-str d-str))))) @@ -3096,11 +3142,7 @@ parts beyond their respective faces `ivy-confirm-face' and (setq n-str (concat (funcall ivy-pre-prompt-function) n-str))) (when ivy-add-newline-after-prompt (setq n-str (concat n-str "\n"))) - (let ((regex (format "\\([^\n]\\{%d\\}\\)[^\n]" (window-width)))) - (while (string-match regex n-str) - (setq n-str (replace-match - (concat (match-string 1 n-str) "\n") - nil t n-str 1)))) + (setq n-str (ivy--break-lines n-str (window-width))) (set-text-properties 0 (length n-str) `(face minibuffer-prompt ,@std-props) n-str) diff --git a/elpa/ivy-20210311.1638/ivy.info b/elpa/ivy-20210518.1815/ivy.info similarity index 95% rename from elpa/ivy-20210311.1638/ivy.info rename to elpa/ivy-20210518.1815/ivy.info index 6a373d8..6f91e18 100644 --- a/elpa/ivy-20210311.1638/ivy.info +++ b/elpa/ivy-20210518.1815/ivy.info @@ -1,4 +1,4 @@ -This is ivy.info, produced by makeinfo version 6.5 from ivy.texi. +This is ivy.info, produced by makeinfo version 6.7 from ivy.texi. Ivy manual, version 0.13.4 @@ -459,11 +459,11 @@ extends usability of lists in Emacs. (should (equal (ivy-with - '(progn - (ivy-read "Test: " '("can do" "can't, sorry" "other")) - ivy-text) - "c ") - "can")) + '(progn + (ivy-read "Test: " '("can do" "can't, sorry" "other")) + ivy-text) + "c ") + "can")) ‘C-M-j’ (‘ivy-immediate-done’) .............................. @@ -652,7 +652,7 @@ jjjj’ in Hydra. Toggle calling the action after each candidate change. It modifies ‘j’ to ‘jg’, ‘k’ to ‘kg’ etc. -‘m’ (‘ivy-rotate-preferred-builders’) +‘M’ (‘ivy-rotate-preferred-builders’) ..................................... Rotate the current regexp matcher. @@ -784,7 +784,7 @@ completion: (setq ivy-re-builders-alist '((read-file-name-internal . ivy--regex-fuzzy) - (t . ivy--regex-plus))) + (t . ivy--regex-plus))) Here, ‘read-file-name-internal’ is a function that is passed as the second argument to ‘completing-read’ for file name completion. @@ -1156,10 +1156,10 @@ File: ivy.info, Node: Example - define a new command with several actions, Pre (defun my-command-with-3-actions () (interactive) (ivy-read "test: " '("foo" "bar" "baz") - :action '(1 - ("o" my-action-1 "action 1") - ("j" my-action-2 "action 2") - ("k" my-action-3 "action 3")))) + :action '(1 + ("o" my-action-1 "action 1") + ("j" my-action-2 "action 2") + ("k" my-action-3 "action 3")))) The number 1 above is the index of the default action. Each action has its own string description for easy selection. @@ -1571,20 +1571,20 @@ argument. "Forward to `describe-function'." (interactive) (ivy-read "Describe function: " - (let (cands) - (mapatoms - (lambda (x) - (when (fboundp x) - (push (symbol-name x) cands)))) - cands) - :keymap counsel-describe-map - :preselect (ivy-thing-at-point) - :history 'counsel-describe-symbol-history - :require-match t - :action (lambda (x) - (describe-function - (intern x))) - :caller 'counsel-describe-function)) + (let (cands) + (mapatoms + (lambda (x) + (when (fboundp x) + (push (symbol-name x) cands)))) + cands) + :keymap counsel-describe-map + :preselect (ivy-thing-at-point) + :history 'counsel-describe-symbol-history + :require-match t + :action (lambda (x) + (describe-function + (intern x))) + :caller 'counsel-describe-function)) Here are the interesting features of the above function, in the order that they appear: @@ -1641,9 +1641,9 @@ narrowing) or select a candidate from the visible collection. (progn (counsel--async-command (format "locate %s '%s'" - (mapconcat #'identity counsel-locate-options " ") - (counsel--elisp-to-pcre - (ivy--regex str)))) + (mapconcat #'identity counsel-locate-options " ") + (counsel--elisp-to-pcre + (ivy--regex str)))) '("" "working...")))) ;;;###autoload @@ -1652,15 +1652,15 @@ narrowing) or select a candidate from the visible collection. INITIAL-INPUT can be given as the initial minibuffer input." (interactive) (ivy-read "Locate: " #'counsel-locate-function - :initial-input initial-input - :dynamic-collection t - :history 'counsel-locate-history - :action (lambda (file) - (with-ivy-window - (when file - (find-file file)))) - :unwind #'counsel-delete-process - :caller 'counsel-locate)) + :initial-input initial-input + :dynamic-collection t + :history 'counsel-locate-history + :action (lambda (file) + (with-ivy-window + (when file + (find-file file)))) + :unwind #'counsel-delete-process + :caller 'counsel-locate)) Here are the interesting features of the above functions, in the order that they appear: @@ -1701,18 +1701,18 @@ each displayed strings. (defun find-candidates-function (str pred _) (let ((props '(1 2)) - (strs '("foo" "foo2"))) + (strs '("foo" "foo2"))) (cl-mapcar (lambda (s p) (propertize s 'property p)) - strs - props))) + strs + props))) (defun find-candidates () (interactive) (ivy-read "Find symbols: " - #'find-candidates-function - :action (lambda (x) - (message "Value: %s" (get-text-property 0 'property x) - )))) + #'find-candidates-function + :action (lambda (x) + (message "Value: %s" + (get-text-property 0 'property x))))) Here are the interesting features of the above function: @@ -1881,7 +1881,7 @@ File: ivy.info, Node: Keystroke Index, Prev: Variable Index, Up: Top (line 26) * k: Saving the current completion session to a buffer. (line 31) -* m: Hydra in the minibuffer. +* M: Hydra in the minibuffer. (line 40) * M-i: Key bindings that alter the minibuffer input. (line 23) @@ -1929,41 +1929,41 @@ Node: Global key bindings9238 Node: Minibuffer key bindings11712 Node: Key bindings for navigation12944 Node: Key bindings for single selection action then exit minibuffer14151 -Node: Key bindings for multiple selections and actions keep minibuffer open16798 -Node: Key bindings that alter the minibuffer input19419 -Node: Other key bindings21364 -Node: Hydra in the minibuffer21742 -Node: Saving the current completion session to a buffer24160 -Node: Completion Styles25572 -Node: ivy--regex-plus27323 -Node: ivy--regex-ignore-order28809 -Node: ivy--regex-fuzzy29177 -Node: Customization29674 -Node: Faces29860 -Node: Defcustoms32289 -Node: Actions33648 -Node: What are actions?33974 -Node: How can different actions be called?34792 -Node: How to modify the actions list?35363 -Node: Example - add two actions to each command36023 -Node: How to undo adding the two actions36982 -Node: How to add actions to a specific command37434 -Node: Example - define a new command with several actions37850 -Node: Test the above function with ivy-occur38738 -Node: Packages39580 -Node: Commands40545 -Node: File Name Completion40730 -Node: Using TRAMP42687 -Node: Buffer Name Completion44189 -Node: Counsel commands44804 -Node: API45451 -Node: Required arguments for ivy-read46049 -Node: Optional arguments for ivy-read46568 -Node: Example - counsel-describe-function49994 -Node: Example - counsel-locate52852 -Node: Example - ivy-read-with-extra-properties56602 -Node: Variable Index57810 -Node: Keystroke Index64934 +Node: Key bindings for multiple selections and actions keep minibuffer open16835 +Node: Key bindings that alter the minibuffer input19456 +Node: Other key bindings21401 +Node: Hydra in the minibuffer21779 +Node: Saving the current completion session to a buffer24197 +Node: Completion Styles25609 +Node: ivy--regex-plus27367 +Node: ivy--regex-ignore-order28853 +Node: ivy--regex-fuzzy29221 +Node: Customization29718 +Node: Faces29904 +Node: Defcustoms32333 +Node: Actions33692 +Node: What are actions?34018 +Node: How can different actions be called?34836 +Node: How to modify the actions list?35407 +Node: Example - add two actions to each command36067 +Node: How to undo adding the two actions37026 +Node: How to add actions to a specific command37478 +Node: Example - define a new command with several actions37894 +Node: Test the above function with ivy-occur38831 +Node: Packages39673 +Node: Commands40638 +Node: File Name Completion40823 +Node: Using TRAMP42780 +Node: Buffer Name Completion44282 +Node: Counsel commands44897 +Node: API45544 +Node: Required arguments for ivy-read46142 +Node: Optional arguments for ivy-read46661 +Node: Example - counsel-describe-function50087 +Node: Example - counsel-locate53071 +Node: Example - ivy-read-with-extra-properties56940 +Node: Variable Index58218 +Node: Keystroke Index65342  End Tag Table diff --git a/elpa/markdown-mode-20210220.1301/markdown-mode-pkg.el b/elpa/markdown-mode-20210220.1301/markdown-mode-pkg.el deleted file mode 100644 index a0a0db8..0000000 --- a/elpa/markdown-mode-20210220.1301/markdown-mode-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; Generated package description from markdown-mode.el -*- no-byte-compile: t -*- -(define-package "markdown-mode" "20210220.1301" "Major mode for Markdown-formatted text" '((emacs "25.1")) :commit "051734091aba17a54af96b81beebdbfc84c26459" :authors '(("Jason R. Blevins" . "jblevins@xbeta.org")) :maintainer '("Jason R. Blevins" . "jblevins@xbeta.org") :keywords '("markdown" "github flavored markdown" "itex") :url "https://jblevins.org/projects/markdown-mode/") diff --git a/elpa/markdown-mode-20210220.1301/markdown-mode-autoloads.el b/elpa/markdown-mode-20210521.422/markdown-mode-autoloads.el similarity index 100% rename from elpa/markdown-mode-20210220.1301/markdown-mode-autoloads.el rename to elpa/markdown-mode-20210521.422/markdown-mode-autoloads.el diff --git a/elpa/markdown-mode-20210521.422/markdown-mode-pkg.el b/elpa/markdown-mode-20210521.422/markdown-mode-pkg.el new file mode 100644 index 0000000..ca6047d --- /dev/null +++ b/elpa/markdown-mode-20210521.422/markdown-mode-pkg.el @@ -0,0 +1,2 @@ +;;; Generated package description from markdown-mode.el -*- no-byte-compile: t -*- +(define-package "markdown-mode" "20210521.422" "Major mode for Markdown-formatted text" '((emacs "25.1")) :commit "de365c070c7deecbabfd5a7294bc8c2603d9ec22" :authors '(("Jason R. Blevins" . "jblevins@xbeta.org")) :maintainer '("Jason R. Blevins" . "jblevins@xbeta.org") :keywords '("markdown" "github flavored markdown" "itex") :url "https://jblevins.org/projects/markdown-mode/") diff --git a/elpa/markdown-mode-20210220.1301/markdown-mode.el b/elpa/markdown-mode-20210521.422/markdown-mode.el similarity index 99% rename from elpa/markdown-mode-20210220.1301/markdown-mode.el rename to elpa/markdown-mode-20210521.422/markdown-mode.el index 45c8d9a..498e665 100644 --- a/elpa/markdown-mode-20210220.1301/markdown-mode.el +++ b/elpa/markdown-mode-20210521.422/markdown-mode.el @@ -7,8 +7,8 @@ ;; Maintainer: Jason R. Blevins ;; Created: May 24, 2007 ;; Version: 2.5-dev -;; Package-Version: 20210220.1301 -;; Package-Commit: 051734091aba17a54af96b81beebdbfc84c26459 +;; Package-Version: 20210521.422 +;; Package-Commit: de365c070c7deecbabfd5a7294bc8c2603d9ec22 ;; Package-Requires: ((emacs "25.1")) ;; Keywords: Markdown, GitHub Flavored Markdown, itex ;; URL: https://jblevins.org/projects/markdown-mode/ @@ -1779,7 +1779,7 @@ See `markdown-hide-markup' for additional details." (require 'font-lock) (defgroup markdown-faces nil - "Faces used in Markdown Mode" + "Faces used in Markdown Mode." :group 'markdown :group 'faces) @@ -3587,13 +3587,26 @@ prefixed with an integer from 1 to the length of (insert (car markdown-hr-strings)))) (markdown-ensure-blank-line-after)) -(defun markdown--insert-common (start-delim end-delim regex start-group end-group face) +(defun markdown--insert-common (start-delim end-delim regex start-group end-group face + &optional skip-space) (if (use-region-p) ;; Active region - (let ((bounds (markdown-unwrap-things-in-region - (region-beginning) (region-end) - regex start-group end-group))) - (markdown-wrap-or-insert start-delim end-delim nil (car bounds) (cdr bounds))) + (let* ((bounds (markdown-unwrap-things-in-region + (region-beginning) (region-end) + regex start-group end-group)) + (beg (car bounds)) + (end (cdr bounds))) + (when (and beg skip-space) + (save-excursion + (goto-char beg) + (skip-chars-forward "[ \t]") + (setq beg (point)))) + (when (and end skip-space) + (save-excursion + (goto-char end) + (skip-chars-backward "[ \t]") + (setq end (point)))) + (markdown-wrap-or-insert start-delim end-delim nil beg end)) (if (markdown--face-p (point) (list face)) (save-excursion (while (and (markdown--face-p (point) (list face)) (not (bobp))) @@ -3615,7 +3628,7 @@ bold word or phrase, remove the bold markup. Otherwise, simply insert bold delimiters and place the point in between them." (interactive) (let ((delim (if markdown-bold-underscore "__" "**"))) - (markdown--insert-common delim delim markdown-regex-bold 2 4 'markdown-bold-face))) + (markdown--insert-common delim delim markdown-regex-bold 2 4 'markdown-bold-face t))) (defun markdown-insert-italic () "Insert markup to make a region or word italic. @@ -3625,7 +3638,7 @@ italic word or phrase, remove the italic markup. Otherwise, simply insert italic delimiters and place the point in between them." (interactive) (let ((delim (if markdown-italic-underscore "_" "*"))) - (markdown--insert-common delim delim markdown-regex-italic 1 3 'markdown-italic-face))) + (markdown--insert-common delim delim markdown-regex-italic 1 3 'markdown-italic-face t))) (defun markdown-insert-strike-through () "Insert markup to make a region or word strikethrough. @@ -3635,7 +3648,7 @@ strikethrough word or phrase, remove the strikethrough markup. Otherwise, simply insert bold delimiters and place the point in between them." (interactive) (markdown--insert-common - "~~" "~~" markdown-regex-strike-through 2 4 'markdown-strike-through-face)) + "~~" "~~" markdown-regex-strike-through 2 4 'markdown-strike-through-face t)) (defun markdown-insert-code () "Insert markup to make a region or word an inline code fragment. @@ -5418,7 +5431,7 @@ See also `markdown-mode-map'.") ;;; Menu ====================================================================== (easy-menu-define markdown-mode-menu markdown-mode-map - "Menu for Markdown mode" + "Menu for Markdown mode." '("Markdown" "---" ("Movement" @@ -6997,7 +7010,7 @@ demote." (markdown-backward-same-level 1)))) (defun markdown-outline-up () - "Move to previous list item, when in a list, or next heading." + "Move to previous list item, when in a list, or previous heading." (interactive) (unless (markdown-up-list) (markdown-up-heading 1))) @@ -8527,11 +8540,10 @@ or \\[markdown-toggle-inline-images]." (let* ((start (match-beginning 0)) (imagep (match-beginning 1)) (end (match-end 0)) - (file (match-string-no-properties 6)) - (unhex_file (url-unhex-string file))) + (file (match-string-no-properties 6))) (when (and imagep (not (zerop (length file)))) - (unless (file-exists-p unhex_file) + (unless (file-exists-p file) (let* ((download-file (funcall markdown-translate-filename-function file)) (valid-url (ignore-errors (member (downcase (url-type (url-generic-parse-url download-file))) @@ -8540,11 +8552,13 @@ or \\[markdown-toggle-inline-images]." (setq file (markdown--get-remote-image download-file)) (when (not valid-url) ;; strip query parameter - (setq file (replace-regexp-in-string "?.+\\'" "" file)))))) - (when (file-exists-p unhex_file) - (let* ((abspath (if (file-name-absolute-p unhex_file) - unhex_file - (concat default-directory unhex_file))) + (setq file (replace-regexp-in-string "?.+\\'" "" file)) + (unless (file-exists-p file) + (setq file (url-unhex-string file))))))) + (when (file-exists-p file) + (let* ((abspath (if (file-name-absolute-p file) + file + (concat default-directory file))) (image (cond ((and markdown-max-image-size (image-type-available-p 'imagemagick)) @@ -9075,7 +9089,7 @@ This function assumes point is on a table." (indent (progn (looking-at "[ \t]*") (match-string 0))) ;; Split table in lines and save column format specifier (lines (mapcar (lambda (l) - (if (string-match-p "\\`[ \t]*|[-:]" l) + (if (string-match-p "\\`[ \t]*|[ \t]*[-:]" l) (progn (setq fmtspec (or fmtspec l)) nil) l)) (markdown--split-string (buffer-substring begin end) "\n"))) ;; Split lines in cells diff --git a/elpa/polymode-20200606.1106/polymode-pkg.el b/elpa/polymode-20200606.1106/polymode-pkg.el deleted file mode 100755 index 83845c6..0000000 --- a/elpa/polymode-20200606.1106/polymode-pkg.el +++ /dev/null @@ -1,12 +0,0 @@ -(define-package "polymode" "20200606.1106" "Extensible framework for multiple major modes" - '((emacs "25")) - :commit "3284ff10017d280ba82f27dc20fe5223b0df709c" :keywords - ("languages" "multi-modes" "processes") - :authors - (("Vitalie Spinu")) - :maintainer - ("Vitalie Spinu") - :url "https://github.com/polymode/polymode") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/polymode-20200606.1106/poly-lock.el b/elpa/polymode-20210521.1131/poly-lock.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/poly-lock.el rename to elpa/polymode-20210521.1131/poly-lock.el diff --git a/elpa/polymode-20200606.1106/polymode-autoloads.el b/elpa/polymode-20210521.1131/polymode-autoloads.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-autoloads.el rename to elpa/polymode-20210521.1131/polymode-autoloads.el diff --git a/elpa/polymode-20200606.1106/polymode-base.el b/elpa/polymode-20210521.1131/polymode-base.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-base.el rename to elpa/polymode-20210521.1131/polymode-base.el diff --git a/elpa/polymode-20200606.1106/polymode-classes.el b/elpa/polymode-20210521.1131/polymode-classes.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-classes.el rename to elpa/polymode-20210521.1131/polymode-classes.el diff --git a/elpa/polymode-20200606.1106/polymode-compat.el b/elpa/polymode-20210521.1131/polymode-compat.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-compat.el rename to elpa/polymode-20210521.1131/polymode-compat.el diff --git a/elpa/polymode-20200606.1106/polymode-core.el b/elpa/polymode-20210521.1131/polymode-core.el old mode 100755 new mode 100644 similarity index 99% rename from elpa/polymode-20200606.1106/polymode-core.el rename to elpa/polymode-20210521.1131/polymode-core.el index ac4631a..ff7cb29 --- a/elpa/polymode-20200606.1106/polymode-core.el +++ b/elpa/polymode-20210521.1131/polymode-core.el @@ -875,10 +875,10 @@ TYPE is either a symbol or a list of symbols of span types." (set mm old-state)))) (pm--collect-parent-slots pm/polymode '-minor-mode)))) -(defun pm--run-init-hooks (object type &optional emacs-hook) +(defun pm--run-init-hooks (object type &optional global-hook) (unless pm-initialization-in-progress - (when emacs-hook - (run-hooks emacs-hook)) + (when global-hook + (run-hooks global-hook)) (pm--run-hooks object :init-functions (or type 'host)))) (defun pm--collect-parent-slots (object slot &optional do-when inclusive) @@ -2090,14 +2090,14 @@ Elements of LIST can be either strings or symbols." (stringp pm--output-file) (pm--file-mod-time pm--output-file))) (imt (and omt (pm--file-mod-time pm--input-file))) - (action (if is-exporter "exporting" "weaving")) (ofile (if (and imt (time-less-p imt omt)) (progn (message "Not re-%s as input file '%s' hasn't changed" - (file-name-nondirectory ifile) action) + (if is-exporter "exporting" "weaving") + (file-name-nondirectory ifile)) pm--output-file) (message "%s '%s' with '%s' ..." - (capitalize action) + (if is-exporter "EXPORTING" "WEAVING") (file-name-nondirectory ifile) (eieio-object-name processor)) (let ((fn (with-no-warnings diff --git a/elpa/polymode-20200606.1106/polymode-debug.el b/elpa/polymode-20210521.1131/polymode-debug.el old mode 100755 new mode 100644 similarity index 99% rename from elpa/polymode-20200606.1106/polymode-debug.el rename to elpa/polymode-20210521.1131/polymode-debug.el index 4abe51c..4cbb8dc --- a/elpa/polymode-20200606.1106/polymode-debug.el +++ b/elpa/polymode-20210521.1131/polymode-debug.el @@ -100,7 +100,8 @@ Key bindings: (pm-debug-minor-mode t))) ;;;###autoload -(define-globalized-minor-mode pm-debug-mode pm-debug-minor-mode pm-debug-minor-mode-on) +(define-globalized-minor-mode pm-debug-mode pm-debug-minor-mode pm-debug-minor-mode-on + :group 'polymode) ;;; INFO diff --git a/elpa/polymode-20200606.1106/polymode-export.el b/elpa/polymode-20210521.1131/polymode-export.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-export.el rename to elpa/polymode-20210521.1131/polymode-export.el diff --git a/elpa/polymode-20200606.1106/polymode-methods.el b/elpa/polymode-20210521.1131/polymode-methods.el old mode 100755 new mode 100644 similarity index 99% rename from elpa/polymode-20200606.1106/polymode-methods.el rename to elpa/polymode-20210521.1131/polymode-methods.el index 42a2b22..31ae1d2 --- a/elpa/polymode-20200606.1106/polymode-methods.el +++ b/elpa/polymode-20210521.1131/polymode-methods.el @@ -165,12 +165,12 @@ initialized. Return the buffer." ;; INDENTATION (setq-local pm--indent-line-function-original - (if (memq indent-line-function '(indent-relative indent-relative-maybe)) + (if (memq indent-line-function '(indent-relative indent-relative-maybe pm-indent-line-dispatcher)) #'pm--indent-line-basic indent-line-function)) (setq-local indent-line-function #'pm-indent-line-dispatcher) (setq-local pm--indent-region-function-original - (if (memq indent-region-function '(nil indent-region-line-by-line)) + (if (memq indent-region-function '(nil indent-region-line-by-line pm-indent-region)) #'pm--indent-region-line-by-line indent-region-function)) (setq-local indent-region-function #'pm-indent-region) diff --git a/elpa/polymode-20210521.1131/polymode-pkg.el b/elpa/polymode-20210521.1131/polymode-pkg.el new file mode 100644 index 0000000..9d2e3e8 --- /dev/null +++ b/elpa/polymode-20210521.1131/polymode-pkg.el @@ -0,0 +1,12 @@ +(define-package "polymode" "20210521.1131" "Extensible framework for multiple major modes" + '((emacs "25")) + :commit "7d1f822f0833b43326cc9253dc8a3e267ad4b376" :authors + '(("Vitalie Spinu")) + :maintainer + '("Vitalie Spinu") + :keywords + '("languages" "multi-modes" "processes") + :url "https://github.com/polymode/polymode") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/polymode-20200606.1106/polymode-tangle.el b/elpa/polymode-20210521.1131/polymode-tangle.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-tangle.el rename to elpa/polymode-20210521.1131/polymode-tangle.el diff --git a/elpa/polymode-20200606.1106/polymode-test-utils.el b/elpa/polymode-20210521.1131/polymode-test-utils.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-test-utils.el rename to elpa/polymode-20210521.1131/polymode-test-utils.el diff --git a/elpa/polymode-20200606.1106/polymode-weave.el b/elpa/polymode-20210521.1131/polymode-weave.el old mode 100755 new mode 100644 similarity index 100% rename from elpa/polymode-20200606.1106/polymode-weave.el rename to elpa/polymode-20210521.1131/polymode-weave.el diff --git a/elpa/polymode-20200606.1106/polymode.el b/elpa/polymode-20210521.1131/polymode.el old mode 100755 new mode 100644 similarity index 99% rename from elpa/polymode-20200606.1106/polymode.el rename to elpa/polymode-20210521.1131/polymode.el index b4c6766..fd0160b --- a/elpa/polymode-20200606.1106/polymode.el +++ b/elpa/polymode-20210521.1131/polymode.el @@ -551,10 +551,10 @@ most frequently used slots are: (while (keywordp (setq keyw (car body))) (setq body (cdr body)) (pcase keyw - (`:lighter (setq lighter (purecopy (pop body)))) - (`:keymap (setq keymap (pop body))) - (`:after-hook (setq after-hook (pop body))) - (`:keylist (setq keylist (pop body))) + (:lighter (setq lighter (purecopy (pop body)))) + (:keymap (setq keymap (pop body))) + (:after-hook (setq after-hook (pop body))) + (:keylist (setq keylist (pop body))) (_ (push (pop body) slots) (push keyw slots)))) diff --git a/elpa/request-20210214.37/request-pkg.el b/elpa/request-20210214.37/request-pkg.el deleted file mode 100644 index ad70584..0000000 --- a/elpa/request-20210214.37/request-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; Generated package description from /home/raphael/.emacs.d/elpa/request-20210214.37/request.el -*- no-byte-compile: t -*- -(define-package "request" "20210214.37" "Compatible layer for URL request" '((emacs "24.4")) :commit "accd430ee706f5b10fb20003b06bd8209bcdaa82" :authors '(("Takafumi Arakaki ")) :maintainer '("Takafumi Arakaki ") :url "https://github.com/tkf/emacs-request") diff --git a/elpa/request-20210214.37/request-autoloads.el b/elpa/request-20210410.2218/request-autoloads.el similarity index 100% rename from elpa/request-20210214.37/request-autoloads.el rename to elpa/request-20210410.2218/request-autoloads.el diff --git a/elpa/request-20210410.2218/request-pkg.el b/elpa/request-20210410.2218/request-pkg.el new file mode 100644 index 0000000..8c8550d --- /dev/null +++ b/elpa/request-20210410.2218/request-pkg.el @@ -0,0 +1,2 @@ +;;; Generated package description from request.el -*- no-byte-compile: t -*- +(define-package "request" "20210410.2218" "Compatible layer for URL request" '((emacs "24.4")) :commit "f3a5b4352e9f444ace2a332939abff504b573887" :authors '(("Takafumi Arakaki ")) :maintainer '("Takafumi Arakaki ") :url "https://github.com/tkf/emacs-request") diff --git a/elpa/request-20210214.37/request.el b/elpa/request-20210410.2218/request.el similarity index 99% rename from elpa/request-20210214.37/request.el rename to elpa/request-20210410.2218/request.el index cbab6c8..cb10be5 100644 --- a/elpa/request-20210214.37/request.el +++ b/elpa/request-20210410.2218/request.el @@ -6,8 +6,8 @@ ;; Author: Takafumi Arakaki ;; URL: https://github.com/tkf/emacs-request -;; Package-Version: 20210214.37 -;; Package-Commit: accd430ee706f5b10fb20003b06bd8209bcdaa82 +;; Package-Version: 20210410.2218 +;; Package-Commit: f3a5b4352e9f444ace2a332939abff504b573887 ;; Package-Requires: ((emacs "24.4")) ;; Version: 0.3.3 @@ -276,7 +276,6 @@ as there's already precedent with `request-response-header', I hew to consistency." (let ((raw-header (request-response--raw-header response))) (when raw-header - raw-header (with-temp-buffer (save-excursion (insert raw-header)) (when (save-excursion (request--parse-response-at-point)) diff --git a/elpa/ssh-config-mode-20210401.243/ssh-config-keywords.txt b/elpa/ssh-config-mode-20210517.1925/ssh-config-keywords.txt similarity index 100% rename from elpa/ssh-config-mode-20210401.243/ssh-config-keywords.txt rename to elpa/ssh-config-mode-20210517.1925/ssh-config-keywords.txt diff --git a/elpa/ssh-config-mode-20210401.243/ssh-config-mode-autoloads.el b/elpa/ssh-config-mode-20210517.1925/ssh-config-mode-autoloads.el similarity index 100% rename from elpa/ssh-config-mode-20210401.243/ssh-config-mode-autoloads.el rename to elpa/ssh-config-mode-20210517.1925/ssh-config-mode-autoloads.el diff --git a/elpa/ssh-config-mode-20210401.243/ssh-config-mode-pkg.el b/elpa/ssh-config-mode-20210517.1925/ssh-config-mode-pkg.el similarity index 61% rename from elpa/ssh-config-mode-20210401.243/ssh-config-mode-pkg.el rename to elpa/ssh-config-mode-20210517.1925/ssh-config-mode-pkg.el index 3a4ba83..878877d 100644 --- a/elpa/ssh-config-mode-20210401.243/ssh-config-mode-pkg.el +++ b/elpa/ssh-config-mode-20210517.1925/ssh-config-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "ssh-config-mode" "20210401.243" "Mode for fontification of ~/.ssh/config" 'nil :commit "6d4f8d12c6a7e7ff776271f3656be5f3ba5a784e" :authors +(define-package "ssh-config-mode" "20210517.1925" "Mode for fontification of ~/.ssh/config" 'nil :commit "ff9a15ec150baef21d7d8c6f79c5602e56825391" :authors '(("Harley Gorrell" . "harley@panix.com")) :maintainer '("Harley Gorrell" . "harley@panix.com") diff --git a/elpa/ssh-config-mode-20210401.243/ssh-config-mode.el b/elpa/ssh-config-mode-20210517.1925/ssh-config-mode.el similarity index 82% rename from elpa/ssh-config-mode-20210401.243/ssh-config-mode.el rename to elpa/ssh-config-mode-20210517.1925/ssh-config-mode.el index 9de34c0..57460cd 100644 --- a/elpa/ssh-config-mode-20210401.243/ssh-config-mode.el +++ b/elpa/ssh-config-mode-20210517.1925/ssh-config-mode.el @@ -101,6 +101,7 @@ When testing add '.' to load-path so you find the local copy." (defvar ssh-config-match-regexp "^\\s-*Match\\b" "Regexp to match the start of a match entry.") +;; (defvar ssh-config-hostname-regexp "[-_.a-zA-Z0-9]+" "Regexp to match one hostname. (rfc1123 2.1).") @@ -247,32 +248,97 @@ Only show the first hostname in the menu.") "Syntax table for `ssh-known-hosts-mode'. Just sets the comment syntax.") +;;;;; + +;; host.example.com,1.1.1.1 +;; |1|hash=|hash= +(defvar ssh-known-hosts-regex-hashed + "\\(?:|[0-9]+|[-0-9A-Za-z=|/+]+\\)" + "Regex for matching hashed addresses.") + +(defvar ssh-known-hosts-regex-ipv4 + "\\(?:[0-9]+.[0-9]+.[0-9]+.[0-9]+\\)" + "Regex for matching ipv4 addresses.") + +(defvar ssh-known-hosts-regex-ipv6 + "\\(?:[0-9a-f:]+\\(?:%[a-z0-9]+\\)?\\)" + "Regex for matching ipv6 addresses.") + +(defvar ssh-known-hosts-regex-ip + (concat + "\\(?:" + ssh-known-hosts-regex-ipv4 + "\\|" + ssh-known-hosts-regex-ipv6 + "\\)") + "Regex for matching ip addresses.") + +(defvar ssh-known-hosts-regex-ipv6 + "\\(?:[0-9a-f:]+\\(?:%[a-z0-9]+\\)\\)" + "Regex for matching ipv6 addresses.") + +;; This is more specfic than "ssh-config-hostname-regexp"; merge them? +(defvar ssh-known-hosts-regex-hostname + "\\(?:\\(?:[a-zA-Z0-9_][-a-zA-Z0-9_]*[.]\\)*[a-zA-Z_][-a-zA-Z0-9_]*\\)" + "Regex for matching hostnames. +We permit underscores.") + +;; :2222 +(defvar ssh-known-hosts-regex-port + "\\(?:[0-9]+\\)" + "Regex for matching an port.") + +(defvar ssh-known-hosts-regex-host + (concat + "\\(?:" + ssh-known-hosts-regex-hashed + "\\|" + ssh-known-hosts-regex-ip + "\\|" + ssh-known-hosts-regex-hostname + "\\)")) + ;; NOTE: font-lock-studio might be of help when making changes. (defvar ssh-known-hosts-font-lock-keywords ;; We want to match lines like the following: ;; Short list in ./tests/known_hosts_short ;; Full list in ./tests/known_hosts + ;; More test data in: openssh-portable/regress/unittests/hostkeys/testdata/known_hosts `( (,(concat "^" ;; @marker (optional): "\\(@[-a-z]+ +\\|\\)" - ;; hostnames & hashes: - ;; Just checking for chars, not parsing it. + ;; hostname: "\\(" - ;; host.example.com,1.1.1.1 - ;; |1|hash|hash| - "[-0-9A-Za-z|=.,:*/+]+" + + ;; |1|hash=|hash= + ssh-known-hosts-regex-hashed "\\|" - ;; [136.24.83.19]:2222 - "\\[[0-9]+.[0-9]+.[0-9]+.[0-9]+\\]:[0-9]+" + + ;; hostname-only + ssh-known-hosts-regex-hostname "\\|" - ;; fe80::3285:a9ff:fea7:6de3%en0 - "[0-9a-f:]+\\(?:%[a-z0-9]+\\)?" + + ;; ip-only + ssh-known-hosts-regex-ip "\\|" - ;; [fe80::3285:a9ff:fea7:6de3%en0]:2222 - "\\[[0-9a-f:]+\\(?:%[a-z0-9]+\\)?\\]:[0-9]+" + + ;; hostname "," ip + "\\(?:" ssh-known-hosts-regex-hostname "," ssh-known-hosts-regex-ip "\\)" + "\\|" + + ;; [host-or-ip]:222 + "\\(?:\\[" ssh-known-hosts-regex-host "\\]:" ssh-known-hosts-regex-port "\\)" + "\\|" + + ;; We arent matching ports, but they should be the same. + ;; [ssh.github.com]:443,[192.1.2.3]:443 + "\\(?:" + "\\[" ssh-known-hosts-regex-hostname "\\]:" ssh-known-hosts-regex-port "," + "\\[" ssh-known-hosts-regex-ip "\\]:" ssh-known-hosts-regex-port "\\)" + "\\)" "[ \t]+" @@ -290,7 +356,9 @@ Just sets the comment syntax.") (3 font-lock-keyword-face) (4 font-lock-string-face) )) - "Expressions to hilight in `ssh-known-hosts-mode'.") + "Expressions to hilight in `ssh-known-hosts-mode'. +We want to try and be a good match, so misformatted ones stand out. +So we dont just match .* for the hostname.") ;;;###autoload (defun ssh-known-hosts-mode () diff --git a/elpa/transient-0.3.0/dir b/elpa/transient-0.3.2/dir similarity index 100% rename from elpa/transient-0.3.0/dir rename to elpa/transient-0.3.2/dir diff --git a/elpa/transient-0.3.0/transient-autoloads.el b/elpa/transient-0.3.2/transient-autoloads.el similarity index 100% rename from elpa/transient-0.3.0/transient-autoloads.el rename to elpa/transient-0.3.2/transient-autoloads.el diff --git a/elpa/transient-0.3.0/transient-pkg.el b/elpa/transient-0.3.2/transient-pkg.el similarity index 67% rename from elpa/transient-0.3.0/transient-pkg.el rename to elpa/transient-0.3.2/transient-pkg.el index ef8942d..10cce71 100644 --- a/elpa/transient-0.3.0/transient-pkg.el +++ b/elpa/transient-0.3.2/transient-pkg.el @@ -1,6 +1,6 @@ -(define-package "transient" "0.3.0" "Transient commands" +(define-package "transient" "0.3.2" "Transient commands" '((emacs "25.1")) - :commit "9ca983bab26d1a8e189a8c44471d9575284b268d" :authors + :commit "162698aa9d40ecafefcb1af7bdf602954d766970" :authors '(("Jonas Bernoulli" . "jonas@bernoul.li")) :maintainer '("Jonas Bernoulli" . "jonas@bernoul.li") diff --git a/elpa/transient-0.3.0/transient.el b/elpa/transient-0.3.2/transient.el similarity index 99% rename from elpa/transient-0.3.0/transient.el rename to elpa/transient-0.3.2/transient.el index 6ac494c..6e7b5ea 100644 --- a/elpa/transient-0.3.0/transient.el +++ b/elpa/transient-0.3.2/transient.el @@ -5,7 +5,7 @@ ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/transient ;; Package-Requires: ((emacs "25.1")) -;; Package-Version: 0.3.0 +;; Package-Version: 0.3.2 ;; Keywords: bindings ;; This file is part of GNU Emacs. @@ -550,7 +550,7 @@ If `transient-save-history' is nil, then do nothing." (transient-suffix :initarg :transient-suffix :initform nil) (transient-non-suffix :initarg :transient-non-suffix :initform nil) (incompatible :initarg :incompatible :initform nil) - (suffix-description :initarg :suffix-description :initform nil)) + (suffix-description :initarg :suffix-description)) "Transient prefix command. Each transient prefix command consists of a command, which is @@ -1394,7 +1394,10 @@ of the transient-specific keymaps), `transient-edit-map' and If you change a binding here, then you might also have to edit `transient-sticky-map' and `transient-common-commands'. While the latter isn't a proper transient prefix command, it can be -edited using the same functions as used for transients.") +edited using the same functions as used for transients. + +If you add a new command here, then you must also add a binding +to `transient-predicate-map'.") (defvar transient-map (let ((map (make-sparse-keymap))) @@ -1408,7 +1411,10 @@ edited using the same functions as used for transients.") (define-key map (kbd "C-M-p") 'transient-history-prev) (define-key map (kbd "C-M-n") 'transient-history-next) map) - "Top-level keymap used by all transients.") + "Top-level keymap used by all transients. + +If you add a new command here, then you must also add a binding +to `transient-predicate-map'. Also see `transient-base-map'.") (defvar transient-edit-map (let ((map (make-sparse-keymap))) @@ -1623,7 +1629,7 @@ This function is also called internally in which case LAYOUT and EDIT may be non-nil." (transient--debug 'setup) (when (> (minibuffer-depth) 0) - (user-error "Cannot invoke transient %s while minibuffer is active")) + (user-error "Cannot invoke transient %s while minibuffer is active" name)) (transient--with-emergency-exit (cond ((not name) @@ -2514,6 +2520,14 @@ stand-alone command." ;;;; Readers +(defun transient-read-file (prompt _initial-input _history) + "Read a file." + (file-local-name (expand-file-name (read-file-name prompt)))) + +(defun transient-read-existing-file (prompt _initial-input _history) + "Read an existing file." + (file-local-name (expand-file-name (read-file-name prompt nil nil t)))) + (defun transient-read-directory (prompt _initial-input _history) "Read a directory." (file-local-name (expand-file-name (read-directory-name prompt)))) diff --git a/elpa/transient-0.3.0/transient.info b/elpa/transient-0.3.2/transient.info similarity index 99% rename from elpa/transient-0.3.0/transient.info rename to elpa/transient-0.3.2/transient.info index 82cc0a5..727bd98 100644 --- a/elpa/transient-0.3.0/transient.info +++ b/elpa/transient-0.3.2/transient.info @@ -1,4 +1,4 @@ -This is transient.info, produced by makeinfo version 6.5 from +This is transient.info, produced by makeinfo version 6.7 from transient.texi. Copyright (C) 2018-2021 Jonas Bernoulli @@ -44,7 +44,7 @@ reading a new value in the minibuffer. Calling a suffix command usually causes the transient to be exited but suffix commands can also be configured to not exit the transient. -This manual is for Transient version 0.3.0. +This manual is for Transient version 0.3.2. Copyright (C) 2018-2021 Jonas Bernoulli