[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108521: Mention in "C-u C-x =" display how to insert the character w/o input methods.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108521
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-06-08 11:44:45 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/descr-text.el
  lisp/emacs-lisp/cl-loaddefs.el
  src/dispnew.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-08 04:23:26 +0000
+++ b/lisp/ChangeLog    2012-06-08 08:44:45 +0000
@@ -1,3 +1,10 @@
+2012-06-08  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bindings.el (global-map): Bind XF86Forward to next-buffer and

=== modified file 'lisp/descr-text.el'
--- a/lisp/descr-text.el        2012-04-19 16:50:07 +0000
+++ b/lisp/descr-text.el        2012-06-08 08:44:45 +0000
@@ -597,7 +597,10 @@
                                  `(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

=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el    2012-06-08 02:54:35 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el    2012-06-08 08:44:45 +0000
@@ -263,7 +263,7 @@
 ;;;;;;  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" "\

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2012-05-30 19:23:37 +0000
+++ b/src/dispnew.c     2012-06-08 08:44:45 +0000
@@ -2173,7 +2173,10 @@
             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);