From: Bozhidar Batsov <bozhidar@batsov.com>
Date: Tue, 26 Nov 2013 10:38:19 +0000 (+0200)
Subject: Improve a couple of changelog entries.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~689
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e9fc48c06eef312b81764ff235293bfe2be594b;p=emacs.git

Improve a couple of changelog entries.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e6442f8952..25dcbc67ab7 100644
--- 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 a0c17f6cfb7..d22c47f62df 100644
--- 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>