bug#20325: convert "fixes:debbugs:123" in log to (Bug#123) in ChangeLog

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]

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').

[-- Attachment #2: 0001-Prefer-Bug-1234-in-commit-messages.patch --]
[-- Type: text/x-patch, Size: 2142 bytes --]

From f2da220b5fde8575812784f6a9e5f7df9560e838 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Convert-ChangeLog-history-files-to-Bug-NNNN.patch --]
[-- Type: text/x-patch; name="0002-Convert-ChangeLog-history-files-to-Bug-NNNN.patch", Size: 11287 bytes --]

From 870287327b1fba7105599eeabac5a2aa5ebadf19 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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  <eggert@cs.ucla.edu>
 
@@ -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  <ulm@gentoo.org>
 
@@ -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  <eggert@cs.ucla.edu>
 
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  <eggert@cs.ucla.edu>
 
@@ -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  <monnier@iro.umontreal.ca>
 
@@ -100,7 +100,7 @@
 2015-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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  <rgm@gnu.org>
@@ -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  <dgutov@yandex.ru>
 
 	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  <monnier@iro.umontreal.ca>
 
 	* 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  <fgallina@gnu.org>
 
 	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) <libgnutls-version>: 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  <eggert@cs.ucla.edu>
 
@@ -863,7 +863,7 @@
 2015-04-09  Simen Heggestøyl  <simenheg@gmail.com>
 
 	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  <boruch_baum@gmx.com>  (tiny change)
 
 	* lisp/bookmark.el (bookmark-bmenu-goto-bookmark): Don't inf-loop.
-	Fixes: debbugs:20212
+	(Bug#20212)
 
 2015-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	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  <fgallina@gnu.org>
 
 	python.el: Indent docstring lines to base-indent
-	Fixes: debbugs:19595
+	(Bug#19595)
 	Thanks to immerrr <immerrr@gmail.com> 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 <carlosjosepita@gmail.com> for reporting
 	this and providing useful ideas.
 	* lisp/progmodes/python.el
@@ -952,7 +952,7 @@
 2015-04-08  Samer Masterson  <samer@samertm.com>
 
 	* 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  <eggert@cs.ucla.edu>
 
@@ -1006,7 +1006,7 @@
 2015-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	(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  <eliz@gnu.org>
 
 	* src/eval.c (init_eval_once): Bump max_lisp_eval_depth to 800
-	Fixes: bug#17517
+	(Bug#17517)
 
 2015-04-08  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -1043,7 +1043,7 @@
 2015-04-07  Dmitry Gutov  <dgutov@yandex.ru>
 
 	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  <monnier@iro.umontreal.ca>
 
-	Fixes: debbugs:20257
+	(Bug#20257)
 	* lisp/files.el (set-visited-file-name): Clear auto-save if nil.
 
 2015-04-07  Ivan Shmakov  <ivan@siamics.net>
@@ -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  <acm@muc.de>
 
@@ -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  <acm@muc.de>
 
-	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  <acm@muc.de>
 
-	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  <dancol@dancol.org>
 
@@ -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  <eliz@gnu.org>
 
@@ -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 <GNUstepBase/GSConfig.h>.
@@ -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  <acm@muc.de>
 
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  <dgutov@yandex.ru>
 
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-make-change-history-commit.patch --]
[-- Type: text/x-patch; name="0003-make-change-history-commit.patch", Size: 4458 bytes --]

From f48a28e34398551c719807c59819a5dab5f34aa8 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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  <eggert@cs.ucla.edu>
+
+	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  <rgm@gnu.org>
+
+	* lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc.
+	Fixes: debbugs:19506
+
+2015-04-18  Tom Willemse  <tom@ryuslash.org>  (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  <rgm@gnu.org>
+
+	* 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  <simenheg@gmail.com>
+
+	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  <nicolas@petton.fr>
+
+	* lisp/emacs-lisp/seq.el (seq-concatenate, seq-into): Better error messages.
+
+2015-04-18  Ivan Radanov Ivanov  <ivanradanov@yahoo.co.uk>  (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  <fitzsim@fitzsim.org>
+
+	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  <dgutov@yandex.ru>
+
+	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  <wjenkner@inode.at>
+
+	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  <rgm@gnu.org>
+
+	* admin/authors.el (authors-valid-file-names, authors-renamed-files-alist): Additions.
+
+2015-04-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/indent.el (indent-region): Don't deactivate the mark
+	Fixes: debbugs:20357
+
+2015-04-17  Sam Steingold  <sds@gnu.org>
+
+	lisp/net/rcirc.el (defun-rcirc-command): mark `target' as ignorable
+
+2015-04-16  Leo Liu  <sdl.web@gmail.com>
+
+	* lisp/progmodes/xref.el (xref-push-marker-stack): Add optional arg.
+
+2015-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/erc/erc-pcomplete.el (erc-pcomplete): Don't use `pcomplete' any more.
+
 2015-04-16  Glenn Morris  <rgm@gnu.org>
 
 	* 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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-Fix-more-recent-commit-messages-too.patch --]
[-- Type: text/x-patch; name="0004-Fix-more-recent-commit-messages-too.patch", Size: 2139 bytes --]

From 65ac8bc6a9e256b60c8ddfa3c99a1b28145a0763 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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  <eggert@cs.ucla.edu>
 
-	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  <rgm@gnu.org>
 
 	* lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc.
-	Fixes: debbugs:19506
+	(Bug#19506)
 
 2015-04-18  Tom Willemse  <tom@ryuslash.org>  (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  <rgm@gnu.org>
 
 	* 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  <simenheg@gmail.com>
 
 	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  <fitzsim@fitzsim.org>
 
@@ -80,7 +80,7 @@
 2015-04-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* lisp/indent.el (indent-region): Don't deactivate the mark
-	Fixes: debbugs:20357
+	(Bug#20357)
 
 2015-04-17  Sam Steingold  <sds@gnu.org>
 
-- 
2.1.0