Remove paths.el
* lisp/info.el (Info-default-directory-list): Move here from paths.el. * lisp/paths.el: Remove file, which is now empty. * lisp/loadup.el: No longer load "paths". * src/lisp.mk (lisp): Remove paths.elc. * lib-src/makefile.w32-in (lisp2): Remove paths.el. * INSTALL: Remove references to paths.el.
This commit is contained in:
Glenn Morris
parent
0ea0e51b33
commit
1ba6038a1d
10 changed files with 112 additions and 130 deletions
|
|
@ -1,3 +1,7 @@
|
|||
2012-06-27 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* INSTALL: Remove references to paths.el.
|
||||
|
||||
2012-06-26 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD. This
|
||||
|
|
|
|||
38
INSTALL
38
INSTALL
|
|
@ -429,11 +429,19 @@ that supports the `VPATH' variable, such as GNU `make'.
|
|||
to the real source directory--there is no need, and installation will
|
||||
fail.)
|
||||
|
||||
4) Look at `./lisp/paths.el'; if some of those values are not right
|
||||
for your system, set up the file `./lisp/site-init.el' with Emacs
|
||||
Lisp code to override them; it is not a good idea to edit paths.el
|
||||
itself. YOU MUST USE THE LISP FUNCTION `setq' TO ASSIGN VALUES,
|
||||
rather than `defvar', as used by `./lisp/paths.el'. For example,
|
||||
4) Put into `./lisp/site-init.el' or `./lisp/site-load.el' any Emacs
|
||||
Lisp code you want Emacs to load before it is dumped out. Use
|
||||
site-load.el for additional libraries if you arrange for their
|
||||
documentation strings to be in the etc/DOC file (see
|
||||
src/Makefile.in if you wish to figure out how to do that). For all
|
||||
else, use site-init.el. Do not load byte-compiled code which
|
||||
was built with a non-nil value of `byte-compile-dynamic'.
|
||||
|
||||
It is not a good idea to edit the normal .el files that come with Emacs.
|
||||
Instead, use a file like site-init.el to change settings.
|
||||
|
||||
To change the value of a variable that is already defined in Emacs,
|
||||
you should use the Lisp function `setq', not `defvar'. For example,
|
||||
|
||||
(setq news-inews-program "/usr/bin/inews")
|
||||
|
||||
|
|
@ -445,14 +453,6 @@ variable gets by default! Make sure you know what kind of value the
|
|||
variable should have. If you don't pay attention to what you are
|
||||
doing, you'll make a mistake.
|
||||
|
||||
5) Put into `./lisp/site-init.el' or `./lisp/site-load.el' any Emacs
|
||||
Lisp code you want Emacs to load before it is dumped out. Use
|
||||
site-load.el for additional libraries if you arrange for their
|
||||
documentation strings to be in the etc/DOC file (see
|
||||
src/Makefile.in if you wish to figure out how to do that). For all
|
||||
else, use site-init.el. Do not load byte-compiled code which
|
||||
was built with a non-nil value of `byte-compile-dynamic'.
|
||||
|
||||
If you set load-path to a different value in site-init.el or
|
||||
site-load.el, Emacs will use *precisely* that value when it starts up
|
||||
again. If you do this, you are on your own!
|
||||
|
|
@ -460,10 +460,10 @@ again. If you do this, you are on your own!
|
|||
The `site-*.el' files are nonexistent in the distribution. You do not
|
||||
need to create them if you have nothing to put in them.
|
||||
|
||||
6) Refer to the file `./etc/TERMS' for information on fields you may
|
||||
5) Refer to the file `./etc/TERMS' for information on fields you may
|
||||
wish to add to various termcap entries. (This is unlikely to be necessary.)
|
||||
|
||||
7) Run `make' in the top directory of the Emacs distribution to finish
|
||||
6) Run `make' in the top directory of the Emacs distribution to finish
|
||||
building Emacs in the standard way. The final executable file is
|
||||
named `src/emacs'. You can execute this file "in place" without
|
||||
copying it, if you wish; then it automatically uses the sibling
|
||||
|
|
@ -534,15 +534,15 @@ for its Lisp files by giving values for `make' variables as part of
|
|||
the command. See the section below called `MAKE VARIABLES' for more
|
||||
information on this.
|
||||
|
||||
8) Check the file `dir' in your site's info directory (usually
|
||||
7) Check the file `dir' in your site's info directory (usually
|
||||
/usr/local/share/info) to make sure that it has a menu entry for the
|
||||
Emacs info files.
|
||||
|
||||
9) If your system uses lock files to interlock access to mailer inbox files,
|
||||
8) If your system uses lock files to interlock access to mailer inbox files,
|
||||
then you might need to make the movemail program setuid or setgid
|
||||
to enable it to write the lock files. We believe this is safe.
|
||||
|
||||
10) You are done! You can remove executables and object files from
|
||||
9) You are done! You can remove executables and object files from
|
||||
the build directory by typing `make clean'. To also remove the files
|
||||
that `configure' created (so you can compile Emacs for a different
|
||||
configuration), type `make distclean'. If you don't need some, or all
|
||||
|
|
@ -727,7 +727,7 @@ Strictly speaking, not all of the executables in `./lib-src' need be copied.
|
|||
used in building Emacs, and are not needed any more.
|
||||
|
||||
2) Copy the files in `./info' to the place specified in
|
||||
`./lisp/site-init.el' or `./lisp/paths.el'. Note that if the
|
||||
`./lisp/site-init.el' or `./lisp/info.el'. Note that if the
|
||||
destination directory already contains a file named `dir', you
|
||||
probably don't want to replace it with the `dir' file in the Emacs
|
||||
distribution. Instead, you should make sure that the existing `dir'
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2012-06-27 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* makefile.w32-in (lisp2): Remove paths.el.
|
||||
|
||||
2012-06-26 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Clean out last vestiges of the old HAVE_CONFIG_H stuff.
|
||||
|
|
|
|||
|
|
@ -236,7 +236,6 @@ lisp2 = \
|
|||
$(lispsource)language/georgian.el \
|
||||
$(lispsource)language/khmer.el \
|
||||
$(lispsource)language/burmese.el \
|
||||
$(lispsource)paths.el \
|
||||
$(lispsource)register.elc \
|
||||
$(lispsource)replace.elc \
|
||||
$(lispsource)simple.elc \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
2012-06-27 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* info.el (Info-default-directory-list): Move here from paths.el.
|
||||
* paths.el: Remove file, which is now empty.
|
||||
* loadup.el: No longer load "paths".
|
||||
|
||||
* custom.el (custom-initialize-delay): Doc fix.
|
||||
|
||||
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
|
||||
|
|
|
|||
77
lisp/info.el
77
lisp/info.el
|
|
@ -169,6 +169,83 @@ A header-line does not scroll with the rest of the buffer."
|
|||
"Face for Info nodes in a node header."
|
||||
:group 'info)
|
||||
|
||||
;; This is a defcustom largely so that we can get the benefit
|
||||
;; of custom-initialize-delay. Perhaps it would work to make it a
|
||||
;; defvar and explicitly give it a standard-value property, and
|
||||
;; call custom-initialize-delay on it.
|
||||
;; The progn forces the autoloader to include the whole thing, not
|
||||
;; just an abbreviated version.
|
||||
;;;###autoload
|
||||
(progn
|
||||
(defcustom Info-default-directory-list
|
||||
(let* ((config-dir
|
||||
(file-name-as-directory
|
||||
;; Self-contained NS build with info/ in the app-bundle.
|
||||
(or (and (featurep 'ns)
|
||||
(let ((dir (expand-file-name "../info" data-directory)))
|
||||
(if (file-directory-p dir) dir)))
|
||||
configure-info-directory)))
|
||||
(prefixes
|
||||
;; Directory trees in which to look for info subdirectories
|
||||
(prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/")))
|
||||
(suffixes
|
||||
;; Subdirectories in each directory tree that may contain info
|
||||
;; directories. Most of these are rather outdated.
|
||||
;; It ought to be fine to stop checking the "emacs" ones now,
|
||||
;; since this is Emacs and we have not installed info files
|
||||
;; into such directories for a looong time...
|
||||
'("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
|
||||
"emacs/" "lib/" "lib/emacs/"))
|
||||
(standard-info-dirs
|
||||
(apply #'nconc
|
||||
(mapcar (lambda (pfx)
|
||||
(let ((dirs
|
||||
(mapcar (lambda (sfx)
|
||||
(concat pfx sfx "info/"))
|
||||
suffixes)))
|
||||
(prune-directory-list dirs)))
|
||||
prefixes)))
|
||||
;; If $(prefix)/share/info is not one of the standard info
|
||||
;; directories, they are probably installing an experimental
|
||||
;; version of Emacs, so make sure that experimental version's Info
|
||||
;; files override the ones in standard directories.
|
||||
(dirs
|
||||
(if (member config-dir standard-info-dirs)
|
||||
;; FIXME? What is the point of adding it again at the end
|
||||
;; when it is already present earlier in the list?
|
||||
(nconc standard-info-dirs (list config-dir))
|
||||
(cons config-dir standard-info-dirs))))
|
||||
(if (not (eq system-type 'windows-nt))
|
||||
dirs
|
||||
;; Include the info directory near where Emacs executable was installed.
|
||||
(let* ((instdir (file-name-directory invocation-directory))
|
||||
(dir1 (expand-file-name "../info/" instdir))
|
||||
(dir2 (expand-file-name "../../../info/" instdir)))
|
||||
(cond ((file-exists-p dir1) (append dirs (list dir1)))
|
||||
((file-exists-p dir2) (append dirs (list dir2)))
|
||||
(t dirs)))))
|
||||
|
||||
"Default list of directories to search for Info documentation files.
|
||||
They are searched in the order they are given in the list.
|
||||
Therefore, the directory of Info files that come with Emacs
|
||||
normally should come last (so that local files override standard ones),
|
||||
unless Emacs is installed into a non-standard directory. In the latter
|
||||
case, the directory of Info files that come with Emacs should be
|
||||
first in this list.
|
||||
|
||||
Once Info is started, the list of directories to search
|
||||
comes from the variable `Info-directory-list'.
|
||||
This variable `Info-default-directory-list' is used as the default
|
||||
for initializing `Info-directory-list' when Info is started, unless
|
||||
the environment variable INFOPATH is set.
|
||||
|
||||
Although this is a customizable variable, that is mainly for technical
|
||||
reasons. Normally, you should either set INFOPATH or customize
|
||||
`Info-additional-directory-list', rather than changing this variable."
|
||||
:initialize 'custom-initialize-delay
|
||||
:type '(repeat directory)
|
||||
:group 'info))
|
||||
|
||||
(defvar Info-directory-list nil
|
||||
"List of directories to search for Info documentation files.
|
||||
If nil, meaning not yet initialized, Info uses the environment
|
||||
|
|
|
|||
|
|
@ -177,7 +177,6 @@
|
|||
(load "rfn-eshadow")
|
||||
|
||||
(load "menu-bar")
|
||||
(load "paths")
|
||||
(load "emacs-lisp/lisp")
|
||||
(load "textmodes/page")
|
||||
(load "register")
|
||||
|
|
|
|||
108
lisp/paths.el
108
lisp/paths.el
|
|
@ -1,108 +0,0 @@
|
|||
;;; paths.el --- define pathnames for use by various Emacs commands
|
||||
|
||||
;; Copyright (C) 1986, 1988, 1994, 1999-2012 Free Software Foundation, Inc.
|
||||
|
||||
;; Maintainer: FSF
|
||||
;; Keywords: internal
|
||||
;; Package: emacs
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
;; GNU Emacs is free software: you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation, either version 3 of the License, or
|
||||
;; (at your option) any later version.
|
||||
|
||||
;; GNU Emacs is distributed in the hope that it will be useful,
|
||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;; GNU General Public License for more details.
|
||||
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; These are default settings for names of certain files and directories
|
||||
;; that Emacs needs to refer to from time to time.
|
||||
|
||||
;; If these settings are not right, override them with `setq'
|
||||
;; in site-init.el. Do not change this file.
|
||||
|
||||
;;; Code:
|
||||
|
||||
;; This is a defcustom largely so that we can get the benefit
|
||||
;; of custom-initialize-delay. Perhaps it would work to make it a
|
||||
;; defvar and explicitly give it a standard-value property, and
|
||||
;; call custom-initialize-delay on it.
|
||||
(defcustom Info-default-directory-list
|
||||
(let* ((config-dir
|
||||
(file-name-as-directory
|
||||
;; Self-contained NS build with info/ in the app-bundle.
|
||||
(or (and (featurep 'ns)
|
||||
(let ((dir (expand-file-name "../info" data-directory)))
|
||||
(if (file-directory-p dir) dir)))
|
||||
configure-info-directory)))
|
||||
(prefixes
|
||||
;; Directory trees in which to look for info subdirectories
|
||||
(prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/")))
|
||||
(suffixes
|
||||
;; Subdirectories in each directory tree that may contain info
|
||||
;; directories. Most of these are rather outdated.
|
||||
;; It ought to be fine to stop checking the "emacs" ones now,
|
||||
;; since this is Emacs and we have not installed info files
|
||||
;; into such directories for a looong time...
|
||||
'("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
|
||||
"emacs/" "lib/" "lib/emacs/"))
|
||||
(standard-info-dirs
|
||||
(apply #'nconc
|
||||
(mapcar (lambda (pfx)
|
||||
(let ((dirs
|
||||
(mapcar (lambda (sfx)
|
||||
(concat pfx sfx "info/"))
|
||||
suffixes)))
|
||||
(prune-directory-list dirs)))
|
||||
prefixes)))
|
||||
;; If $(prefix)/share/info is not one of the standard info
|
||||
;; directories, they are probably installing an experimental
|
||||
;; version of Emacs, so make sure that experimental version's Info
|
||||
;; files override the ones in standard directories.
|
||||
(dirs
|
||||
(if (member config-dir standard-info-dirs)
|
||||
;; FIXME? What is the point of adding it again at the end
|
||||
;; when it is already present earlier in the list?
|
||||
(nconc standard-info-dirs (list config-dir))
|
||||
(cons config-dir standard-info-dirs))))
|
||||
(if (not (eq system-type 'windows-nt))
|
||||
dirs
|
||||
;; Include the info directory near where Emacs executable was installed.
|
||||
(let* ((instdir (file-name-directory invocation-directory))
|
||||
(dir1 (expand-file-name "../info/" instdir))
|
||||
(dir2 (expand-file-name "../../../info/" instdir)))
|
||||
(cond ((file-exists-p dir1) (append dirs (list dir1)))
|
||||
((file-exists-p dir2) (append dirs (list dir2)))
|
||||
(t dirs)))))
|
||||
|
||||
"Default list of directories to search for Info documentation files.
|
||||
They are searched in the order they are given in the list.
|
||||
Therefore, the directory of Info files that come with Emacs
|
||||
normally should come last (so that local files override standard ones),
|
||||
unless Emacs is installed into a non-standard directory. In the latter
|
||||
case, the directory of Info files that come with Emacs should be
|
||||
first in this list.
|
||||
|
||||
Once Info is started, the list of directories to search
|
||||
comes from the variable `Info-directory-list'.
|
||||
This variable `Info-default-directory-list' is used as the default
|
||||
for initializing `Info-directory-list' when Info is started, unless
|
||||
the environment variable INFOPATH is set.
|
||||
|
||||
Although this is a customizable variable, that is mainly for technical
|
||||
reasons. Normally, you should either set INFOPATH or customize
|
||||
`Info-additional-directory-list', rather than changing this variable."
|
||||
:initialize 'custom-initialize-delay
|
||||
:type '(repeat directory)
|
||||
:group 'info)
|
||||
|
||||
|
||||
;;; paths.el ends here
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
2012-06-27 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* lisp.mk (lisp): Remove paths.elc.
|
||||
|
||||
2012-06-27 Chong Yidong <cyd@gnu.org>
|
||||
|
||||
* doc.c (Fsubstitute_command_keys): Fix punctuation.
|
||||
|
|
|
|||
|
|
@ -121,7 +121,6 @@ lisp = \
|
|||
$(lispsource)/isearch.elc \
|
||||
$(lispsource)/rfn-eshadow.elc \
|
||||
$(lispsource)/menu-bar.elc \
|
||||
$(lispsource)/paths.elc \
|
||||
$(lispsource)/emacs-lisp/lisp.elc \
|
||||
$(lispsource)/textmodes/page.elc \
|
||||
$(lispsource)/register.elc \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue