diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-23 13:00:21 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-23 13:00:21 +0000 |
| commit | 9d8f6d31669e36ebd1b9654d8948d4e976b63466 (patch) | |
| tree | 113e7596faa772366131b585a7626be7a896aa99 /lisp | |
| parent | d900b2af456101183c1d25f94853b5df34548235 (diff) | |
| download | emacs-9d8f6d31669e36ebd1b9654d8948d4e976b63466.tar.gz | |
* term/ns-win.el (ns-insert-working-text, ns-put-working-text): Switch names and update comments for clarity.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2945021a93..aa81238a37b 100644 --- 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 631d8429821..c4ed8bc8737 100644 --- 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." |