From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: commit-msg line-length limit Date: Tue, 16 Dec 2014 11:21:42 -0800 Organization: UCLA Computer Science Department Message-ID: <54908646.6070209@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090701090208020909040306" X-Trace: ger.gmane.org 1418757741 13478 80.91.229.3 (16 Dec 2014 19:22:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 16 Dec 2014 19:22:21 +0000 (UTC) Cc: Emacs development discussions To: Stefan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 16 20:22:13 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Y0xhE-0008V8-Qi for ged-emacs-devel@m.gmane.org; Tue, 16 Dec 2014 20:22:13 +0100 Original-Received: from localhost ([::1]:46352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0xhE-0005wf-CR for ged-emacs-devel@m.gmane.org; Tue, 16 Dec 2014 14:22:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0xgx-0005wN-5z for emacs-devel@gnu.org; Tue, 16 Dec 2014 14:21:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0xgt-0000gE-4x for emacs-devel@gnu.org; Tue, 16 Dec 2014 14:21:55 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:57154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0xgs-0000g5-P3 for emacs-devel@gnu.org; Tue, 16 Dec 2014 14:21:51 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 197F9A6008A; Tue, 16 Dec 2014 11:21:49 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zg7vfddB6-UA; Tue, 16 Dec 2014 11:21:45 -0800 (PST) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 2C3AFA60089; Tue, 16 Dec 2014 11:21:45 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:180202 Archived-At: This is a multi-part message in MIME format. --------------090701090208020909040306 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit The attached patch (emacs-24 commit dated yesterday) increased the Git commit message line-length limit to 78 characters. This will have consequences once we start generating ChangeLog files automatically from commit messages. Because ChangeLog entries are indented by a tab, the resulting ChangeLog files will typically require 78 + 8 == 86 columns, not the 80 columns they have traditionally needed. Is this intentional? If not, a simple fix is to change the limit back to 72. If so, I suppose we could work around the problem with something like the following patch, though this will be more of a change to current practice: diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 8e44c02..93a2ac6 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -1034,7 +1034,8 @@ the change log file in another window." ;;;###autoload (define-derived-mode change-log-mode text-mode "Change Log" "Major mode for editing change logs; like Indented Text mode. -Prevents numeric backups and sets `left-margin' to 8 and `fill-column' to 74. +Prevents numeric backups, and sets `left-margin' to 8, `fill-column' to 74, +and `tab-width' to 2. New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window]. Each entry behaves as a paragraph, and the entries for one day as a page. Runs `change-log-mode-hook'. @@ -1042,7 +1043,7 @@ Runs `change-log-mode-hook'. (setq left-margin 8 fill-column 74 indent-tabs-mode t - tab-width 8 + tab-width 2 show-trailing-whitespace t) (set (make-local-variable 'fill-forward-paragraph-function) 'change-log-fill-forward-paragraph) --------------090701090208020909040306 Content-Type: text/x-patch; name="commit-msg.diff" Content-Disposition: attachment; filename="commit-msg.diff" Content-Transfer-Encoding: quoted-printable diff --git a/ChangeLog b/ChangeLog index 2b75dcb..34c1840 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-12-15 Stefan Monnier + + * build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit + to 78. + 2014-12-12 Paul Eggert =20 Git ignore lib/std*.h diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-= msg index 5eb994c..2e3e4f2 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -87,8 +87,8 @@ exec $awk ' status =3D 1 } =20 - 72 < length && $0 ~ space { - print "Line longer than 72 characters in commit message" + 78 < length && $0 ~ space { + print "Line longer than 78 characters in commit message" status =3D 1 } =20 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b6bf868..9e242ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-15 Stefan Monnier + + * subr.el (sit-for): Tweak docstring (bug#19381). + 2014-12-15 Dmitry Gutov =20 * vc/vc-git.el (vc-git-after-dir-status-stage): Move `up-to-date' @@ -20,8 +24,8 @@ =20 2014-12-09 Fabi=C3=A1n Ezequiel Gallina =20 - * progmodes/python.el (python-shell-parse-command): Quote - `python-shell-interpreter`. (Bug#19289) + * progmodes/python.el (python-shell-parse-command): + Quote `python-shell-interpreter`. (Bug#19289) =20 2014-12-04 Stefan Monnier =20 @@ -60,8 +64,8 @@ =20 2014-11-27 Fabi=C3=A1n Ezequiel Gallina =20 - * progmodes/python.el (python-shell-completion-setup-code): Use - __builtin__ module (or builtins in Python 3) and catch all errors + * progmodes/python.el (python-shell-completion-setup-code): + Use __builtin__ module (or builtins in Python 3) and catch all errors when importing readline and rlcompleter. =20 2014-11-26 Stephen Berman @@ -113,8 +117,8 @@ =20 2014-11-21 Eli Zaretskii =20 - * vc/vc-git.el (vc-git-command, vc-git--call): Bind - coding-system-for-read and coding-system-for-write to + * vc/vc-git.el (vc-git-command, vc-git--call): + Bind coding-system-for-read and coding-system-for-write to vc-git-commits-coding-system. (vc-git-previous-revision): Use "~1" instead of "^", since the latter is a special character for MS-Windows system shells. @@ -155,8 +159,8 @@ =20 2014-11-16 Fabi=C3=A1n Ezequiel Gallina =20 - * progmodes/python.el (python-eldoc--get-doc-at-point): Strip - shell output before returning. (bug#18794) + * progmodes/python.el (python-eldoc--get-doc-at-point): + Strip shell output before returning. (bug#18794) =20 2014-11-16 Dmitry Gutov =20 @@ -177,13 +181,13 @@ =20 2014-11-15 Fabi=C3=A1n Ezequiel Gallina =20 - * progmodes/python.el (python-indent-calculate-levels): Fix - indentation behavior multiline dedenter statement. (Bug#18432) + * progmodes/python.el (python-indent-calculate-levels): + Fix indentation behavior multiline dedenter statement. (Bug#18432) =20 2014-11-15 Fabi=C3=A1n Ezequiel Gallina =20 - * progmodes/python.el (python-indent-region): Use - python-indent-line and skip special cases. (Bug#18843) + * progmodes/python.el (python-indent-region): + Use python-indent-line and skip special cases. (Bug#18843) =20 2014-11-15 Michael Albinus =20 @@ -196,8 +200,8 @@ =20 2014-11-14 Ivan Andrus =20 - * progmodes/python.el (python-ffap-module-path): Use - `derived-mode-p' instead of equality test on `major-mode'. + * progmodes/python.el (python-ffap-module-path): + Use `derived-mode-p' instead of equality test on `major-mode'. =20 2014-11-13 Ulrich M=C3=BCller =20 @@ -247,8 +251,8 @@ 2014-11-05 Alan Mackenzie =20 Fix wrong bound to c-font-lock-declarators. Fixes bug #18948. - * progmodes/cc-fonts.el (c-font-lock-declarations): Pass - "(point-max)" as bound to c-font-lock-declarators, not "limit", as + * progmodes/cc-fonts.el (c-font-lock-declarations): + Pass "(point-max)" as bound to c-font-lock-declarators, not "limit", as the buffer is sometimes narrowed to less than "limit" (e.g., in the presence of macros). =20 diff --git a/lisp/subr.el b/lisp/subr.el index 215699d..839b915 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2142,7 +2142,7 @@ keyboard-quit events while waiting for a valid inpu= t." char)) =20 (defun sit-for (seconds &optional nodisp obsolete) - "Perform redisplay, then wait for SECONDS seconds or until input is av= ailable. + "Redisplay, then wait for SECONDS seconds. Stop when input is availab= le. SECONDS may be a floating-point value. \(On operating systems that do not support waiting for fractions of a second, floating-point values are rounded down to the nearest integer.) @@ -2160,7 +2160,7 @@ floating point support." (declare (advertised-calling-convention (seconds &optional nodisp) "22= .1")) ;; This used to be implemented in C until the following discussion: ;; http://lists.gnu.org/archive/html/emacs-devel/2006-07/msg00401.html - ;; Then it was moved to C using an implementation based on an idle tim= er, + ;; Then it was moved here using an implementation based on an idle tim= er, ;; which was then replaced by the use of read-event. (if (numberp nodisp) (setq seconds (+ seconds (* 1e-3 nodisp)) diff --git a/src/ChangeLog b/src/ChangeLog index 6b7abe4..c0b9039 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,11 +1,15 @@ +2014-12-15 Stefan Monnier + + * buffer.c (syms_of_buffer) : fix docstring. + 2014-12-13 Eli Zaretskii =20 * gnutls.c (gnutls_init): Fix deprecation warning from GCC. =20 2014-12-12 Eli Zaretskii =20 - * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move - gnutls-available-p out of the HAVE_GNUTLS conditional, and define + * gnutls.c (Fgnutls_available_p, syms_of_gnutls): + Move gnutls-available-p out of the HAVE_GNUTLS conditional, and define them only once. =20 2014-12-11 Teodor Zlatanov @@ -21,8 +25,8 @@ =20 2014-12-10 Eli Zaretskii =20 - * xdisp.c (move_it_in_display_line_to, display_line): Don't - disallow overflow-newline-into-fringe when word-wrap is in + * xdisp.c (move_it_in_display_line_to, display_line): + Don't disallow overflow-newline-into-fringe when word-wrap is in effect. (Bug#19300) =20 2014-12-04 Lee Duhem (tiny change) @@ -78,8 +82,8 @@ 2014-11-15 Eli Zaretskii =20 * window.c (window_scroll_pixel_based): Avoid truncation/rounding - errors in computing the number of pixels to scroll. Suggested by - Kelly Dean . (Bug#19060) + errors in computing the number of pixels to scroll. + Suggested by Kelly Dean . (Bug#19060) =20 2014-11-15 Jan Dj=C3=A4rv =20 @@ -190,8 +194,8 @@ =20 2014-10-26 Eli Zaretskii =20 - * dispnew.c (buffer_posn_from_coords): Use - WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to + * dispnew.c (buffer_posn_from_coords): + Use WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to account for the header-line height. (Bug#18839) =20 2014-10-22 YAMAMOTO Mitsuharu diff --git a/src/buffer.c b/src/buffer.c index 495f937..368d273 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6092,9 +6092,9 @@ from happening repeatedly and making Emacs nonfunct= ional. */); doc: /* List of functions to call after each text change. Three arguments are passed to each function: the positions of the beginning and end of the range of changed text, -and the length in bytes of the pre-change text replaced by that range. +and the length in chars of the pre-change text replaced by that range. \(For an insertion, the pre-change length is zero; -for a deletion, that length is the number of bytes deleted, +for a deletion, that length is the number of chars deleted, and the post-change beginning and end are at the same place.) =20 Buffer changes made while executing the `after-change-functions' --------------090701090208020909040306--