aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-06-08 11:44:45 +0300
committerEli Zaretskii2012-06-08 11:44:45 +0300
commite9f66fcb51971f4cc138979b7f65eac588ee133d (patch)
tree474a6e3b81dc04acbb1b56de300646704599aded /src
parentf3372c8789c843a00912e7fc9793ded4beb9a35a (diff)
downloademacs-e9f66fcb51971f4cc138979b7f65eac588ee133d.tar.gz
emacs-e9f66fcb51971f4cc138979b7f65eac588ee133d.zip
Mention in "C-u C-x =" display how to insert the character w/o input methods.
lisp/descr-text.el (describe-char): Mention how to insert the character, if the current input method doesn't support it. See the discussion in this thread for the details: http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00533.html.
Diffstat (limited to 'src')
-rw-r--r--src/dispnew.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index a23f2b9a959..5cf6d581790 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2173,7 +2173,10 @@ adjust_frame_glyphs_for_frame_redisplay (struct frame *f)
2173 any of the windows contain margins. I haven't been able 2173 any of the windows contain margins. I haven't been able
2174 to hunt down the reason, but for the moment this prevents 2174 to hunt down the reason, but for the moment this prevents
2175 the problem from manifesting. -- cyd */ 2175 the problem from manifesting. -- cyd */
2176 && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f)))) 2176#if 0
2177 && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f)))
2178#endif
2179 )
2177 { 2180 {
2178 struct glyph_matrix *copy = save_current_matrix (f); 2181 struct glyph_matrix *copy = save_current_matrix (f);
2179 adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim); 2182 adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim);