summaryrefslogtreecommitdiff
path: root/debian/patches/debian-changes
blob: d510d4843ffa127daa6c65120fe21b45b7cdb1fa (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
The Debian packaging of cider is maintained in git, using the merging workflow
described in dgit-maint-merge(7).  There isn't a patch queue that can be
represented as a quilt series.

A detailed breakdown of the changes is available from their canonical
representation - git commits in the packaging repository.  For example, to see
the changes made by the Debian maintainer in the first upload of upstream
version 1.2.3, you could use:

    % git clone https://git.dgit.debian.org/cider
    % cd cider
    % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'

(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
   (substitute-command-keys
    "\n;; ======================================================================
 ;; If you're new to CIDER it is highly recommended to go through its
-;; manual first. Type <M-x cider-view-manual> to view it.
+;; manual first. Install the cider-doc apt package and then type
+;; <M-x cider-view-manual> to view it.
+;; You should also read /usr/share/doc/elpa-cider/README.Debian
 ;; 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:
 
 (defvar cider-version)
 
-(defconst cider-manual-url "https://docs.cider.mx/en/%s/"
+(defconst cider-manual-url "file:///usr/share/doc/elpa-cider/html/index.html"
   "The URL to CIDER's manual.")
 
 (defun cider--manual-version ()
@@ -415,7 +415,7 @@ plugin or dependency with:
 
 (defun cider-manual-url ()
   "The CIDER manual's url."
-  (format cider-manual-url (cider--manual-version)))
+  cider-manual-url)
 
 ;;;###autoload
 (defun cider-view-manual ()
--- cider-0.19.0+dfsg.orig/cider.el
+++ cider-0.19.0+dfsg/cider.el
@@ -286,7 +286,7 @@ This variable is used by `cider-connect'
   :group 'cider
   :package-version '(cider . "0.9.0"))
 
-(defcustom cider-inject-dependencies-at-jack-in t
+(defcustom cider-inject-dependencies-at-jack-in nil
   "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
 [Patreon](https://www.patreon.com/bbatsov),
 [Liberapay](https://liberapay.com/bbatsov/donate) and PayPal.
 
-[![Paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GRQKNBM6P8VRQ)
+[Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GRQKNBM6P8VRQ)
 
 ### Open Collective
 
--- cider-0.19.0+dfsg.orig/doc/index.md
+++ cider-0.19.0+dfsg/doc/index.md
@@ -1,7 +1,3 @@
-<p align="center">
-  <img src="https://raw.github.com/clojure-emacs/cider/master/logo/cider-logo-w640.png" alt="CIDER Logo"/>
-</p>
-
 CIDER is the **C**lojure(Script) **I**nteractive **D**evelopment **E**nvironment
 that **R**ocks!
 
--- cider-0.19.0+dfsg.orig/doc/installation.md
+++ cider-0.19.0+dfsg/doc/installation.md
@@ -1,124 +1,3 @@
-The canonical way to install CIDER is via `package.el` (Emacs's built-in package
-manager), but it can be installed manually or via alternative package managers such
-as `el-get`.
-
-## Prerequisites
-
-You'll need to have Emacs installed, preferably the latest stable
-release. If you're new to Emacs you might want to go through
-[the guided tour of Emacs](https://www.gnu.org/software/emacs/tour/index.html)
-and the built-in tutorial (just press <kbd>C-h t</kbd>).
-
-CIDER officially supports Emacs 25.1+, Java 8+ and Clojure(Script)
-1.8+.  CIDER 0.17 (AndalucĂ­a) was the final release which supported
-Java 7 and Clojure(Script) 1.7.
-
-You'll also need a recent version of either the Clojure CLI tools or your
-favorite build tool (Leiningen, Boot, or Gradle) to be able to start CIDER via
-`cider-jack-in`. Generally it's a good idea to use the latest stable versions.
-
-!!! warning
-
-    CIDER does not support ClojureCLR.
-
-## Installation via package.el
-
-CIDER is available on the two major `package.el` community
-maintained repos -
-[MELPA Stable](http://stable.melpa.org)
-and [MELPA](http://melpa.org).
-
-You can install CIDER with the following command:
-
-<kbd>M-x package-install [RET] cider [RET]</kbd>
-
-or by adding this bit of Emacs Lisp code to your Emacs initialization file
-(`.emacs` or `init.el`):
-
-```el
-(unless (package-installed-p 'cider)
-  (package-install 'cider))
-```
-
-If the installation doesn't work try refreshing the package list:
-
-<kbd>M-x package-refresh-contents [RET]</kbd>
-
-It's important to note that MELPA packages are built automatically
-from the `master` branch, and that means you'll be right on the
-leading edge of development. This has upsides and downsides; you'll
-see new features first, but you might experience some bugs from
-time to time. Nevertheless, installing from MELPA is a reasonable way
-to obtain CIDER. The `master` branch is normally quite stable
-and serious regressions there are usually fixed quickly.
-
-If you have concerns about living on the leading edge of CIDER
-deveopment, you can always pin CIDER to use MELPA Stable like this:
-
-```el
-(add-to-list 'package-pinned-packages '(cider . "melpa-stable") t)
-```
-
-!!! Tip
-
-    If you don't want to (or can't) wait for MELPA to rebuild CIDER,
-    you can easily build and install an up-to-date MELPA package locally yourself. Check out
-    [this article](http://emacsredux.com/blog/2015/05/10/building-melpa-packages-locally/)
-    for details on the subject.
-
-!!! note
-
-    CIDER has dependencies (e.g. `queue` & `seq`) that are only available in the
-    [GNU ELPA repository](https://elpa.gnu.org/). It's the only package repository
-    enabled by default in Emacs and you should not disable it!
-
-## Installation via use-package
-
-`use-package` can be used to install CIDER via the `package.el`'s repositories
-[MELPA Stable](http://stable.melpa.org) and [MELPA](http://melpa.org).
-
-If you wanted to install the version of CIDER which is what is to be found in
-the `master` branch, declare the following in your Emacs initialization file
-(`.emacs` or `init.el`):
-
-```el
-(use-package cider
-  :ensure t)
-```
-
-However, if you wanted to be a bit more conservative and only use the stable
-releases of CIDER, you'd declare the following:
-
-```el
-(use-package cider
-  :ensure t
-  :pin melpa-stable)
-```
-
-After placing one of the above s-expressions, evaluate it, for it to take effect
-by entering: <kbd>C-x C-e</kbd>.
-
-For further configuration options with `use-package`, consult the
-official [use-package repository](https://github.com/jwiegley/use-package).
-
-
-## Installation via el-get
-
-CIDER is also available for installation from
-the [el-get](https://github.com/dimitri/el-get) package manager.
-
-Provided you've already installed `el-get` you can install CIDER with the
-following command:
-
-<kbd>M-x el-get-install [RET] cider [RET]</kbd>
-
-## Manual Installation
-
-Installing CIDER manually is discouraged unless you plan to work with CIDER's
-codebase. The manual installation is relatively involved as it requires manual
-installation of the dependencies. Check out the section
-[Hacking on CIDER](hacking_on_cider.md) for more details.
-
 ## CIDER's nREPL Middleware
 
 Much of CIDER's functionality depends on its own [nREPL
--- cider-0.19.0+dfsg.orig/mkdocs.yml
+++ cider-0.19.0+dfsg/mkdocs.yml
@@ -1,5 +1,6 @@
 site_name: "CIDER: The Clojure Interactive Development Environment that Rocks"
 repo_url: https://github.com/clojure-emacs/cider
+site_dir: html
 edit_uri: edit/master/doc/
 site_favicon: favicon.ico
 copyright: "Copyright &copy; 2016-2019 Bozhidar Batsov, Artur Malabarba and CIDER contributors"
@@ -35,6 +36,7 @@ pages:
     - License: about/license.md
 extra_css:
   - css/extra.css
+use_directory_urls: false
 markdown_extensions:
   - admonition
 theme: readthedocs
--- cider-0.19.0+dfsg.orig/test/cider-util-tests.el
+++ cider-0.19.0+dfsg/test/cider-util-tests.el
@@ -179,15 +179,15 @@
     (expect (cider--deep-vector-to-list '[bug]) :to-equal '(bug))
     (expect (cider--deep-vector-to-list '(bug)) :to-equal '(bug))))
 
-(describe "cider-manual-url"
-  :var (cider-version)
-  (it "returns the manual correct url for stable cider versions"
-    (setq cider-version "0.11.0")
-    (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/stable/"))
+;; (describe "cider-manual-url"
+;;   :var (cider-version)
+;;   (it "returns the manual correct url for stable cider versions"
+;;     (setq cider-version "0.11.0")
+;;     (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/stable/"))
 
-  (it "returns the manual correct url for snapshot cider versions"
-    (setq cider-version "0.11.0-snapshot")
-    (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/latest/")))
+;;   (it "returns the manual correct url for snapshot cider versions"
+;;     (setq cider-version "0.11.0-snapshot")
+;;     (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/latest/")))
 
 (describe "cider-refcard-url"
   :var (cider-version)