[Emacs-diffs] master f48a28e 1/2: ; make change-history-commit

[Paul Eggert]

branch: master
commit f48a28e34398551c719807c59819a5dab5f34aa8
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    ; make change-history-commit
---
 ChangeLog.2 |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.in |    2 +-
 2 files changed, 97 insertions(+), 1 deletions(-)

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  <address@hidden>
+
+       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  <address@hidden>
+
+       * lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc.
+       Fixes: debbugs:19506
+
+2015-04-18  Tom Willemse  <address@hidden>  (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  <address@hidden>
+
+       * 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  <address@hidden>
+
+       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  <address@hidden>
+
+       * lisp/emacs-lisp/seq.el (seq-concatenate, seq-into): Better error 
messages.
+
+2015-04-18  Ivan Radanov Ivanov  <address@hidden>  (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  <address@hidden>
+
+       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  <address@hidden>
+
+       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  <address@hidden>
+
+       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  <address@hidden>
+
+       * admin/authors.el (authors-valid-file-names, 
authors-renamed-files-alist): Additions.
+
+2015-04-17  Stefan Monnier  <address@hidden>
+
+       * lisp/indent.el (indent-region): Don't deactivate the mark
+       Fixes: debbugs:20357
+
+2015-04-17  Sam Steingold  <address@hidden>
+
+       lisp/net/rcirc.el (defun-rcirc-command): mark `target' as ignorable
+
+2015-04-16  Leo Liu  <address@hidden>
+
+       * lisp/progmodes/xref.el (xref-push-marker-stack): Add optional arg.
+
+2015-04-16  Stefan Monnier  <address@hidden>
+
+       * lisp/erc/erc-pcomplete.el (erc-pcomplete): Don't use `pcomplete' any 
more.
+
 2015-04-16  Glenn Morris  <address@hidden>
 
        * 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: