[Emacs-diffs] emacs/lisp term/ns-win.el ChangeLog

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/23 13:01:01

Modified files:
        lisp/term      : ns-win.el 
        lisp           : ChangeLog 

Log message:
        * term/ns-win.el (ns-insert-working-text, ns-put-working-text): Switch 
names and update comments for clarity.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/ns-win.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15156&r2=1.15157

Patches:
Index: term/ns-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- term/ns-win.el      22 Jan 2009 12:31:38 -0000      1.31
+++ term/ns-win.el      23 Jan 2009 13:00:21 -0000      1.32
@@ -815,15 +815,16 @@
                    (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."

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15156
retrieving revision 1.15157
diff -u -b -r1.15156 -r1.15157
--- ChangeLog   23 Jan 2009 08:00:23 -0000      1.15156
+++ ChangeLog   23 Jan 2009 13:00:59 -0000      1.15157
@@ -1,3 +1,8 @@
+2009-01-23  Adrian Robert  <address@hidden>
+
+       * term/ns-win.el (ns-insert-working-text, ns-put-working-text): Switch
+       names and update comments for clarity.
+
 2009-01-23  Stefan Monnier  <address@hidden>
 
        * mail/rmail.el (rmail-write-region-annotate): Only switch buffer if