aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-04-14 03:39:31 +0000
committerStefan Monnier2008-04-14 03:39:31 +0000
commitbf87d5fcf42aec2ef865c0051671b0b6f38071f4 (patch)
tree73c76811d490f1f01275071123cb6e755a1a75d2
parent2ed430f471ba94b80586e9c955341b5d180acdee (diff)
downloademacs-bf87d5fcf42aec2ef865c0051671b0b6f38071f4.tar.gz
emacs-bf87d5fcf42aec2ef865c0051671b0b6f38071f4.zip
(minibuffer-message): Put cursor at the right place.
-rw-r--r--lisp/ChangeLog19
-rw-r--r--lisp/minibuffer.el5
2 files changed, 16 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8074ba02f39..7c9712bb7d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuffer.el (minibuffer-message): Put cursor at the right place.
4
12008-04-13 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> 52008-04-13 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
2 6
3 * proced.el (proced-send-signal): Fix error recognition. 7 * proced.el (proced-send-signal): Fix error recognition.
@@ -5,21 +9,20 @@
52008-04-13 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> 92008-04-13 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
6 10
7 * proced.el (proced-command-alist): Remove sort column. 11 * proced.el (proced-command-alist): Remove sort column.
8 (proced-command, proced-procname-column): Use 12 (proced-command, proced-procname-column):
9 make-variable-buffer-local. 13 Use make-variable-buffer-local.
10 (proced-signal-function): Renamed from proced-kill-program. Allow 14 (proced-signal-function): Rename from proced-kill-program.
11 for elisp symbols and string values representing system calls. 15 Allow for elisp symbols and string values representing system calls.
12 (proced-marker-regexp, proced-success-message): New functions. 16 (proced-marker-regexp, proced-success-message): New functions.
13 (proced): Use defalias. Add autoload cookie. 17 (proced): Use defalias. Add autoload cookie.
14 (proced-unmark-backward, proced-toggle-marks) 18 (proced-unmark-backward, proced-toggle-marks)
15 (proced-hide-processes): New commands. 19 (proced-hide-processes): New commands.
16 (proced-do-mark): Simplify code. 20 (proced-do-mark): Simplify code.
17 (proced-insert-mark): Use optional arg BACKWARD instead of line 21 (proced-insert-mark): Use optional arg BACKWARD instead of line number.
18 number.
19 (proced-update): Remove sorting. 22 (proced-update): Remove sorting.
20 (proced-send-signal): Display number of processes to operate on. 23 (proced-send-signal): Display number of processes to operate on.
21 Allow for system calls or elisp functions to send signals. Check 24 Allow for system calls or elisp functions to send signals.
22 if signal was send successfully. 25 Check if signal was sent successfully.
23 26
242008-04-13 Stefan Monnier <monnier@iro.umontreal.ca> 272008-04-13 Stefan Monnier <monnier@iro.umontreal.ca>
25 28
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 180a44dea15..7baef47ba79 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -173,6 +173,11 @@ If ARGS are provided, then pass MESSAGE through `format'."
173 (let ((ol (make-overlay (point-max) (point-max) nil t t))) 173 (let ((ol (make-overlay (point-max) (point-max) nil t t)))
174 (unwind-protect 174 (unwind-protect
175 (progn 175 (progn
176 (unless (zerop (length message))
177 ;; The current C cursor code doesn't know to use the overlay's
178 ;; marker's stickiness to figure out whether to place the cursor
179 ;; before or after the string, so let's spoon-feed it the pos.
180 (put-text-property 0 1 'cursor t message))
176 (overlay-put ol 'after-string message) 181 (overlay-put ol 'after-string message)
177 (sit-for (or minibuffer-message-timeout 1000000))) 182 (sit-for (or minibuffer-message-timeout 1000000)))
178 (delete-overlay ol)))) 183 (delete-overlay ol))))