[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106662: coding.c (Funencodable_char_
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106662: coding.c (Funencodable_char_position): Pay attention to the buffer text relocation (Bug#9389). |
Date: |
Sun, 11 Dec 2011 21:14:31 +0900 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106662 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Sun 2011-12-11 21:14:31 +0900
message:
coding.c (Funencodable_char_position): Pay attention to the buffer text
relocation (Bug#9389).
modified:
src/ChangeLog
src/coding.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-12-10 22:53:28 +0000
+++ b/src/ChangeLog 2011-12-11 12:08:51 +0000
@@ -1,3 +1,8 @@
+2011-12-11 Kenichi Handa <address@hidden>
+
+ * coding.c (Funencodable_char_position): Pay attention to the
+ buffer text relocation (Bug#9389).
+
2011-12-10 Jan Djärv <address@hidden>
* xterm.c (x_term_init): Move call to gdk_window_add_filter before
=== modified file 'src/coding.c'
--- a/src/coding.c 2011-12-08 05:54:20 +0000
+++ b/src/coding.c 2011-12-11 12:08:51 +0000
@@ -8756,6 +8756,7 @@
}
positions = Qnil;
+ charset_map_loaded = 0;
while (1)
{
int c;
@@ -8783,6 +8784,16 @@
}
from++;
+ if (charset_map_loaded && NILP (string))
+ {
+ p = CHAR_POS_ADDR (from);
+ pend = CHAR_POS_ADDR (to);
+ if (from < GPT && to >= GPT)
+ stop = GPT_ADDR;
+ else
+ stop = pend;
+ charset_map_loaded = 0;
+ }
}
return (NILP (count) ? Fcar (positions) : Fnreverse (positions));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106662: coding.c (Funencodable_char_position): Pay attention to the buffer text relocation (Bug#9389).,
Kenichi Handa <=