From unknown Sun Jun 22 11:45:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#22431: 25.0.50; incorrect jsdoc comment wrapping in js mode Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Jan 2016 15:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 22431 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 22431@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.145347763522676 (code B ref -1); Fri, 22 Jan 2016 15:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Jan 2016 15:47:15 +0000 Received: from localhost ([127.0.0.1]:58000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aMdve-0005tg-P8 for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57605) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aMdvc-0005tS-1t for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMdvV-0006Gi-Dz for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:07 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMdvV-0006Ge-AV for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMdvQ-0008Pk-RI for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2016 10:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMdvO-0006GK-0s for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2016 10:47:00 -0500 Received: from gproxy5-pub.mail.unifiedlayer.com ([67.222.38.55]:38618) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1aMdvN-0006Fv-Jf for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2016 10:46:57 -0500 Received: (qmail 3640 invoked by uid 0); 22 Jan 2016 15:46:48 -0000 Received: from unknown (HELO cmgw2) (10.0.90.83) by gproxy5.mail.unifiedlayer.com with SMTP; 22 Jan 2016 15:46:48 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id 93mY1s00s2f2jeq013mbNy; Fri, 22 Jan 2016 08:46:46 -0700 X-Authority-Analysis: v=2.1 cv=dqRIVTQ4 c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=zstS-IiYAAAA:8 a=PnD2wP_eR3oA:10 a=93QQSvQeUfgA:10 a=7aQ_Q-yQQ-AA:10 a=tZso4lOuEjyKUKgQIUkA:9 a=2YMXUXpyWtxV4Lw1:21 a=ua4A4djbvjzg4SwV:21 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From; bh=OwgEb7UsfTfQW3zOUYmJFPu91xBjW76rqYX5IYq0EQQ=; b=ahgFkI2yrb0eVimIKqKsHVQkZ9DPwGUMUBjCV151nN8U8xyEYC/R8R7iLE06FBLW1y8+EPQWtPyFYS8exQfEjBybuxJRV0jwbnXbz6QryKXYiIK71MKungB/AdMaAjyR; Received: from [174.16.144.134] (port=33544 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.84) (envelope-from ) id 1aMdv0-0006YK-4r; Fri, 22 Jan 2016 08:46:34 -0700 From: Tom Tromey X-Attribution: Tom Date: Fri, 22 Jan 2016 08:46:31 -0700 Message-ID: <87k2n1fwh4.fsf@tromey.com> MIME-Version: 1.0 Content-Type: text/plain X-Identified-User: {36111:box522.bluehost.com:elynrobi:tromey.com} {sentby:smtp auth 174.16.144.134 authed with tom+tromey.com} X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) I'm using js-mode for .js files and I set this in my prog-mode-hook: (setq-local comment-auto-fill-only-comments t) (auto-fill-mode 1) To see the bug, open a new .js file (but it works in an existing file as well). Then enter: /** * Load the inspector's shared head.js for use by tests that need to Now move point to the end of the comment line and type " open the". This causes wrapping for me, but the result looks like: /** * Load the inspector's shared head.js for use by tests that need to /**open the However, it should look like: /** * Load the inspector's shared head.js for use by tests that need to * open the In GNU Emacs 25.0.50.3 (x86_64-unknown-linux-gnu, GTK+ Version 3.18.6) of 2016-01-20 built on pokyo Windowing system distributor 'Fedora Project', version 11.0.11800000 Configured using: 'configure --prefix=/home/tromey/Emacs/install --with-file-notifications=no' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GCONF GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: JS Minor modes in effect: shell-dirtrack-mode: t bug-reference-prog-mode: t diff-auto-refine-mode: t erc-spelling-mode: t erc-truncate-mode: t flyspell-mode: t which-function-mode: t projectile-global-mode: t projectile-mode: t erc-notify-mode: t erc-notifications-mode: t erc-services-mode: t erc-list-mode: t erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-networks-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-netsplit-mode: t erc-hl-nicks-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-move-to-prompt-mode: t erc-readonly-mode: t flycheck-mode: t savehist-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t auto-fill-function: do-auto-fill transient-mark-mode: t Recent messages: Saving file /home/tromey/firefox-git/gecko/devtools/client/styleeditor/test/browser_styleeditor_syncEditSelector.js... Wrote /home/tromey/firefox-git/gecko/devtools/client/styleeditor/test/browser_styleeditor_syncEditSelector.js More than 1 blank line not allowed. [no-multiple-empty-lines] Auto-saving...done Making comment-continue buffer-local while locally let-bound! Quit (New file) Mark set [2 times] Saving file /tmp/q.js... Wrote /tmp/q.js Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/25.0.50/lisp/play/bubbles Features: (shadow emacsbug vc-annotate compare-w shell smerge-mode css-mode perl-mode rst tabify man gud autoconf autoconf-mode git-rebase-mode etags xref project dxr org-element org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view image-mode org-bibtex bibtex org-bbdb org-w3m org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle ob-ref ob-lob ob-table ob-exp org-src ob-keys ob-comint ob-core ob-eval org-compat org-macs org-loaddefs mailalias bbdb-sc supercite regi mail-hist nnir url-http url-gw url-auth eww url-queue gnus-fun log-view idutils gnus-html url-cache mm-url url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf find-dired git-commit-mode log-edit pcvs-util term/xterm xterm copyright dabbrev conf-mode grep js json cc-mode cc-fonts cc-guess cc-menus cc-cmds add-log bug-reference map sgml-mode flow-fill shr-color url-util url-parse url-vars shr dom mm-archive browse-url character-fold misearch multi-isearch bbdb-gui bbdb-hooks bbdb-rmail rmailsum rmail vc-mtn vc-hg vc-git diff-mode vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs seq sort smiley gnus-cite gnus-async gnus-bcklg qp gnus-ml disp-table gnus-topic nndraft nnmh nnfolder utf-7 bbdb-gnus bbdb-snarf mail-extr bbdb-com warnings gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg nntp gnus-cache gnus-registry registry eieio-compat eieio-base gnus-art mm-uu mml2015 mm-view mml-smime smime dig mailcap gnus-sum gnus-group gnus-undo smtpmail sendmail gnus-start gnus-cloud nnimap nnmail mail-source utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range message idna rfc822 mml mml-sec epg mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev gmm-utils mailheader gnus-win gnus gnus-ems nnheader mail-utils network-stream nsm starttls tls gnutls erc-spelling erc-truncate flyspell ispell diminish appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs which-func imenu projectile ibuf-macs ibuf-ext ibuffer minimap autorevert filenotify desktop frameset cus-start cus-load erc-notify erc-desktop-notifications notifications dbus xml erc-services erc-list erc-menu erc-join erc-ring erc-networks erc-pcomplete pcomplete erc-track erc-match erc-netsplit erc-hl-nicks color erc-button erc-fill erc-stamp wid-edit erc-goodies erc erc-backend erc-compat format-spec auth-source eieio byte-opt bytecomp byte-compile cl-extra cconv gnus-util mm-util help-fns mail-prsvr password-cache thingatpt pp status dired-aux dired-x dired advice vc-dir ewoc vc vc-dispatcher flycheck derived easy-mmode cl-seq edmacro kmacro find-func help-mode rx subr-x dash jka-compr sh-script smie executable compile let-alist cc-styles cc-align cc-engine cc-vars cc-defs bbdb cl timezone ange-ftp comint ansi-color ring server savehist bbdb-autoloads dwarf-mode-autoloads eieio-core cl-macs gv cl-loaddefs pcase cl-lib finder-inf lisppaste-autoloads pydoc-info-autoloads info-look weblogger-autoloads info package easymenu epg-config time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese charscript case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote dbusbind inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 2444835 1037424) (symbols 48 114236 66) (miscs 40 29658 13350) (strings 32 1021236 415862) (string-bytes 1 43274617) (vectors 16 118902) (vector-slots 8 2744111 224997) (floats 8 1008 1451) (intervals 56 87454 4187) (buffers 976 255) (heap 1024 355968 203309)) Tom From unknown Sun Jun 22 11:45:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#22431: 25.0.50; incorrect jsdoc comment wrapping in js mode Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 23 Jan 2016 05:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22431 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Tom Tromey , 22431@debbugs.gnu.org Received: via spool by 22431-submit@debbugs.gnu.org id=B22431.145352641524072 (code B ref 22431); Sat, 23 Jan 2016 05:21:02 +0000 Received: (at 22431) by debbugs.gnu.org; 23 Jan 2016 05:20:15 +0000 Received: from localhost ([127.0.0.1]:58234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aMqcR-0006GC-LL for submit@debbugs.gnu.org; Sat, 23 Jan 2016 00:20:15 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:34089) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aMqcQ-0006Fw-3H for 22431@debbugs.gnu.org; Sat, 23 Jan 2016 00:20:14 -0500 Received: by mail-lb0-f181.google.com with SMTP id cl12so51277422lbc.1 for <22431@debbugs.gnu.org>; Fri, 22 Jan 2016 21:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=wSb5CrMvCa9jGz13T0Jc+1BC6SUM6cfsyGZCC4E50co=; b=vHfiCjh61QHHDDgunpT3xCdfdBspq5ifoG98AA/Cdu/D0RwhZSZuwbLWb3AywPoeO1 lBzrvtWyTFrsWmcoCizfxurFskQ7LQ0m/FLfp64sTdt7XNMBxnA6yH1fipc3KpG+TFnr zeNEEDjWyP9YMLLwA/qFJQqFa2HqNlRuLyHh5wFRHmIqJZlIbtXR2wP9+7uslxFTPQpm XU9izdB1CleuDYupM/ZAvy2gwjr+jxlu3161EIavG+ItGSIeBQcBVXFTSR6+FhmFSBjw LFIpHjfaGTEOypSH0r2qfnS0YSfAYGvDrONSQTOkQwSIwSucNg9c6q5UPclNaEeKmRT0 4CZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=wSb5CrMvCa9jGz13T0Jc+1BC6SUM6cfsyGZCC4E50co=; b=INHwD0dD6o2JW9M1v/VDIDnryAaGQ7N1fNH+7yqArUbZeunfDeFScDih4iDuP1zJzN 4dMC/UFGhWkAtclJbjp26Kn3GBwnAEdIcW8pZESMtR/RiKsEcCk8BsPdwwbQyzeHiQ4F ntFYwEoXgE8llT9PvELzwGQSbaRI5A9YjPJUXjDvrcExWVisr6Kp7EwS8CCrZV7uUcMF J9fF+kr/ibDCnwrUz2QRI6mDHtVoRTmcYH5fLM5hQ1qTKGQBj1il+2M0GLJywzP/1thN 8l69zniFeKBKx/TWVL0QUVwbqMqFcqfCg46A4J/Z4Y5PSYX231P1Kiq6DD6k4ann+vk1 NZsw== X-Gm-Message-State: AG10YOQik3bgum4YUn1Qfh/GGT2nUN+juLBm/NOZY3fcAU1cJZtM4sykbV01rUG0DZazwQ== X-Received: by 10.112.136.103 with SMTP id pz7mr2577186lbb.3.1453526408049; Fri, 22 Jan 2016 21:20:08 -0800 (PST) Received: from [192.168.1.190] ([178.252.127.222]) by smtp.googlemail.com with ESMTPSA id l67sm1309002lfi.2.2016.01.22.21.20.06 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Jan 2016 21:20:07 -0800 (PST) References: <87k2n1fwh4.fsf@tromey.com> From: Dmitry Gutov Message-ID: <56A30D86.6060501@yandex.ru> Date: Sat, 23 Jan 2016 08:20:06 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:44.0) Gecko/20100101 Thunderbird/44.0 MIME-Version: 1.0 In-Reply-To: <87k2n1fwh4.fsf@tromey.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 01/22/2016 06:46 PM, Tom Tromey wrote: > Now move point to the end of the comment line and type " open the". > This causes wrapping for me, but the result looks like: > > /** > * Load the inspector's shared head.js for use by tests that need to > /**open the [...] Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (raaahh[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.181 listed in list.dnswl.org] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [178.252.127.222 listed in zen.spamhaus.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.217.181 listed in wl.mailspike.net] 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 01/22/2016 06:46 PM, Tom Tromey wrote: > Now move point to the end of the comment line and type " open the". > This causes wrapping for me, but the result looks like: > > /** > * Load the inspector's shared head.js for use by tests that need to > /**open the [...] Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.181 listed in list.dnswl.org] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [178.252.127.222 listed in zen.spamhaus.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.217.181 listed in wl.mailspike.net] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (raaahh[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders On 01/22/2016 06:46 PM, Tom Tromey wrote: > Now move point to the end of the comment line and type " open the". > This causes wrapping for me, but the result looks like: > > /** > * Load the inspector's shared head.js for use by tests that need to > /**open the Indeed, I also see the problem. But it's not in js2-mode, because it defines its own comment-line-break-function, instead of inheriting one from cc-engine. We should probably copy it over. From unknown Sun Jun 22 11:45:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#22431: js mode comment-filling fixlet References: <87k2n1fwh4.fsf@tromey.com> In-Reply-To: <87k2n1fwh4.fsf@tromey.com> Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 08 Jan 2017 05:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22431 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 22431@debbugs.gnu.org Cc: 19399@debbugs.gnu.org Received: via spool by 22431-submit@debbugs.gnu.org id=B22431.14838526588257 (code B ref 22431); Sun, 08 Jan 2017 05:18:02 +0000 Received: (at 22431) by debbugs.gnu.org; 8 Jan 2017 05:17:38 +0000 Received: from localhost ([127.0.0.1]:46400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cQ5rN-000292-TR for submit@debbugs.gnu.org; Sun, 08 Jan 2017 00:17:38 -0500 Received: from gproxy8-pub.mail.unifiedlayer.com ([67.222.33.93]:36704) by debbugs.gnu.org with smtp (Exim 4.84_2) (envelope-from ) id 1cQ5rL-00028Z-7R for 22431@debbugs.gnu.org; Sun, 08 Jan 2017 00:17:36 -0500 Received: (qmail 30433 invoked by uid 0); 8 Jan 2017 05:17:27 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy8.mail.unifiedlayer.com with SMTP; 8 Jan 2017 05:17:27 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id VhHM1u00M2f2jeq01hHQ5y; Sat, 07 Jan 2017 22:17:25 -0700 X-Authority-Analysis: v=2.1 cv=V+Huj4Xi c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IgFoBzBjUZAA:10 a=Ig7MdnTublVQzIT7hiwA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:CC:Subject:To:From; bh=mpqKBSu52ogjrnsWDhfUDya/aU16h7WcP5vcp8fh57E=; b=CLu3ucej35wNERo5SS9Zf/aZf 3a9ziGXJ6/SrB6yUCvg5+pxjMgvEQmmrqghdk6XCzzJD8xzlNty94kQW8GvnBY+F5ohxJzjAad9xc YKWGZhGyBexHMgpb/XTD9X5aE6; Received: from 174-16-146-181.hlrn.qwest.net ([174.16.146.181]:50720 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1cQ5r8-00071X-O3; Sat, 07 Jan 2017 22:17:22 -0700 From: Tom Tromey Date: Sat, 07 Jan 2017 22:17:13 -0700 Message-ID: <877f662krq.fsf@tromey.com> MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 174.16.146.181 X-Exim-ID: 1cQ5r8-00071X-O3 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-146-181.hlrn.qwest.net (bapiya) [174.16.146.181]:50720 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Spam-Score: -0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) This patch fixes a couple js comment-filling bugs. Dmitry mentioned comment-line-break-function in bug#22431; this patch just sets it in js-mode. For bug#19399, debugging showed that js-mode left c-block-comment-start-regexp nil, so this sets it to the correct value. I would normally check this in but I think it should probably be reviewed. Tom diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index e3f64a8..375ae9d 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3760,6 +3760,8 @@ js-mode c-line-comment-starter "//" c-comment-start-regexp "/[*/]\\|\\s!" comment-start-skip "\\(//+\\|/\\*+\\)\\s *") + (setq-local comment-line-break-function #'c-indent-new-comment-line) + (setq-local c-block-comment-start-regexp "\\*/") (setq-local electric-indent-chars (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*". From unknown Sun Jun 22 11:45:08 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tom Tromey Subject: bug#22431: closed (done) Message-ID: References: <8737gl4jr0.fsf@tromey.com> <87k2n1fwh4.fsf@tromey.com> X-Gnu-PR-Message: they-closed 22431 X-Gnu-PR-Package: emacs Reply-To: 22431@debbugs.gnu.org Date: Sat, 14 Jan 2017 17:48:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1484416082-2715-1" This is a multi-part message in MIME format... ------------=_1484416082-2715-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #22431: 25.0.50; incorrect jsdoc comment wrapping in js mode which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 22431@debbugs.gnu.org. --=20 22431: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D22431 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1484416082-2715-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 22431-done) by debbugs.gnu.org; 14 Jan 2017 17:47:05 +0000 Received: from localhost ([127.0.0.1]:54127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cSSPx-0000gH-2c for submit@debbugs.gnu.org; Sat, 14 Jan 2017 12:47:05 -0500 Received: from gproxy5-pub.mail.unifiedlayer.com ([67.222.38.55]:43095) by debbugs.gnu.org with smtp (Exim 4.84_2) (envelope-from ) id 1cSSPu-0000eb-Fq for 22431-done@debbugs.gnu.org; Sat, 14 Jan 2017 12:47:03 -0500 Received: (qmail 19847 invoked by uid 0); 14 Jan 2017 17:46:49 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy5.mail.unifiedlayer.com with SMTP; 14 Jan 2017 17:46:49 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id YHml1u0092f2jeq01HmoUC; Sat, 14 Jan 2017 10:46:48 -0700 X-Authority-Analysis: v=2.1 cv=H75InYoi c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IgFoBzBjUZAA:10 a=YtduXSOiVZq129UeEHQA:9 a=Y3q5EnTegyoA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:CC:Subject:To:From: Sender:Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kiTzIKDq9hz5MidiqyK6ZFp68TtQeL02vLMfLshzBMw=; b=IPEmzpw8Sg/CfkswuNf0JMFVtu cT4i13TPu7moPYM6XYK+IRLArvhQ5a6jBD4zB8HWxUzOSsn2pAtcvyuzxzUKCLHgO7LpL51HC2J22 hVC4SvcXpouoejNPhAqnGmmUa; Received: from 174-16-146-181.hlrn.qwest.net ([174.16.146.181]:54010 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1cSSPe-0005up-1H; Sat, 14 Jan 2017 10:46:46 -0700 From: Tom Tromey To: 19399-done@debbugs.gnu.org Subject: done X-Attribution: Tom Date: Sat, 14 Jan 2017 10:46:43 -0700 Message-ID: <8737gl4jr0.fsf@tromey.com> MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 174.16.146.181 X-Exim-ID: 1cSSPe-0005up-1H X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-146-181.hlrn.qwest.net (bapiya) [174.16.146.181]:54010 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: 22431-done Cc: 22431-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) These were both fixed by 05fe74bec239bebea84cb6803120321c367d67d3. Tom ------------=_1484416082-2715-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Jan 2016 15:47:15 +0000 Received: from localhost ([127.0.0.1]:58000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aMdve-0005tg-P8 for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57605) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aMdvc-0005tS-1t for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMdvV-0006Gi-Dz for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:07 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMdvV-0006Ge-AV for submit@debbugs.gnu.org; Fri, 22 Jan 2016 10:47:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMdvQ-0008Pk-RI for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2016 10:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMdvO-0006GK-0s for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2016 10:47:00 -0500 Received: from gproxy5-pub.mail.unifiedlayer.com ([67.222.38.55]:38618) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1aMdvN-0006Fv-Jf for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2016 10:46:57 -0500 Received: (qmail 3640 invoked by uid 0); 22 Jan 2016 15:46:48 -0000 Received: from unknown (HELO cmgw2) (10.0.90.83) by gproxy5.mail.unifiedlayer.com with SMTP; 22 Jan 2016 15:46:48 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id 93mY1s00s2f2jeq013mbNy; Fri, 22 Jan 2016 08:46:46 -0700 X-Authority-Analysis: v=2.1 cv=dqRIVTQ4 c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=zstS-IiYAAAA:8 a=PnD2wP_eR3oA:10 a=93QQSvQeUfgA:10 a=7aQ_Q-yQQ-AA:10 a=tZso4lOuEjyKUKgQIUkA:9 a=2YMXUXpyWtxV4Lw1:21 a=ua4A4djbvjzg4SwV:21 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From; bh=OwgEb7UsfTfQW3zOUYmJFPu91xBjW76rqYX5IYq0EQQ=; b=ahgFkI2yrb0eVimIKqKsHVQkZ9DPwGUMUBjCV151nN8U8xyEYC/R8R7iLE06FBLW1y8+EPQWtPyFYS8exQfEjBybuxJRV0jwbnXbz6QryKXYiIK71MKungB/AdMaAjyR; Received: from [174.16.144.134] (port=33544 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.84) (envelope-from ) id 1aMdv0-0006YK-4r; Fri, 22 Jan 2016 08:46:34 -0700 From: Tom Tromey To: bug-gnu-emacs@gnu.org Subject: 25.0.50; incorrect jsdoc comment wrapping in js mode X-Attribution: Tom Date: Fri, 22 Jan 2016 08:46:31 -0700 Message-ID: <87k2n1fwh4.fsf@tromey.com> MIME-Version: 1.0 Content-Type: text/plain X-Identified-User: {36111:box522.bluehost.com:elynrobi:tromey.com} {sentby:smtp auth 174.16.144.134 authed with tom+tromey.com} X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) I'm using js-mode for .js files and I set this in my prog-mode-hook: (setq-local comment-auto-fill-only-comments t) (auto-fill-mode 1) To see the bug, open a new .js file (but it works in an existing file as well). Then enter: /** * Load the inspector's shared head.js for use by tests that need to Now move point to the end of the comment line and type " open the". This causes wrapping for me, but the result looks like: /** * Load the inspector's shared head.js for use by tests that need to /**open the However, it should look like: /** * Load the inspector's shared head.js for use by tests that need to * open the In GNU Emacs 25.0.50.3 (x86_64-unknown-linux-gnu, GTK+ Version 3.18.6) of 2016-01-20 built on pokyo Windowing system distributor 'Fedora Project', version 11.0.11800000 Configured using: 'configure --prefix=/home/tromey/Emacs/install --with-file-notifications=no' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GCONF GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: JS Minor modes in effect: shell-dirtrack-mode: t bug-reference-prog-mode: t diff-auto-refine-mode: t erc-spelling-mode: t erc-truncate-mode: t flyspell-mode: t which-function-mode: t projectile-global-mode: t projectile-mode: t erc-notify-mode: t erc-notifications-mode: t erc-services-mode: t erc-list-mode: t erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-networks-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-netsplit-mode: t erc-hl-nicks-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-move-to-prompt-mode: t erc-readonly-mode: t flycheck-mode: t savehist-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t auto-fill-function: do-auto-fill transient-mark-mode: t Recent messages: Saving file /home/tromey/firefox-git/gecko/devtools/client/styleeditor/test/browser_styleeditor_syncEditSelector.js... Wrote /home/tromey/firefox-git/gecko/devtools/client/styleeditor/test/browser_styleeditor_syncEditSelector.js More than 1 blank line not allowed. [no-multiple-empty-lines] Auto-saving...done Making comment-continue buffer-local while locally let-bound! Quit (New file) Mark set [2 times] Saving file /tmp/q.js... Wrote /tmp/q.js Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/25.0.50/lisp/play/bubbles Features: (shadow emacsbug vc-annotate compare-w shell smerge-mode css-mode perl-mode rst tabify man gud autoconf autoconf-mode git-rebase-mode etags xref project dxr org-element org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view image-mode org-bibtex bibtex org-bbdb org-w3m org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle ob-ref ob-lob ob-table ob-exp org-src ob-keys ob-comint ob-core ob-eval org-compat org-macs org-loaddefs mailalias bbdb-sc supercite regi mail-hist nnir url-http url-gw url-auth eww url-queue gnus-fun log-view idutils gnus-html url-cache mm-url url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf find-dired git-commit-mode log-edit pcvs-util term/xterm xterm copyright dabbrev conf-mode grep js json cc-mode cc-fonts cc-guess cc-menus cc-cmds add-log bug-reference map sgml-mode flow-fill shr-color url-util url-parse url-vars shr dom mm-archive browse-url character-fold misearch multi-isearch bbdb-gui bbdb-hooks bbdb-rmail rmailsum rmail vc-mtn vc-hg vc-git diff-mode vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs seq sort smiley gnus-cite gnus-async gnus-bcklg qp gnus-ml disp-table gnus-topic nndraft nnmh nnfolder utf-7 bbdb-gnus bbdb-snarf mail-extr bbdb-com warnings gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg nntp gnus-cache gnus-registry registry eieio-compat eieio-base gnus-art mm-uu mml2015 mm-view mml-smime smime dig mailcap gnus-sum gnus-group gnus-undo smtpmail sendmail gnus-start gnus-cloud nnimap nnmail mail-source utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range message idna rfc822 mml mml-sec epg mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev gmm-utils mailheader gnus-win gnus gnus-ems nnheader mail-utils network-stream nsm starttls tls gnutls erc-spelling erc-truncate flyspell ispell diminish appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs which-func imenu projectile ibuf-macs ibuf-ext ibuffer minimap autorevert filenotify desktop frameset cus-start cus-load erc-notify erc-desktop-notifications notifications dbus xml erc-services erc-list erc-menu erc-join erc-ring erc-networks erc-pcomplete pcomplete erc-track erc-match erc-netsplit erc-hl-nicks color erc-button erc-fill erc-stamp wid-edit erc-goodies erc erc-backend erc-compat format-spec auth-source eieio byte-opt bytecomp byte-compile cl-extra cconv gnus-util mm-util help-fns mail-prsvr password-cache thingatpt pp status dired-aux dired-x dired advice vc-dir ewoc vc vc-dispatcher flycheck derived easy-mmode cl-seq edmacro kmacro find-func help-mode rx subr-x dash jka-compr sh-script smie executable compile let-alist cc-styles cc-align cc-engine cc-vars cc-defs bbdb cl timezone ange-ftp comint ansi-color ring server savehist bbdb-autoloads dwarf-mode-autoloads eieio-core cl-macs gv cl-loaddefs pcase cl-lib finder-inf lisppaste-autoloads pydoc-info-autoloads info-look weblogger-autoloads info package easymenu epg-config time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese charscript case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote dbusbind inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 2444835 1037424) (symbols 48 114236 66) (miscs 40 29658 13350) (strings 32 1021236 415862) (string-bytes 1 43274617) (vectors 16 118902) (vector-slots 8 2744111 224997) (floats 8 1008 1451) (intervals 56 87454 4187) (buffers 976 255) (heap 1024 355968 203309)) Tom ------------=_1484416082-2715-1--