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
e5f8af9e
Commit
e5f8af9e
authored
Mar 15, 1995
by
Karl Heuer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(find_symbol_value): current_perdisplay now is never null.
(store_symval_forwarding, do_symval_forwarding): Likewise.
parent
b875d3f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
17 deletions
+11
-17
src/data.c
src/data.c
+11
-17
No files found.
src/data.c
View file @
e5f8af9e
...
...
@@ -711,11 +711,9 @@ do_symval_forwarding (valcontents)
offset
=
XBUFFER_OBJFWD
(
valcontents
)
->
offset
;
return
*
(
Lisp_Object
*
)(
offset
+
(
char
*
)
current_buffer
);
case
Lisp_Misc_Display_Objfwd
:
if
(
!
current_perdisplay
)
abort
();
offset
=
XDISPLAY_OBJFWD
(
valcontents
)
->
offset
;
return
*
(
Lisp_Object
*
)(
offset
+
(
char
*
)
current_perdisplay
);
case
Lisp_Misc_Kboard_Objfwd
:
offset
=
XKBOARD_OBJFWD
(
valcontents
)
->
offset
;
return
*
(
Lisp_Object
*
)(
offset
+
(
char
*
)
current_kboard
);
}
return
valcontents
;
}
...
...
@@ -762,11 +760,9 @@ store_symval_forwarding (sym, valcontents, newval)
}
break
;
case
Lisp_Misc_Display_Objfwd
:
if
(
!
current_perdisplay
)
abort
();
(
*
(
Lisp_Object
*
)((
char
*
)
current_perdisplay
+
XDISPLAY_OBJFWD
(
valcontents
)
->
offset
))
case
Lisp_Misc_Kboard_Objfwd
:
(
*
(
Lisp_Object
*
)((
char
*
)
current_kboard
+
XKBOARD_OBJFWD
(
valcontents
)
->
offset
))
=
newval
;
break
;
...
...
@@ -868,11 +864,9 @@ find_symbol_value (sym)
return
*
(
Lisp_Object
*
)(
XBUFFER_OBJFWD
(
valcontents
)
->
offset
+
(
char
*
)
current_buffer
);
case
Lisp_Misc_Display_Objfwd
:
if
(
!
current_perdisplay
)
abort
();
return
*
(
Lisp_Object
*
)(
XDISPLAY_OBJFWD
(
valcontents
)
->
offset
+
(
char
*
)
current_perdisplay
);
case
Lisp_Misc_Kboard_Objfwd
:
return
*
(
Lisp_Object
*
)(
XKBOARD_OBJFWD
(
valcontents
)
->
offset
+
(
char
*
)
current_kboard
);
}
}
...
...
@@ -1191,7 +1185,7 @@ The function `default-value' gets the default value and `set-default' sets it.")
CHECK_SYMBOL
(
sym
,
0
);
valcontents
=
XSYMBOL
(
sym
)
->
value
;
if
(
EQ
(
sym
,
Qnil
)
||
EQ
(
sym
,
Qt
)
||
DISPLAY
_OBJFWDP
(
valcontents
))
if
(
EQ
(
sym
,
Qnil
)
||
EQ
(
sym
,
Qt
)
||
KBOARD
_OBJFWDP
(
valcontents
))
error
(
"Symbol %s may not be buffer-local"
,
XSYMBOL
(
sym
)
->
name
->
data
);
if
(
BUFFER_LOCAL_VALUEP
(
valcontents
)
||
BUFFER_OBJFWDP
(
valcontents
))
...
...
@@ -1234,7 +1228,7 @@ Use `make-local-hook' instead.")
CHECK_SYMBOL
(
sym
,
0
);
valcontents
=
XSYMBOL
(
sym
)
->
value
;
if
(
EQ
(
sym
,
Qnil
)
||
EQ
(
sym
,
Qt
)
||
DISPLAY
_OBJFWDP
(
valcontents
))
if
(
EQ
(
sym
,
Qnil
)
||
EQ
(
sym
,
Qt
)
||
KBOARD
_OBJFWDP
(
valcontents
))
error
(
"Symbol %s may not be buffer-local"
,
XSYMBOL
(
sym
)
->
name
->
data
);
if
(
BUFFER_LOCAL_VALUEP
(
valcontents
)
||
BUFFER_OBJFWDP
(
valcontents
))
...
...
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