summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-03-15 15:56:24 -0700
committerSean Whitton <spwhitton@spwhitton.name>2019-03-15 15:56:24 -0700
commitb05d3f22b10981a5bd0aab589d10925adacdf357 (patch)
tree91eb082c7a192df2943f103a67fbbb6b2d22088c
parent17f2ae29ed2cb292b861039133816d85c8663c21 (diff)
Commit Debian 3.0 (quilt) metadata
[dgit (8.4) quilt-fixup]
-rw-r--r--debian/patches/debian-changes96
1 files changed, 96 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index bd28438..d510d48 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -14,6 +14,54 @@ version 1.2.3, you could use:
(If you have dgit, use `dgit clone cider`, rather than plain `git clone`.)
A single combined diff, containing all the changes, follows.
+--- cider-0.19.0+dfsg.orig/cider-client.el
++++ cider-0.19.0+dfsg/cider-client.el
+@@ -235,9 +235,12 @@ with respect to the bound values of \\=`
+ PPRINT-FN is the name of the Clojure function to use.
+ RIGHT-MARGIN specifies the maximum column-width of the pretty-printed
+ result, and is included in the request if non-nil."
+- (nconc `("pprint" "true"
+- "pprint-fn" ,(or pprint-fn (cider--pprint-fn)))
+- (and right-margin `("print-right-margin" ,right-margin))))
++ (let* ((print-options (or cider-pprint-options (nrepl-dict))))
++ (when right-margin
++ (setq print-options (nrepl-dict-put print-options (cider--pprint-option "right-margin" cider-pprint-fn) right-margin)))
++ (append `("nrepl.middleware.print/print" ,(or pprint-fn (cider--pprint-fn))
++ "nrepl.middleware.print/stream?" "1")
++ (and (not (nrepl-dict-empty-p print-options)) `("nrepl.middleware.print/options" ,print-options)))))
+
+ (defun cider--nrepl-content-type-plist ()
+ "Plist to be appended to an eval request to make it use content-types."
+--- cider-0.19.0+dfsg.orig/cider-eval.el
++++ cider-0.19.0+dfsg/cider-eval.el
+@@ -278,11 +278,9 @@ into a new error buffer."
+ (cider-nrepl-send-request
+ (nconc '("op" "stacktrace")
+ (when (cider--pprint-fn)
+- `("pprint-fn" ,(cider--pprint-fn)))
+- (when cider-stacktrace-print-length
+- `("print-length" ,cider-stacktrace-print-length))
+- (when cider-stacktrace-print-level
+- `("print-level" ,cider-stacktrace-print-level)))
++ `("nrepl.middleware.print/print" ,(cider--pprint-fn)))
++ (when cider-stacktrace-print-options
++ `("nrepl.middleware.print/options" ,cider-stacktrace-print-options)))
+ (lambda (response)
+ ;; While the return value of `cider--handle-stacktrace-response' is not
+ ;; meaningful for the last message, we do not need the value of `causes'
+--- cider-0.19.0+dfsg.orig/cider-ns.el
++++ cider-0.19.0+dfsg/cider-ns.el
+@@ -249,7 +249,9 @@ refresh functions (defined in `cider-ns-
+ "print-length" ,cider-stacktrace-print-length
+ "print-level" ,cider-stacktrace-print-level)
+ (when (cider--pprint-fn)
+- `("pprint-fn" ,(cider--pprint-fn)))
++ `("nrepl.middleware.print/print" ,(cider--pprint-fn)))
++ (when cider-stacktrace-print-options
++ `("nrepl.middleware.print/options" ,cider-stacktrace-print-options))
+ (when (and (not inhibit-refresh-fns) cider-ns-refresh-before-fn)
+ `("before" ,cider-ns-refresh-before-fn))
+ (when (and (not inhibit-refresh-fns) cider-ns-refresh-after-fn)
--- cider-0.19.0+dfsg.orig/cider-repl.el
+++ cider-0.19.0+dfsg/cider-repl.el
@@ -368,7 +368,9 @@ client process connection. Unless NO-BA
@@ -27,6 +75,32 @@ A single combined diff, containing all the changes, follows.
;; In case you're seeing any warnings you should consult the manual's
;; \"Troubleshooting\" section.
;;
+@@ -871,7 +873,7 @@ nREPL ops, it may be convenient to preve
+ (nrepl-make-response-handler
+ buffer
+ (lambda (buffer value)
+- (cider-repl-emit-result buffer value (not after-first-result-chunk) t)
++ (cider-repl-emit-result buffer value (not after-first-result-chunk))
+ (setq after-first-result-chunk t))
+ (lambda (buffer out)
+ (cider-repl-emit-stdout buffer out))
+--- cider-0.19.0+dfsg.orig/cider-test.el
++++ cider-0.19.0+dfsg/cider-test.el
+@@ -283,11 +283,9 @@ prompt and whether to use a new window.
+ "var" ,var
+ "index" ,index)
+ (when (cider--pprint-fn)
+- `("pprint-fn" ,(cider--pprint-fn)))
+- (when cider-stacktrace-print-length
+- `("print-length" ,cider-stacktrace-print-length))
+- (when cider-stacktrace-print-level
+- `("print-level" ,cider-stacktrace-print-level)))
++ `("nrepl.middleware.print/print" ,(cider--pprint-fn)))
++ (when cider-stacktrace-print-options
++ `("nrepl.middleware.print/options" ,cider-stacktrace-print-options)))
+ (lambda (response)
+ (nrepl-dbind-response response (class status)
+ (cond (class (setq causes (cons response causes)))
--- cider-0.19.0+dfsg.orig/cider-util.el
+++ cider-0.19.0+dfsg/cider-util.el
@@ -404,7 +404,7 @@ plugin or dependency with:
@@ -58,6 +132,28 @@ A single combined diff, containing all the changes, follows.
"When nil, do not inject repl dependencies (most likely nREPL middlewares) at `cider-jack-in' time."
:type 'boolean
:safe #'booleanp
+@@ -377,7 +377,7 @@ Throws an error if PROJECT-TYPE is unkno
+ ;; We inject the newest known version of nREPL just in case
+ ;; your version of Boot or Leiningen is bundling an older one.
+ (cider-add-to-alist 'cider-jack-in-dependencies
+- "nrepl" "0.5.3")
++ "nrepl" "0.6.0")
+
+ (defvar cider-jack-in-cljs-dependencies nil
+ "List of dependencies where elements are lists of artifact name and version.
+@@ -401,10 +401,10 @@ Elements of the list are artifact name a
+ (defconst cider-latest-clojure-version "1.10.0"
+ "Latest supported version of Clojure.")
+
+-(defconst cider-required-middleware-version "0.18.0"
++(defconst cider-required-middleware-version "0.21.0"
+ "The minimum CIDER nREPL version that's known to work properly with CIDER.")
+
+-(defconst cider-latest-middleware-version "0.19.0"
++(defconst cider-latest-middleware-version "0.21.0"
+ "The latest CIDER nREPL version that's known to work properly with CIDER.")
+
+ (defcustom cider-jack-in-auto-inject-clojure nil
--- cider-0.19.0+dfsg.orig/doc/about/contributing.md
+++ cider-0.19.0+dfsg/doc/about/contributing.md
@@ -71,7 +71,7 @@ You can support the development of CIDER