Mercurial > emacs
changeset 101401:93936c347fa1
* term/ns-win.el (ns-insert-working-text, ns-put-working-text): Switch names and update comments for clarity.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Fri, 23 Jan 2009 13:00:21 +0000 |
| parents | 27828d2e3209 |
| children | c542410b5bda |
| files | lisp/ChangeLog lisp/term/ns-win.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jan 23 10:31:54 2009 +0000 +++ b/lisp/ChangeLog Fri Jan 23 13:00:21 2009 +0000 @@ -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
--- a/lisp/term/ns-win.el Fri Jan 23 10:31:54 2009 +0000 +++ b/lisp/term/ns-win.el Fri Jan 23 13:00:21 2009 +0000 @@ -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."