Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
d1ff9ee4
Commit
d1ff9ee4
authored
May 07, 2014
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* minibuf.c (read_minibuf): Avoid C99ism in previous patch.
Fixes: debbugs:17430
parent
551a89e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
src/ChangeLog
src/ChangeLog
+4
-0
src/minibuf.c
src/minibuf.c
+7
-5
No files found.
src/ChangeLog
View file @
d1ff9ee4
2014-05-07 Paul Eggert <eggert@cs.ucla.edu>
* minibuf.c (read_minibuf): Avoid C99ism in previous patch (Bug#17430).
2014-05-07 Jarek Czekalski <jarekczek@poczta.onet.pl>
Fix initialization of minibuffer history variable (Bug#17430).
...
...
src/minibuf.c
View file @
d1ff9ee4
...
...
@@ -384,6 +384,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
EMACS_INT
pos
=
0
;
/* String to add to the history. */
Lisp_Object
histstring
;
Lisp_Object
histval
;
Lisp_Object
empty_minibuf
;
Lisp_Object
dummy
,
frame
;
...
...
@@ -536,11 +537,12 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
Vminibuffer_completing_file_name
=
Qlambda
;
/* If variable is unbound, make it nil. */
Lisp_Object
histval
=
find_symbol_value
(
Vminibuffer_history_variable
);
if
(
EQ
(
histval
,
Qunbound
))
{
Fset
(
Vminibuffer_history_variable
,
Qnil
);
histval
=
Qnil
;
}
histval
=
find_symbol_value
(
Vminibuffer_history_variable
);
if
(
EQ
(
histval
,
Qunbound
))
{
Fset
(
Vminibuffer_history_variable
,
Qnil
);
histval
=
Qnil
;
}
if
(
inherit_input_method
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment