aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/lisp.h5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4f06b3d3509..b1575f621e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-07-03 Glenn Morris <rgm@gnu.org>
2
3 * lisp.h (Fread_file_name): Restore EXFUN (it's not a normal DEFUN
4 and did not make it into globals.h).
5
12012-07-03 Tom Tromey <tromey@redhat.com> 62012-07-03 Tom Tromey <tromey@redhat.com>
2 7
3 * window.c (Fset_window_margins, Fset_window_fringes) 8 * window.c (Fset_window_margins, Fset_window_fringes)
diff --git a/src/lisp.h b/src/lisp.h
index 9102103bc7b..a0d6c6b3c0b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1,6 +1,6 @@
1/* Fundamental definitions for GNU Emacs Lisp interpreter. 1/* Fundamental definitions for GNU Emacs Lisp interpreter.
2 Copyright (C) 1985-1987, 1993-1995, 1997-2012 2
3 Free Software Foundation, Inc. 3Copyright (C) 1985-1987, 1993-1995, 1997-2012 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
@@ -2835,6 +2835,7 @@ extern Lisp_Object Qfile_directory_p;
2835extern Lisp_Object Qinsert_file_contents; 2835extern Lisp_Object Qinsert_file_contents;
2836extern Lisp_Object Qfile_name_history; 2836extern Lisp_Object Qfile_name_history;
2837extern Lisp_Object expand_and_dir_to_file (Lisp_Object, Lisp_Object); 2837extern Lisp_Object expand_and_dir_to_file (Lisp_Object, Lisp_Object);
2838EXFUN (Fread_file_name, 6); /* not a normal DEFUN */
2838extern Lisp_Object close_file_unwind (Lisp_Object); 2839extern Lisp_Object close_file_unwind (Lisp_Object);
2839extern Lisp_Object restore_point_unwind (Lisp_Object); 2840extern Lisp_Object restore_point_unwind (Lisp_Object);
2840extern _Noreturn void report_file_error (const char *, Lisp_Object); 2841extern _Noreturn void report_file_error (const char *, Lisp_Object);