* term/ns-win.el (ns-insert-working-text, ns-put-working-text): Switch names and...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2945021a93200bee57f7f66511dc49a5289ccf7..aa81238a37b09e263b82a6dae64bea12d4377652 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-23  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+       * term/ns-win.el (ns-insert-working-text, ns-put-working-text): Switch
+       names and update comments for clarity.
+
 2009-01-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * mail/rmail.el (rmail-write-region-annotate): Only switch buffer if

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 631d8429821e9e9621406ec81c9c8123c7c8b365..c4ed8bc8737a5237835cc15412e52120dafbd5b8 100644 (file)
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -815,15 +815,16 @@ is currently being used."
                    (eq (get-char-property (1- (point)) 'composition)
                        (get-char-property (point) 'composition)))))))
 
-;; Currently not used, doesn't work because the 'interactive' here stays
-;; for subinvocations.
-(defun ns-insert-working-text ()
+;; The 'interactive' here stays for subinvocations, so the ns-in-echo-area
+;; always returns nil for some reason.  If this WASN'T the case, we could
+;; map this to [ns-insert-working-text] and eliminate Fevals in nsterm.m.
+(defun ns-put-working-text ()
   (interactive)
-  (if (ns-in-echo-area) (ns-echo-working-text) (ns-put-working-text)))
+  (if (ns-in-echo-area) (ns-echo-working-text) (ns-insert-working-text)))
 
 (defvar ns-working-text)               ; nsterm.m
 
-(defun ns-put-working-text ()
+(defun ns-insert-working-text ()
   "Insert contents of ns-working-text as UTF8 string and mark with
 ns-working-overlay.  Any previously existing working text is cleared first.
 The overlay is assigned the face ns-working-text-face."