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
56f41f98
Commit
56f41f98
authored
Jun 02, 2006
by
Chong Yidong
Browse files
* xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
string.
parent
3d80c941
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
src/ChangeLog
src/ChangeLog
+5
-0
src/xfns.c
src/xfns.c
+1
-1
No files found.
src/ChangeLog
View file @
56f41f98
2006-06-02 Chong Yidong <cyd@stupidchicken.com>
* xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
string.
2006-06-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xdisp.c (next_element_from_composition): Set it->object to
...
...
src/xfns.c
View file @
56f41f98
...
...
@@ -1249,7 +1249,7 @@ x_set_icon_name (f, arg, oldval)
if
(
STRINGP
(
oldval
)
&&
EQ
(
Fstring_equal
(
oldval
,
arg
),
Qt
))
return
;
}
else
if
(
!
STRINGP
(
oldval
)
&&
EQ
(
oldval
,
Qnil
)
==
EQ
(
arg
,
Qni
l
))
else
if
(
!
NILP
(
arg
)
||
NILP
(
oldva
l
))
return
;
f
->
icon_name
=
arg
;
...
...
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