Improve a couple of changelog entries.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e6442f89525de882d0ed12d7e2560b3df39076e..25dcbc67ab798adfa5b3e6b77a0f59900dd43c7a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -307,9 +307,13 @@
        * subr.el (version-regexp-alist):
        Recognize hg, svn and darcs versions as snapshot versions.
 
-       * progmodes/ruby-mode.el (ruby-mode-set-encoding):
-       Add the ability to always insert an utf-8 encoding comment.
-       Fix and simplify coding comment update logic.
+       * progmodes/ruby-mode.el (ruby--detect-encoding): Make aware of
+       'always-utf8 value of `ruby-insert-encoding-magic-comment'.
+       (ruby--encoding-comment-required-p): Extract from
+       `ruby-mode-set-encoding'.
+       (ruby-mode-set-encoding): Add the ability to always insert an
+       utf-8 encoding comment.  Fix and simplify coding comment update
+       logic.
 
 2013-11-14  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -455,9 +459,13 @@
 
 2013-11-08  Bozhidar Batsov  <bozhidar@batsov.com>
 
-       * progmodes/ruby-mode.el (ruby-mode-set-encoding):
-       Use `ruby-encoding-magic-comment-style' to control the
-       style of the auto-inserted encoding comment.
+       * progmodes/ruby-mode.el: Improve encoding comment handling.
+       (ruby-encoding-magic-comment-style): New option.
+       (ruby-custom-encoding-magic-comment-template): New option.
+       (ruby--insert-coding-comment, ruby--detect-encoding): New
+       functions extracted from `ruby-mode-set-encoding'.
+       (ruby-mode-set-encoding): Use `ruby-encoding-magic-comment-style'
+       to control the style of the auto-inserted encoding comment.
 
 2013-11-08  Dmitry Gutov  <dgutov@yandex.ru>
 

diff --git a/test/ChangeLog b/test/ChangeLog
index a0c17f6cfb70b3d05511b0bbcc4382689ae71978..d22c47f62df9f91b3bf808569005eec9a4a0621b 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -28,9 +28,12 @@
 
 2013-11-20  Bozhidar Batsov <bozhidar@batsov.com>
 
-       * test/automated/ruby-mode-tests.el:
+       * test/automated/ruby-mode-tests.el (ruby-exit!-font-lock):
        Add a failing test for Bug#15874.
-       * test/automated/ruby-mode-tests.el:
+       * test/automated/ruby-mode-tests.el
+       (ruby--insert-coding-comment-ruby-style)
+       (ruby--insert-coding-comment-emacs-style)
+       (ruby--insert-coding-comment-custom-style):
        Add a few tests for `ruby--insert-coding-comment'.
 
 2013-11-18  Paul Eggert  <eggert@cs.ucla.edu>