diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-27 23:04:20 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-27 23:17:10 -0800 |
| commit | a02b179242a55aba20158aa245e5643a04d07576 (patch) | |
| tree | 60ea8c8bbba239d0c92d459d47b588b1b2a53571 /src | |
| parent | 688e92426bfa2c5f21bd2ab7a1361c8febf2ca90 (diff) | |
| download | emacs-a02b179242a55aba20158aa245e5643a04d07576.tar.gz | |
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.in | 4 | ||||
| -rw-r--r-- | src/lread.c | 10 |
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/>. */ /* Where Emacs should store game score files. */ #define PATH_GAME "/usr/local/var/games/emacs" -/* Where Emacs should look for its own installed source code, - or the empty string if the source code is not installed. */ -#define PATH_EMACS_SOURCE "/usr/local/share/emacs" - /* Where Emacs should look for the application default file. */ #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/>. */ #include "blockinput.h" #include "pdumper.h" #include <c-ctype.h> -#include <dosname.h> #include <vla.h> #ifdef MSDOS @@ -4993,18 +4992,11 @@ and is not meant for users to change. */); DEFVAR_LISP ("source-directory", Vsource_directory, doc: /* Directory in which Emacs sources were found when Emacs was built. -You cannot count on them to still be there! Also see -`emacs-source-directory'. */); +You cannot count on them to still be there! */); Vsource_directory = Fexpand_file_name (build_string ("../"), Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH, 0))); - DEFVAR_LISP ("emacs-source-directory", Vemacs_source_directory, - doc: /* Directory where Emacs sources can be found. */); - Vemacs_source_directory = (IS_ABSOLUTE_FILE_NAME (PATH_EMACS_SOURCE) - ? build_string (PATH_EMACS_SOURCE) - : Vsource_directory); - DEFVAR_LISP ("preloaded-file-list", Vpreloaded_file_list, doc: /* List of files that were preloaded (when dumping Emacs). */); Vpreloaded_file_list = Qnil; |