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 /lisp/emacs-lisp/find-func.el | |
parent | 688e92426bfa2c5f21bd2ab7a1361c8febf2ca90 (diff) | |
download | emacs-a02b179242a55aba20158aa245e5643a04d07576.tar.gz emacs-a02b179242a55aba20158aa245e5643a04d07576.tar.bz2 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/emacs-lisp/find-func.el')
-rw-r--r-- | lisp/emacs-lisp/find-func.el | 11 |
1 files changed, 3 insertions, 8 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)." (locate-file basename (list dir) (find-library-suffixes))))))) (defvar find-function-C-source-directory - (let ((dir (expand-file-name "src" emacs-source-directory))) - (if (file-accessible-directory-p dir) dir - (setq dir (expand-file-name "src" source-directory)) - (if (file-accessible-directory-p dir) dir))) + (let ((dir (expand-file-name "src" source-directory))) + (if (file-accessible-directory-p dir) dir)) "Directory where the C source files of Emacs can be found. If nil, do not try to find the source code of functions and variables defined in C.") @@ -247,10 +245,7 @@ TYPE should be nil to find a function, or `defvar' to find a variable." (let ((dir (or find-function-C-source-directory (read-directory-name "Emacs C source dir: " nil nil t)))) (setq file (expand-file-name file dir)) - (if (or (file-readable-p file) - (let ((file-gz (concat file ".gz"))) - (and (file-readable-p file-gz) - (setq file file-gz)))) + (if (file-readable-p file) (if (null find-function-C-source-directory) (setq find-function-C-source-directory dir)) (error "The C source file %s is not available" |