aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-12-23 01:20:50 +0000
committerRichard M. Stallman1993-12-23 01:20:50 +0000
commit6a9ee000ddd93021fac5ae4f1d57adfa3ddc4f2e (patch)
tree403495249b9c0a48392a4bfa4c75baa5d9036bd9
parent83010cd6e25718ff01ff1c6b53e39a0dec21a3b2 (diff)
downloademacs-6a9ee000ddd93021fac5ae4f1d57adfa3ddc4f2e.tar.gz
emacs-6a9ee000ddd93021fac5ae4f1d57adfa3ddc4f2e.zip
(minibuffer_auto_raise): Really define it.
(minibuffer_auto_raise): New variable. (syms_of_minibuf): Set up Lisp var. (read_minibuf): Maybe raise the minibuffer's frame.
-rw-r--r--src/minibuf.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index dc13d641a57..cbf6970bdbd 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -85,13 +85,17 @@ Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook;
85 85
86int completion_ignore_case; 86int completion_ignore_case;
87 87
88/* Nonzero means raise the minibuffer frame when the minibuffer
89 is entered. */
90
91int minibuffer_auto_raise;
92
88/* If last completion attempt reported "Complete but not unique" 93/* If last completion attempt reported "Complete but not unique"
89 then this is the string completed then; otherwise this is nil. */ 94 then this is the string completed then; otherwise this is nil. */
90 95
91static Lisp_Object last_exact_completion; 96static Lisp_Object last_exact_completion;
92 97
93Lisp_Object Quser_variable_p; 98Lisp_Object Quser_variable_p;
94
95 99
96/* Actual minibuffer invocation. */ 100/* Actual minibuffer invocation. */
97 101
@@ -168,6 +172,8 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
168 if (XFRAME (mini_frame) != selected_frame) 172 if (XFRAME (mini_frame) != selected_frame)
169 record_unwind_protect (Fset_window_configuration, 173 record_unwind_protect (Fset_window_configuration,
170 Fcurrent_window_configuration (mini_frame)); 174 Fcurrent_window_configuration (mini_frame));
175 if (minibuffer_auto_raise)
176 Fraise_frame (mini_frame);
171#endif 177#endif
172 178
173 val = current_buffer->directory; 179 val = current_buffer->directory;
@@ -1509,6 +1515,10 @@ Each minibuffer output is added with\n\
1509 "Current position of redoing in the history list."); 1515 "Current position of redoing in the history list.");
1510 Vminibuffer_history_position = Qnil; 1516 Vminibuffer_history_position = Qnil;
1511 1517
1518 DEFVAR_BOOL ("minibuffer-auto-raise", &minibuffer_auto_raise,
1519 "*Non-nil means entering the minibuffer raises the minibuffer's frame.");
1520 minibuffer_auto_raise = 0;
1521
1512 defsubr (&Sread_from_minibuffer); 1522 defsubr (&Sread_from_minibuffer);
1513 defsubr (&Seval_minibuffer); 1523 defsubr (&Seval_minibuffer);
1514 defsubr (&Sread_minibuffer); 1524 defsubr (&Sread_minibuffer);