4 files changed, 16 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d9ccc0cd32..2698374ed8a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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.
+
 2012-06-08  Sam Steingold  <sds@gnu.org>
 
         * bindings.el (global-map): Bind XF86Forward to next-buffer and
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 50b32fc8f2e..bcb95a54ad6 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -597,7 +597,10 @@ relevant to POS."
                                  `(insert-text-button
                                    ,current-input-method
                                    'type 'help-input-method
-                                   'help-args '(,current-input-method)))))))
+                                   'help-args '(,current-input-method))
+                                 "input method")
+                         (list
+                          "type \"C-x 8 RET HEX-CODEPOINT\" or \"C-x 8 RET NAME\"")))))
               ("buffer code"
                ,(if multibyte-p
                     (encoded-string-description
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 95716ae2e29..cd26660f4f5 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -263,7 +263,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
 ;;;;;;  cl-do* cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase
 ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
 ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
-;;;;;;  cl-gensym) "cl-macs" "cl-macs.el" "4c0f605e3c7454488cc9d498b611f422")
+;;;;;;  cl-gensym) "cl-macs" "cl-macs.el" "ce1ef5c6c925f03cb425d9a46cfa6d5f")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl-gensym "cl-macs" "\
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)
              any of the windows contain margins.  I haven't been able
              to hunt down the reason, but for the moment this prevents
              the problem from manifesting. -- cyd  */
-          && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f))))
+#if 0
+          && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f)))
+#endif
+          )
         {
           struct glyph_matrix *copy = save_current_matrix (f);
           adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim);