Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
67b77c0b
Commit
67b77c0b
authored
Aug 14, 2012
by
Andreas Schwab
Browse files
* gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP.
parent
a9f6f311
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
src/ChangeLog
src/ChangeLog
+4
-0
src/gtkutil.c
src/gtkutil.c
+3
-3
No files found.
src/ChangeLog
View file @
67b77c0b
2012-08-14 Andreas Schwab <schwab@linux-m68k.org>
* gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP.
2012-08-14 Gergely Risko <gergely@risko.hu>
* coding.c (decode_coding): Record buffer modification before
...
...
src/gtkutil.c
View file @
67b77c0b
...
...
@@ -4306,7 +4306,7 @@ find_rtl_image (FRAME_PTR f, Lisp_Object image, Lisp_Object rtl)
{
file
=
call1
(
intern
(
"file-name-sans-extension"
),
Ffile_name_nondirectory
(
file
));
if
(
EQ
(
Fequal
(
file
,
rtl_name
)
,
Qt
))
if
(
!
NILP
(
Fequal
(
file
,
rtl_name
)))
{
image
=
rtl_image
;
break
;
...
...
@@ -4583,8 +4583,8 @@ update_frame_tool_bar (FRAME_PTR f)
&&
tbinfo
->
n_last_items
==
f
->
n_tool_bar_items
&&
tbinfo
->
hmargin
==
hmargin
&&
tbinfo
->
vmargin
==
vmargin
&&
tbinfo
->
dir
==
dir
&&
EQ
(
Fequal
(
tbinfo
->
style
,
style
)
,
Qt
)
&&
EQ
(
Fequal
(
tbinfo
->
last_tool_bar
,
f
->
tool_bar_items
)
,
Qt
))
&&
!
NILP
(
Fequal
(
tbinfo
->
style
,
style
))
&&
!
NILP
(
Fequal
(
tbinfo
->
last_tool_bar
,
f
->
tool_bar_items
)))
{
UNBLOCK_INPUT
;
return
;
...
...
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