aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2020-01-27 23:04:20 -0800
committerPaul Eggert2020-01-27 23:17:10 -0800
commita02b179242a55aba20158aa245e5643a04d07576 (patch)
tree60ea8c8bbba239d0c92d459d47b588b1b2a53571 /src
parent688e92426bfa2c5f21bd2ab7a1361c8febf2ca90 (diff)
downloademacs-a02b179242a55aba20158aa245e5643a04d07576.tar.gz
emacs-a02b179242a55aba20158aa245e5643a04d07576.zip
Revert the --with-install-srcdir patch
Also, update description of debuginfo and sources to match Debian and Red Hat more accurately, and move this sad tale from INSTALL to etc/PROBLEMS which is a better home for it. * Makefile.in (emacs_srcdir, install-c-src): * configure.ac (emacs_srcdir, --with-install-srcdir): * src/epaths.in (PATH_EMACS_SOURCE): * src/lread.c (emacs-source-directory): Remove. All uses removed. * lisp/emacs-lisp/find-func.el (find-function-C-source): Do not worry about compressed C sources. * src/lread.c: Do not include <dosname.h>.
Diffstat (limited to 'src')
-rw-r--r--src/epaths.in4
-rw-r--r--src/lread.c10
2 files changed, 1 insertions, 13 deletions
diff --git a/src/epaths.in b/src/epaths.in
index 554fdd7228a..3cadd160ecf 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -73,9 +73,5 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
73/* Where Emacs should store game score files. */ 73/* Where Emacs should store game score files. */
74#define PATH_GAME "/usr/local/var/games/emacs" 74#define PATH_GAME "/usr/local/var/games/emacs"
75 75
76/* Where Emacs should look for its own installed source code,
77 or the empty string if the source code is not installed. */
78#define PATH_EMACS_SOURCE "/usr/local/share/emacs"
79
80/* Where Emacs should look for the application default file. */ 76/* Where Emacs should look for the application default file. */
81#define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S" 77#define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
diff --git a/src/lread.c b/src/lread.c
index 274491f0229..69dd73912bc 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -44,7 +44,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
44#include "blockinput.h" 44#include "blockinput.h"
45#include "pdumper.h" 45#include "pdumper.h"
46#include <c-ctype.h> 46#include <c-ctype.h>
47#include <dosname.h>
48#include <vla.h> 47#include <vla.h>
49 48
50#ifdef MSDOS 49#ifdef MSDOS
@@ -4993,18 +4992,11 @@ and is not meant for users to change. */);
4993 4992
4994 DEFVAR_LISP ("source-directory", Vsource_directory, 4993 DEFVAR_LISP ("source-directory", Vsource_directory,
4995 doc: /* Directory in which Emacs sources were found when Emacs was built. 4994 doc: /* Directory in which Emacs sources were found when Emacs was built.
4996You cannot count on them to still be there! Also see 4995You cannot count on them to still be there! */);
4997`emacs-source-directory'. */);
4998 Vsource_directory 4996 Vsource_directory
4999 = Fexpand_file_name (build_string ("../"), 4997 = Fexpand_file_name (build_string ("../"),
5000 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH, 0))); 4998 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH, 0)));
5001 4999
5002 DEFVAR_LISP ("emacs-source-directory", Vemacs_source_directory,
5003 doc: /* Directory where Emacs sources can be found. */);
5004 Vemacs_source_directory = (IS_ABSOLUTE_FILE_NAME (PATH_EMACS_SOURCE)
5005 ? build_string (PATH_EMACS_SOURCE)
5006 : Vsource_directory);
5007
5008 DEFVAR_LISP ("preloaded-file-list", Vpreloaded_file_list, 5000 DEFVAR_LISP ("preloaded-file-list", Vpreloaded_file_list,
5009 doc: /* List of files that were preloaded (when dumping Emacs). */); 5001 doc: /* List of files that were preloaded (when dumping Emacs). */);
5010 Vpreloaded_file_list = Qnil; 5002 Vpreloaded_file_list = Qnil;