aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2020-01-27 23:04:20 -0800
committerPaul Eggert2020-01-27 23:17:10 -0800
commita02b179242a55aba20158aa245e5643a04d07576 (patch)
tree60ea8c8bbba239d0c92d459d47b588b1b2a53571 /lisp
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 'lisp')
-rw-r--r--lisp/emacs-lisp/find-func.el11
-rw-r--r--lisp/startup.el3
2 files changed, 4 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index be53324f141..167ead3ce02 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -219,10 +219,8 @@ LIBRARY should be a string (the name of the library)."
219 (locate-file basename (list dir) (find-library-suffixes))))))) 219 (locate-file basename (list dir) (find-library-suffixes)))))))
220 220
221(defvar find-function-C-source-directory 221(defvar find-function-C-source-directory
222 (let ((dir (expand-file-name "src" emacs-source-directory))) 222 (let ((dir (expand-file-name "src" source-directory)))
223 (if (file-accessible-directory-p dir) dir 223 (if (file-accessible-directory-p dir) dir))
224 (setq dir (expand-file-name "src" source-directory))
225 (if (file-accessible-directory-p dir) dir)))
226 "Directory where the C source files of Emacs can be found. 224 "Directory where the C source files of Emacs can be found.
227If nil, do not try to find the source code of functions and variables 225If nil, do not try to find the source code of functions and variables
228defined in C.") 226defined in C.")
@@ -247,10 +245,7 @@ TYPE should be nil to find a function, or `defvar' to find a variable."
247 (let ((dir (or find-function-C-source-directory 245 (let ((dir (or find-function-C-source-directory
248 (read-directory-name "Emacs C source dir: " nil nil t)))) 246 (read-directory-name "Emacs C source dir: " nil nil t))))
249 (setq file (expand-file-name file dir)) 247 (setq file (expand-file-name file dir))
250 (if (or (file-readable-p file) 248 (if (file-readable-p file)
251 (let ((file-gz (concat file ".gz")))
252 (and (file-readable-p file-gz)
253 (setq file file-gz))))
254 (if (null find-function-C-source-directory) 249 (if (null find-function-C-source-directory)
255 (setq find-function-C-source-directory dir)) 250 (setq find-function-C-source-directory dir))
256 (error "The C source file %s is not available" 251 (error "The C source file %s is not available"
diff --git a/lisp/startup.el b/lisp/startup.el
index 676fb35e000..1f545c66922 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -623,8 +623,7 @@ It is the default value of the variable `top-level'."
623 (set pathsym (mapcar (lambda (dir) 623 (set pathsym (mapcar (lambda (dir)
624 (decode-coding-string dir coding t)) 624 (decode-coding-string dir coding t))
625 path))))) 625 path)))))
626 (dolist (filesym '(data-directory doc-directory emacs-source-directory 626 (dolist (filesym '(data-directory doc-directory exec-directory
627 exec-directory
628 installation-directory 627 installation-directory
629 invocation-directory invocation-name 628 invocation-directory invocation-name
630 source-directory 629 source-directory