(momentary-string-display): After moving point, set POS variable to it to avoid

later errors once the buffer is modified.  Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4e634ae4608d19f25266291dd74da8f2e00220e..687dabb2b94ed61460e7edb8ba4dfa47830afe4d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-02  Juanma Barranquero  <lekktu@gmail.com>
+
+       * subr.el (momentary-string-display): After moving point, set POS
+       variable to it to avoid later errors once the buffer is modified.
+       Doc fix.
+
 2007-01-02  Alan Mackenzie  <acm@muc.de>
 
        * progmodes/cc-cmds.el (c-mask-paragraph): In a block comment,
@@ -7,13 +13,13 @@
 
        * wid-edit.el (widget-choose): Avoid ugly error for function keys.
 
-       * progmodes/cfengine.el (cfengine-font-lock-syntactic-keywords): 
+       * progmodes/cfengine.el (cfengine-font-lock-syntactic-keywords):
        Fix format of value.
 
        * cus-edit.el (customize-unsaved): Renamed from customize-customized.
        Change messages accordingly.
        (customize-customized): Now alias.
-       
+
 2007-01-02  Juanma Barranquero  <lekktu@gmail.com>
 
        * files.el (version-control): Doc fix.
@@ -2317,8 +2323,8 @@
 
 2006-10-19  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
-       * select.el (ccl-check-utf-8, string-utf-8-p): New functions
-       (by Kenichi Handa).
+       * select.el (ccl-check-utf-8, string-utf-8-p): New functions (by
+       Kenichi Handa).
        (xselect-convert-to-string): Decline requests for UTF8_STRING if
        the selection is not UTF-8.
 

diff --git a/lisp/subr.el b/lisp/subr.el
index 086163cca72969c48f5249f2ceaf7eb264a3953a..c98e14b6334b01abd7cd95479a70faf4a258cfaa 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1887,6 +1887,7 @@ menu bar menus and the frame title."
 (defun momentary-string-display (string pos &optional exit-char message)
   "Momentarily display STRING in the buffer at POS.
 Display remains until next event is input.
+If POS is a marker, only its position is used; its buffer is ignored.
 Optional third arg EXIT-CHAR can be a character, event or event
 description list.  EXIT-CHAR defaults to SPC.  If the input is
 EXIT-CHAR it is swallowed; otherwise it is then available as
@@ -1904,6 +1905,8 @@ If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there."
        (progn
          (save-excursion
            (goto-char pos)
+           ;; To avoid trouble with out-of-bounds position
+           (setq pos (point))
            ;; defeat file locking... don't try this at home, kids!
            (setq buffer-file-name nil)
            (insert-before-markers string)