commit 3424c27abb7c8ea64c32eaf54cf53fc58323e5ce (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Sat Nov 5 20:44:56 2016 -0700 Prefer comments /* like this */ in C code diff --git a/src/xwidget.c b/src/xwidget.c index e97d963..d1f9540 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -326,7 +326,7 @@ webkit_js_to_lisp (JSContextRef context, JSValueRef value) int n = JSPropertyNameArrayGetCount (properties); Lisp_Object obj; - // TODO: can we use a regular list here? + /* TODO: can we use a regular list here? */ struct Lisp_Vector *p = allocate_vector (n); for (int i = 0; i < n; ++i) @@ -386,9 +386,9 @@ webkit_javascript_finished_cb (GObject *webview, Lisp_Object lisp_value = webkit_js_to_lisp (context, value); webkit_javascript_result_unref (js_result); - // Register an xwidget event here, which then runs the callback. - // This ensures that the callback runs in sync with the Emacs - // event loop. + /* Register an xwidget event here, which then runs the callback. + This ensures that the callback runs in sync with the Emacs + event loop. */ store_xwidget_js_callback_event (xw, (Lisp_Object)lisp_callback, lisp_value); } @@ -717,9 +717,9 @@ argument procedure FUN.*/) void *callback = (FUNCTIONP (fun)) ? &webkit_javascript_finished_cb : NULL; - // JavaScript execution happens asynchronously. If an elisp - // callback function is provided we pass it to the C callback - // procedure that retrieves the return value. + /* JavaScript execution happens asynchronously. If an elisp + callback function is provided we pass it to the C callback + procedure that retrieves the return value. */ webkit_web_view_run_javascript (WEBKIT_WEB_VIEW (xw->widget_osr), SSDATA (script), NULL, /* cancelable */ commit de75a1154e9dad334ff1359d7f606c66b2fd2233 Author: Johan Bockgård Date: Sat Nov 5 16:31:22 2016 +0100 * lisp/subr.el (copy-tree): Handle vector in cdr. (Bug#24876) diff --git a/lisp/subr.el b/lisp/subr.el index ebcb1fd..a713b92 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -514,7 +514,8 @@ argument VECP, this copies vectors as well as conses." (setq newcar (copy-tree (car tree) vecp))) (push newcar result)) (setq tree (cdr tree))) - (nconc (nreverse result) tree)) + (nconc (nreverse result) + (if (and vecp (vectorp tree)) (copy-tree tree vecp) tree))) (if (and vecp (vectorp tree)) (let ((i (length (setq tree (copy-sequence tree))))) (while (>= (setq i (1- i)) 0) commit f95bf3cd1f55cf8f99b88c7318c21c967b11dfd1 Author: Nick Terrell Date: Sat Nov 5 11:42:15 2016 +0200 Support zstd compressed files * lisp/jka-cmpr-hook.el (jka-compr-compression-info-list): Add zstd compression info: . (jka-compr-mode-alist-additions): Handle .tzst suffix for zstd compressed tar archives. (Bug#24853) Copyright-paperwork-exempt: yes diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index 39302f0..b023bcd 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -244,7 +244,15 @@ options through Custom does this automatically." ["\\.dz\\'" nil nil nil "uncompressing" "gzip" ("-c" "-q" "-d") - nil t "\037\213"])) + nil t "\037\213"] + ["\\.zst\\'" + "zstd compressing" "zstd" ("-c" "-q") + "zstd uncompressing" "zstd" ("-c" "-q" "-d") + t t "\050\265\057\375"] + ["\\.tzst\\'" + "zstd compressing" "zstd" ("-c" "-q") + "zstd uncompressing" "zstd" ("-c" "-q" "-d") + t nil "\050\265\057\375"])) "List of vectors that describe available compression techniques. Each element, which describes a compression technique, is a vector of @@ -308,7 +316,8 @@ variables. Setting this through Custom does that automatically." (defcustom jka-compr-mode-alist-additions (purecopy '(("\\.tgz\\'" . tar-mode) ("\\.tbz2?\\'" . tar-mode) - ("\\.txz\\'" . tar-mode))) + ("\\.txz\\'" . tar-mode) + ("\\.tzst\\'" . tar-mode))) "List of pairs added to `auto-mode-alist' when installing jka-compr. Uninstalling jka-compr removes all pairs from `auto-mode-alist' that installing added.