diff options
| author | Paul Eggert | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/lread.c | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.zip | |
Merge from trunk.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index dfcb3eeab5e..48849cccd2b 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4448,7 +4448,7 @@ were read in. */); | |||
| 4448 | Vread_circle = Qt; | 4448 | Vread_circle = Qt; |
| 4449 | 4449 | ||
| 4450 | DEFVAR_LISP ("load-path", Vload_path, | 4450 | DEFVAR_LISP ("load-path", Vload_path, |
| 4451 | doc: /* *List of directories to search for files to load. | 4451 | doc: /* List of directories to search for files to load. |
| 4452 | Each element is a string (directory name) or nil (try default directory). | 4452 | Each element is a string (directory name) or nil (try default directory). |
| 4453 | Initialized based on EMACSLOADPATH environment variable, if any, | 4453 | Initialized based on EMACSLOADPATH environment variable, if any, |
| 4454 | otherwise to default specified by file `epaths.h' when Emacs was built. */); | 4454 | otherwise to default specified by file `epaths.h' when Emacs was built. */); |