From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#20325: convert "fixes:debbugs:123" in log to (Bug#123) in ChangeLog Date: Sat, 18 Apr 2015 19:59:02 -0700 Organization: UCLA Computer Science Department Message-ID: <553319F6.2050404@cs.ucla.edu> References: <0opp77menv.fsf@fencepost.gnu.org> <5530AC62.2010209@cs.ucla.edu> <5530ED9C.4010703@yandex.ru> <87h9sectue.fsf@gmx.de> <55317FC5.2070303@yandex.ru> <878udqct22.fsf@gmx.de> <55318CEB.2010904@yandex.ru> <83d2319ac0.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090301010102010207020305" X-Trace: ger.gmane.org 1429412430 609 80.91.229.3 (19 Apr 2015 03:00:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 19 Apr 2015 03:00:30 +0000 (UTC) Cc: 20325@debbugs.gnu.org, michael.albinus@gmx.de To: Eli Zaretskii , Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Apr 19 05:00:18 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1YjfSw-0005Wf-Nd for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 05:00:15 +0200 Original-Received: from localhost ([::1]:47378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjfSv-00056t-WE for geb-bug-gnu-emacs@m.gmane.org; Sat, 18 Apr 2015 23:00:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjfSp-00054v-Qd for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 23:00:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YjfSm-0007f9-FH for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 23:00:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjfSm-0007eC-BG for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 23:00:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YjfSl-0003hU-He for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 23:00:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Apr 2015 03:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20325 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20325-submit@debbugs.gnu.org id=B20325.142941236614146 (code B ref 20325); Sun, 19 Apr 2015 03:00:03 +0000 Original-Received: (at 20325) by debbugs.gnu.org; 19 Apr 2015 02:59:26 +0000 Original-Received: from localhost ([127.0.0.1]:60336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YjfS8-0003g2-1k for submit@debbugs.gnu.org; Sat, 18 Apr 2015 22:59:26 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:57254) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YjfS3-0003fn-KG for 20325@debbugs.gnu.org; Sat, 18 Apr 2015 22:59:22 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 9705139E8016; Sat, 18 Apr 2015 19:59:13 -0700 (PDT) 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 gGAvbDN8B5Ie; Sat, 18 Apr 2015 19:59:06 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id F181A39E8014; Sat, 18 Apr 2015 19:59:05 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 In-Reply-To: <83d2319ac0.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:101704 Archived-At: This is a multi-part message in MIME format. --------------090301010102010207020305 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Eli Zaretskii wrote: > For some value of "we". CONTRIBUTE still requires to use > "Fixes: bug#NNNN", and that's what I've switched to once those > requirements were written. Which was already a change from the > previous procedure, which preferred simply "Bug#NNNN". > > I wish you guys settle on something once and for all, never mind what, "you guys"? I thought you were one of us! :-) I did not choose the "Fixes: bug#NNNN" syntax. I vaguely recall it came from an offhand remark in one of Stefan's emails a few months ago and that it migrated into CONTRIBUTE when Stephen Leake attempted to summarize that discussion, but possibly it was a typo in Stefan's message and anyway I expect he doesn't much care what the format is. From the earlier discussion in this thread it appears that the "Fixes: debbugs:NNNN" syntax is an artifact of the Bzr-to-Git conversion that now causes more confusion than it's worth. To try to lessen this I installed the attached patches (the third one is mechanical; it's the result of 'make change-history'). --------------090301010102010207020305 Content-Type: text/x-patch; name="0001-Prefer-Bug-1234-in-commit-messages.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Prefer-Bug-1234-in-commit-messages.patch" >From f2da220b5fde8575812784f6a9e5f7df9560e838 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Apr 2015 19:08:53 -0700 Subject: [PATCH 1/4] Prefer "Bug#1234" in commit messages * .dir-locals.el (log-edit-mode): Don't rewrite Bug#, as this isn't useful for Git. * CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234". --- .dir-locals.el | 4 +--- CONTRIBUTE | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index f899b51..9853d7b 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -3,9 +3,7 @@ (fill-column . 70))) (c-mode . ((c-file-style . "GNU"))) (objc-mode . ((c-file-style . "GNU"))) - (log-edit-mode . ((log-edit-rewrite-fixes - "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1") - (log-edit-font-lock-gnu-style . t) + (log-edit-mode . ((log-edit-font-lock-gnu-style . t) (log-edit-setup-add-author . t))) (change-log-mode . ((add-log-time-zone-rule . t) (fill-column . 74) diff --git a/CONTRIBUTE b/CONTRIBUTE index 476b361..4205bc3 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -42,12 +42,11 @@ in its message. Here is an example commit message (indented): Deactivate shifted region Do not silently extend a region that is not highlighted; - this can happen after a shift. + this can happen after a shift (Bug#19003). * doc/emacs/mark.texi (Shift Selection): Document the change. * lisp/window.el (handle-select-window): * src/frame.c (Fhandle_switch_frame, Fselected_frame): Deactivate the mark. - Fixes: bug#19003 The general format is as follows. @@ -113,11 +112,9 @@ The general format is as follows. Copyright-paperwork-exempt: yes -- If the commit fixes a bug, append a separate line - - Fixes: bug#NNNN - - where NNNN is the bug number. +- The commit message should contain "Bug#NNNNN" if it is related to + bug number NNNNN in the debbugs database. This string is often + parenthesized, as in "(Bug#19003)". - In ChangeLog entries, there is no standard or recommended way to identify revisions. -- 2.1.0 --------------090301010102010207020305 Content-Type: text/x-patch; name="0002-Convert-ChangeLog-history-files-to-Bug-NNNN.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0002-Convert-ChangeLog-history-files-to-Bug-NNNN.patch" >From 870287327b1fba7105599eeabac5a2aa5ebadf19 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Apr 2015 19:45:38 -0700 Subject: [PATCH 2/4] ; Convert ChangeLog history files to "Bug#NNNN" --- ChangeLog.1 | 8 ++++---- ChangeLog.2 | 49 ++++++++++++++++++++++++------------------------- lisp/ChangeLog.17 | 4 ++-- src/ChangeLog.13 | 12 ++++++------ test/ChangeLog.1 | 2 +- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/ChangeLog.1 b/ChangeLog.1 index 6e2b4fc..d1b8d0f 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -55,7 +55,7 @@ (HAVE_PTHREAD, LIB_PTHREAD): Port better to FreeBSD, by also checking for pthread_create, pthread_self, pthread_sigmask. Tighten the test for pthread_atfork while we're at it. - Fixes: bug#20136 + (Bug#20136) Merge from gnulib This incorporates: @@ -76,7 +76,7 @@ Don't require GNU putenv * configure.ac: Use system putenv even if it lacks GNU features, as we don't need them. This works around a bug in FreeBSD 10.1 getenv. - Fixes: bug#19874 + (Bug#19874) 2015-02-25 Paul Eggert @@ -170,7 +170,7 @@ If gnustep-config works, use 'gnustep-config --objc-flags' and 'gnustep-config --gui-libs' to compute GNUstep configuration variables, instead of attempting to infer them individually. - Fixes: bug#19507 + (Bug#19507) 2015-01-21 Ulrich Müller @@ -198,7 +198,7 @@ * INSTALL: Document this. * configure.ac: Add AM_SILENT_RULES([yes]). (AM_DEFAULT_VERBOSITY): Remove now-unnecessary initialization. - Fixes: bug#19501 + (Bug#19501) 2015-01-06 Paul Eggert diff --git a/ChangeLog.2 b/ChangeLog.2 index 2ecf2b5..044f888 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -16,7 +16,7 @@ Pre-4.6 GCC succeeds with unknown option * configure.ac (emacs_cv_prog_cc_nopie): Port to pre-4.6 GCC. - Fixes: bug#20338 + (Bug#20338) 2015-04-15 Paul Eggert @@ -46,7 +46,7 @@ both jpeglib.h and jerror.h features. Remove special case for mingw32, which should no longer be needed (and if it were needed, should now be addressable by hotwiring emacs_cv_jpeglib). - Fixes: bug#20332 + (Bug#20332) 2015-04-15 Stefan Monnier @@ -100,7 +100,7 @@ 2015-04-15 Stefan Monnier * src/lread.c (intern_1): Make sure we'd find the symbol we add - Fixes: debbugs:20334 + (Bug#20334) * src/xfaces.c (resolve_face_name): Don't use `intern' with Lisp_Strings. 2015-04-15 Glenn Morris @@ -169,7 +169,7 @@ Describe problems with cursor caused by Windows Magnifier * etc/PROBLEMS: Describe the problem with cursor shape on MS-Windows due to Windows Magnifier. - Fixes: Bug#20271 + (Bug#20271) Make [:print:] support non-ASCII characters correctly * src/regex.c (ISPRINT): Call 'printablep' for multibyte characters. @@ -254,7 +254,7 @@ 2015-04-13 Dmitry Gutov Change diff-switches default to `-u' - Fixes: debbugs:20290 + (Bug#20290) * doc/emacs/files.texi (Comparing Files): Document the new default value of `diff-switches'. * doc/emacs/trouble.texi (Sending Patches): Document the preference @@ -276,7 +276,7 @@ 2015-04-13 Stefan Monnier * lisp/loadup.el ("cus-start"): Load it after loaddefs.el - Fixes: debbugs:20321 + (Bug#20321) * lisp/cus-start.el (read-buffer-function): Don't advertize iswitchb-read-buffer any more. (iswitchb): Don't tweak this obsolete group any more. @@ -432,7 +432,7 @@ Use completion-separator-chars rather than local key binding. * src/*.c: Set deactivate_mark buffer-locally - Fixes: debbugs:20260 + (Bug#20260) * src/insdel.c (prepare_to_modify_buffer_1): * src/fileio.c (Finsert_file_contents): Set deactivate_mark buffer-locally. @@ -440,7 +440,7 @@ 2015-04-12 Fabián Ezequiel Gallina python.el: Keep symmetry on sexp navigation with parens - Fixes: debbugs:19954 + (Bug#19954) * lisp/progmodes/python.el (python-nav--forward-sexp): Add argument skip-parens-p. (python-nav-forward-sexp, python-nav-backward-sexp) @@ -466,7 +466,7 @@ * configure.ac (MAIL_USE_MMDF): Remove. * etc/NEWS: Document this. * lib-src/movemail.c: Assume MAIL_USE_MMDF is not defined. - Fixes: bug#20308 + (Bug#20308) * doc/man/ChangeLog.01: Rename from doc/man/ChangeLog.1. That way, 'make install' won't think it's a man page. @@ -675,7 +675,7 @@ * src/gnutls.c (syms_of_gnutls) : New DEFSYM. * lisp/term/w32-win.el (dynamic-library-alist): Determine which GnuTLS DLL to load according to value of libgnutls-version. - Fixes: bug#20294 + (Bug#20294) 2015-04-11 Paul Eggert @@ -863,7 +863,7 @@ 2015-04-09 Simen Heggestøyl css-mode.el: Add "not" pseudo-class - Fixes: debbugs:20267 + (Bug#20267) * lisp/textmodes/css-mode.el (css-pseudo-class-ids): Add "not" to list of CSS pseudo-classes. @@ -904,12 +904,12 @@ 2015-04-09 Boruch Baum (tiny change) * lisp/bookmark.el (bookmark-bmenu-goto-bookmark): Don't inf-loop. - Fixes: debbugs:20212 + (Bug#20212) 2015-04-09 Stefan Monnier Stop messing with the EMACS env var - Fixes: debbugs:20202 + (Bug#20202) * lisp/net/tramp-sh.el (tramp-remote-process-environment): * lisp/comint.el (comint-exec-1): * lisp/term.el (term-exec-1): Don't set EMACS envvar. @@ -917,14 +917,14 @@ INSIDE_EMACS's format in line with other users. css-mode.el (css-smie-rules): Fix indentation after complex selectors - Fixes: debbugs:20282 + (Bug#20282) * lisp/textmodes/css-mode.el (css-smie-rules): Don't get confused by inner structure of selectors. 2015-04-08 Fabián Ezequiel Gallina python.el: Indent docstring lines to base-indent - Fixes: debbugs:19595 + (Bug#19595) Thanks to immerrr for reporting and providing an initial patch. * lisp/progmodes/python.el @@ -935,7 +935,7 @@ (python-indent-inside-string-2): Fix tests. python.el: Increase native completion robustness - Fixes: debbugs:19755 + (Bug#19755) Thanks to Carlos Pita for reporting this and providing useful ideas. * lisp/progmodes/python.el @@ -952,7 +952,7 @@ 2015-04-08 Samer Masterson * lisp/eshell: Make backslash a no-op in front of normal chars - Fixes: debbugs:8531 + (Bug#8531) * lisp/eshell/esh-arg.el (eshell-parse-argument-hook): Update comment. (eshell-parse-backslash): Return escaped character after backslash if it is special. Otherwise, if the backslash is not in a quoted @@ -969,7 +969,7 @@ * lisp/vc/diff-mode.el (diff-hunk-file-names): Don't require a TAB after the file name. - Fixes: debbugs:20276 + (Bug#20276) 2015-04-08 Paul Eggert @@ -1006,7 +1006,7 @@ 2015-04-08 Stefan Monnier (eieio-copy-parents-into-subclass): Fix inheritance of initargs - Fixes: debbugs:20270 + (Bug#20270) * lisp/emacs-lisp/eieio-core.el (eieio-copy-parents-into-subclass): Fix inheritance of initargs. @@ -1023,7 +1023,7 @@ 2015-04-08 Eli Zaretskii * src/eval.c (init_eval_once): Bump max_lisp_eval_depth to 800 - Fixes: bug#17517 + (Bug#17517) 2015-04-08 Michael Albinus @@ -1043,7 +1043,7 @@ 2015-04-07 Dmitry Gutov ffap: Support environment variable expansion in file names - Fixes: debbugs:19839 + (Bug#19839) * lisp/ffap.el (ffap-string-at-point-mode-alist): Support environment variable expansion in file names. @@ -1053,7 +1053,7 @@ 2015-04-07 Stefan Monnier - Fixes: debbugs:20257 + (Bug#20257) * lisp/files.el (set-visited-file-name): Clear auto-save if nil. 2015-04-07 Ivan Shmakov @@ -1069,7 +1069,7 @@ Add doc strings for some Isearch state vars * lisp/misearch.el (multi-isearch-buffer-list) (multi-isearch-file-list): Add doc strings. - Fixes: bug#20232 + (Bug#20232) 2015-04-07 Alan Mackenzie @@ -1110,7 +1110,7 @@ .git directory. Distribute the new ChangeLog history files instead of scattered ChangeLog files. Distribute the new files gitlog-to-changelog and gitlog-to-emacslog. - Fixes: bug#19113 + (Bug#19113) Rename ChangeLogs for gitlog-to-changelog This patch was implemented via the following shell commands: @@ -1146,4 +1146,3 @@ See ChangeLog.1 for earlier changes. ;; Local Variables: ;; coding: utf-8 ;; End: - diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 8984f48..a40f8f3 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -502,7 +502,7 @@ 2015-03-20 Alan Mackenzie - Fix debbugs#20146 + Fix Bug#20146 * font-lock.el (font-lock-extend-jit-lock-region-after-change): Return the calculated values, as per spec. @@ -693,7 +693,7 @@ 2015-03-16 Alan Mackenzie - Edebug: Allow "S" to work during trace mode. Fixes debbugs #20074. + Edebug: Allow "S" to work during trace mode. Fixes Bug#20074. Also display the overlay arrow in go and go-nonstop modes. * emacs-lisp/edebug.el (edebug--display-1): Move the diff --git a/src/ChangeLog.13 b/src/ChangeLog.13 index 33d0b9b..328f798 100644 --- a/src/ChangeLog.13 +++ b/src/ChangeLog.13 @@ -124,7 +124,7 @@ Fix minor ldexp issues * floatfns.c (Fldexp): Require 2 args. Avoid undefined behavior if the exponent is out of 'int' range. Improve documentation. - Fixes: bug#20185 + (Bug#20185) 2015-03-24 Daniel Colascione @@ -215,7 +215,7 @@ Work around x86 glibc backtrace bug * sysdep.c (emacs_backtrace): Don't dump core on x86. - Fixes: bug#19959 + (Bug#19959) 2015-03-05 Eli Zaretskii @@ -1079,7 +1079,7 @@ to unused args. * lisp.h (CALLMANY, CALLN): New macros. * sound.c (Fplay_sound_internal): Coalesce duplicate code. - Fixes: bug#19634 + (Bug#19634) Use gnustep-config if available * emacs.c [NS_IMPL_GNUSTEP]: Don't include . @@ -1103,7 +1103,7 @@ Don't downcase system diagnostics' first letters * fileio.c (report_file_errno): Don't downcase, and simplify. - Fixes: bug#19642 + (Bug#19642) Isolate NIL_IS_ZERO-assuming code better Suggested by Stefan Monnier in: @@ -1148,7 +1148,7 @@ Correct an old fix for GTK font selection * gtkutil.c (xg_get_font): Fix off-by-2 typo. - Fixes: bug#3228 + (Bug#3228) Fix minor bugs with printing null bytes * minibuf.c (read_minibuf_noninteractive): @@ -2137,7 +2137,7 @@ * fileio.c (Finsert_file_contents): Compute same_at_end character position using the old buffer size, not the new one, since restore_window_points wants the old size. - Fixes: debbugs:19161 + (Bug#19161) 2014-12-14 Alan Mackenzie diff --git a/test/ChangeLog.1 b/test/ChangeLog.1 index 813f5dd..7f8eecf 100644 --- a/test/ChangeLog.1 +++ b/test/ChangeLog.1 @@ -307,7 +307,7 @@ * indent/shell.sh (bar): Use '[ $# -eq 0 ]', not '[ $# == 0 ]'. This is more portable in shell scripts. - Fixes: bug#19658 + (Bug#19658) 2015-01-23 Dmitry Gutov -- 2.1.0 --------------090301010102010207020305 Content-Type: text/x-patch; name="0003-make-change-history-commit.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0003-make-change-history-commit.patch" >From f48a28e34398551c719807c59819a5dab5f34aa8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Apr 2015 19:51:18 -0700 Subject: [PATCH 3/4] ; make change-history-commit --- ChangeLog.2 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.in | 2 +- 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/ChangeLog.2 b/ChangeLog.2 index 044f888..89fe77f 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,3 +1,99 @@ +2015-04-18 Paul Eggert + + Prefer "Bug#1234" in commit messages + * .dir-locals.el (log-edit-mode): Don't rewrite Bug#, + as this isn't useful for Git. + * CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234". + +2015-04-18 Glenn Morris + + * lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc. + Fixes: debbugs:19506 + +2015-04-18 Tom Willemse (tiny change) + + * lisp/elec-pair.el (electric-pair-post-self-insert-function): Do not use `chomp' as a function. + Fixes: debbugs:19505 + +2015-04-18 Glenn Morris + + * lisp/net/browse-url.el (browse-url, browse-url-at-point): Doc fixes. + + * doc/emacs/misc.texi (Sorting): Small edit. + Fixes: debbugs:19896 + + * admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps. + +2015-04-18 Simen Heggestøyl + + css-mode.el: Support multi-line comment filling + Fixes: debbugs:20256 + * lisp/textmodes/css-mode.el (css-fill-paragraph): Support multi-line + comment filling. + (css-adaptive-fill): New function. + (css-mode): Set `adaptive-fill-function'. + (scss-mode): Set `comment-continue'. + +2015-04-18 Nicolas Petton + + * lisp/emacs-lisp/seq.el (seq-concatenate, seq-into): Better error messages. + +2015-04-18 Ivan Radanov Ivanov (tiny change) + + Minor improvements in Bulgarian input methods + * lisp/leim/quail/cyrillic.el (bulgarian-phonetic, bulgarian-bds): + Replace U+042C with U+045D, as the former character is not used in + the modern Bulgarian language. + Fixes: Bug#20350 + +2015-04-17 Thomas Fitzsimmons + + Improve EUDC manual + * eudc.texi (LDAP Configuration): Mention simple and SASL + authentication schemes. Add index items. Shorten example server + name. + +2015-04-17 Dmitry Gutov + + Don't show both feature and function with the same name + * lisp/progmodes/elisp-mode.el (elisp--xref-identifier-location): + Don't show both feature and function with the same name. + + (elisp--xref-identifier-location): Skip variable, if it's also a functiong + * lisp/progmodes/elisp-mode.el (elisp--xref-identifier-location): + Avoid returning both the variable and the function for the same + minor mode. + +2015-04-17 Wolfgang Jenkner + + Fix fontification of keywords clobbered by the prompt. + * lisp/comint.el (comint-output-filter): Remove the uses of + with-silent-modifications I introduced as part of the last change. + This fixes, e.g., erratically missing highlighting when running + ./configure --help; ./configure in a shell-mode buffer with + compilation-shell-minor-mode turned on. + +2015-04-17 Glenn Morris + + * admin/authors.el (authors-valid-file-names, authors-renamed-files-alist): Additions. + +2015-04-17 Stefan Monnier + + * lisp/indent.el (indent-region): Don't deactivate the mark + Fixes: debbugs:20357 + +2015-04-17 Sam Steingold + + lisp/net/rcirc.el (defun-rcirc-command): mark `target' as ignorable + +2015-04-16 Leo Liu + + * lisp/progmodes/xref.el (xref-push-marker-stack): Add optional arg. + +2015-04-16 Stefan Monnier + + * lisp/erc/erc-pcomplete.el (erc-pcomplete): Don't use `pcomplete' any more. + 2015-04-16 Glenn Morris * admin/authors.el (authors-lax-changelogs): Update for erc changes. diff --git a/Makefile.in b/Makefile.in index 5152a17..f065cd3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1092,7 +1092,7 @@ bootstrap: bootstrap-clean .PHONY: master-branch-is-current no-ChangeLog unchanged-history-files # The newest revision that should not appear in the generated ChangeLog. -gen_origin = 455f13b8c91a51cd08e19fda737a4358a9a927d6 +gen_origin = 870287327b1fba7105599eeabac5a2aa5ebadf19 # Convert git commit log to ChangeLog file. make-dist uses this. ChangeLog: -- 2.1.0 --------------090301010102010207020305 Content-Type: text/x-patch; name="0004-Fix-more-recent-commit-messages-too.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0004-Fix-more-recent-commit-messages-too.patch" >From 65ac8bc6a9e256b60c8ddfa3c99a1b28145a0763 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Apr 2015 19:54:58 -0700 Subject: [PATCH 4/4] ; Fix more-recent commit messages too --- ChangeLog.2 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog.2 b/ChangeLog.2 index 89fe77f..90ef58c 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,6 +1,6 @@ 2015-04-18 Paul Eggert - Prefer "Bug#1234" in commit messages + Prefer "Bug#1234" in commit messages (Bug#20325) * .dir-locals.el (log-edit-mode): Don't rewrite Bug#, as this isn't useful for Git. * CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234". @@ -8,26 +8,26 @@ 2015-04-18 Glenn Morris * lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc. - Fixes: debbugs:19506 + (Bug#19506) 2015-04-18 Tom Willemse (tiny change) * lisp/elec-pair.el (electric-pair-post-self-insert-function): Do not use `chomp' as a function. - Fixes: debbugs:19505 + (Bug#19505) 2015-04-18 Glenn Morris * lisp/net/browse-url.el (browse-url, browse-url-at-point): Doc fixes. * doc/emacs/misc.texi (Sorting): Small edit. - Fixes: debbugs:19896 + (Bug#19896) * admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps. 2015-04-18 Simen Heggestøyl css-mode.el: Support multi-line comment filling - Fixes: debbugs:20256 + (Bug#20256) * lisp/textmodes/css-mode.el (css-fill-paragraph): Support multi-line comment filling. (css-adaptive-fill): New function. @@ -44,7 +44,7 @@ * lisp/leim/quail/cyrillic.el (bulgarian-phonetic, bulgarian-bds): Replace U+042C with U+045D, as the former character is not used in the modern Bulgarian language. - Fixes: Bug#20350 + (Bug#20350) 2015-04-17 Thomas Fitzsimmons @@ -80,7 +80,7 @@ 2015-04-17 Stefan Monnier * lisp/indent.el (indent-region): Don't deactivate the mark - Fixes: debbugs:20357 + (Bug#20357) 2015-04-17 Sam Steingold -- 2.1.0 --------------090301010102010207020305--