aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-10-31 10:58:35 +0000
committerGerd Moellmann2001-10-31 10:58:35 +0000
commitb9d9a9b9fef090d0fc79781df5e42d58fd2e5bfa (patch)
tree44f5671c7a1eeb078137e26076052b4fd7eca2a2
parentfa1361cbef4097890d1d1d015866876b0f567572 (diff)
downloademacs-b9d9a9b9fef090d0fc79781df5e42d58fd2e5bfa.tar.gz
emacs-b9d9a9b9fef090d0fc79781df5e42d58fd2e5bfa.zip
(require_unwind): Return Lisp_Object.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fns.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 04042fab40b..98c2e0d87c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12001-10-31 Gerd Moellmann <gerd@gnu.org>
2
3 * fns.c (require_unwind): Return Lisp_Object.
4
12001-10-31 Pavel Jan,Bm(Bk <Pavel@Janik.cz> 52001-10-31 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2 6
3 * keyboard.c (lucid-menu-bar-dirty-flag): Doc fix. 7 * keyboard.c (lucid-menu-bar-dirty-flag): Doc fix.
diff --git a/src/fns.c b/src/fns.c
index 62f9d85682c..15415d9a1ad 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3082,10 +3082,11 @@ particular subfeatures supported in this version of FEATURE. */)
3082 3082
3083Lisp_Object require_nesting_list; 3083Lisp_Object require_nesting_list;
3084 3084
3085Lisp_Object
3085require_unwind (old_value) 3086require_unwind (old_value)
3086 Lisp_Object old_value; 3087 Lisp_Object old_value;
3087{ 3088{
3088 require_nesting_list = old_value; 3089 return require_nesting_list = old_value;
3089} 3090}
3090 3091
3091DEFUN ("require", Frequire, Srequire, 1, 3, 0, 3092DEFUN ("require", Frequire, Srequire, 1, 3, 0,