Mercurial > emacs

changeset 106848:cfacf49bd905

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
from trunk
author Kenichi Handa <handa@m17n.org>
date Thu, 14 Jan 2010 21:06:23 +0900
parents 0d5d2e53a07c (current diff) 1562bc1aa080 (diff)
children 731b62c1f5cb
files
diffstat 4 files changed, 17 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Jan 14 12:54:04 2010 +0900
+++ b/lisp/ChangeLog	Thu Jan 14 21:06:23 2010 +0900
@@ -1,13 +1,17 @@
+2010-01-14  Glenn Morris  <rgm@gnu.org>
+
+	* frame.el (show-trailing-whitespace): Safe if boolean.  (Bug#5312)
+
 2010-01-14  Kenichi Handa  <handa@m17n.org>
 
 	* composite.el (auto-composition-mode): Make it a buffer local
 	variable (permanent-local).
 	(auto-composition-function): Set the default value to
 	auto-compose-chars.
-	(auto-composition-mode): Make it a simple function, not a minor
-	mode.
+	(auto-composition-mode): Make it a simple function, not a minor mode.
 	(global-auto-composition-mode): Likewise.
 	(turn-on-auto-composition-if-enabled): Delete it.
+
 2010-01-13  Karl Fogel  <kfogel@red-bean.com>
 
 	* bookmark.el (bookmark-bmenu-execute-deletions): Doc fix (Bug#5276).
--- a/lisp/frame.el	Thu Jan 14 12:54:04 2010 +0900
+++ b/lisp/frame.el	Thu Jan 14 21:06:23 2010 +0900
@@ -1525,6 +1525,7 @@
   "Non-nil means highlight trailing whitespace.
 This is done in the face `trailing-whitespace'."
   :type 'boolean
+  :safe 'booleanp
   :group 'whitespace-faces)
 
 
--- a/src/ChangeLog	Thu Jan 14 12:54:04 2010 +0900
+++ b/src/ChangeLog	Thu Jan 14 21:06:23 2010 +0900
@@ -1,3 +1,8 @@
+2010-01-14  Kenichi Handa  <handa@m17n.org>
+
+	* coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding
+	systems.
+
 2010-01-14  Kenichi Handa  <handa@m17n.org>
 
 	Make auto-composition work on all buffers even if they are
--- a/src/coding.c	Thu Jan 14 12:54:04 2010 +0900
+++ b/src/coding.c	Thu Jan 14 21:06:23 2010 +0900
@@ -3239,9 +3239,13 @@
 		  int i = 1;
 		  while (src < src_end)
 		    {
+		      src_base = src;
 		      ONE_MORE_BYTE (c);
 		      if (c < 0xA0)
-			break;
+			{
+			  src = src_base;
+			  break;
+			}
 		      i++;
 		    }