aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1991-12-05 18:54:06 +0000
committerJim Blandy1991-12-05 18:54:06 +0000
commit1e6dacf62d66cd5a1685c5fc76152160d4b3fd0a (patch)
tree948d0cb27c5a6deebfa3a8201cdee16fb6c35080
parent4bcffd8e3c5a5ec734e15cf5620fe16ff188cce1 (diff)
downloademacs-1e6dacf62d66cd5a1685c5fc76152160d4b3fd0a.tar.gz
emacs-1e6dacf62d66cd5a1685c5fc76152160d4b3fd0a.zip
*** empty log message ***
-rw-r--r--lisp/apropos.el2
-rw-r--r--lisp/help.el8
-rw-r--r--lisp/paths.el2
-rw-r--r--lisp/play/spook.el2
-rw-r--r--lisp/play/yow.el2
5 files changed, 8 insertions, 8 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 36e366e970b..66b3c4947bb 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -51,7 +51,7 @@ machine.")
51;; it and document it. This is so the code will work right after RMS adds 51;; it and document it. This is so the code will work right after RMS adds
52;; internal-doc-file-name. 52;; internal-doc-file-name.
53;(or (boundp 'internal-doc-file-name) 53;(or (boundp 'internal-doc-file-name)
54; (setq internal-doc-file-name (concat exec-directory "DOC"))) 54; (setq internal-doc-file-name (concat data-directory "DOC")))
55;(or (documentation-property 'internal-doc-file-name 'variable-documentation) 55;(or (documentation-property 'internal-doc-file-name 'variable-documentation)
56; (put 'internal-doc-file-name 'variable-documentation 56; (put 'internal-doc-file-name 'variable-documentation
57; "The complete pathname of the documentation file that contains all 57; "The complete pathname of the documentation file that contains all
diff --git a/lisp/help.el b/lisp/help.el
index d2d65a5fa94..bc71ffa2084 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -68,7 +68,7 @@
68 (setq buffer-file-name file) 68 (setq buffer-file-name file)
69 (setq default-directory (expand-file-name "~/")) 69 (setq default-directory (expand-file-name "~/"))
70 (setq auto-save-file-name nil) 70 (setq auto-save-file-name nil)
71 (insert-file-contents (expand-file-name "TUTORIAL" exec-directory)) 71 (insert-file-contents (expand-file-name "TUTORIAL" data-directory))
72 (goto-char (point-min)) 72 (goto-char (point-min))
73 (search-forward "\n<<") 73 (search-forward "\n<<")
74 (beginning-of-line) 74 (beginning-of-line)
@@ -157,13 +157,13 @@ describes the minor mode."
157 "Display info on how to obtain the latest version of GNU Emacs." 157 "Display info on how to obtain the latest version of GNU Emacs."
158 (interactive) 158 (interactive)
159 (find-file-read-only 159 (find-file-read-only
160 (expand-file-name "DISTRIB" exec-directory))) 160 (expand-file-name "DISTRIB" data-directory)))
161 161
162(defun describe-copying () 162(defun describe-copying ()
163 "Display info on how you may redistribute copies of GNU Emacs." 163 "Display info on how you may redistribute copies of GNU Emacs."
164 (interactive) 164 (interactive)
165 (find-file-read-only 165 (find-file-read-only
166 (expand-file-name "COPYING" exec-directory)) 166 (expand-file-name "COPYING" data-directory))
167 (goto-char (point-min))) 167 (goto-char (point-min)))
168 168
169(defun describe-no-warranty () 169(defun describe-no-warranty ()
@@ -177,7 +177,7 @@ describes the minor mode."
177(defun view-emacs-news () 177(defun view-emacs-news ()
178 "Display info on recent changes to Emacs." 178 "Display info on recent changes to Emacs."
179 (interactive) 179 (interactive)
180 (find-file-read-only (expand-file-name "NEWS" exec-directory))) 180 (find-file-read-only (expand-file-name "NEWS" data-directory)))
181 181
182(defun view-lossage () 182(defun view-lossage ()
183 "Display last 100 input keystrokes." 183 "Display last 100 input keystrokes."
diff --git a/lisp/paths.el b/lisp/paths.el
index fb334c722ed..50a5880eac3 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -26,7 +26,7 @@
26 26
27(defvar Info-default-directory-list 27(defvar Info-default-directory-list
28 (list "/usr/local/lib/info/" 28 (list "/usr/local/lib/info/"
29 (expand-file-name "../info/" exec-directory)) 29 (expand-file-name "../info/" data-directory))
30 "List of directories to search for Info documentation files.") 30 "List of directories to search for Info documentation files.")
31 31
32(defvar news-path "/usr/spool/news/" 32(defvar news-path "/usr/spool/news/"
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index 84fffceeaa1..3b35ec44b00 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -36,7 +36,7 @@
36; keyword scanners. 36; keyword scanners.
37 37
38; Variables 38; Variables
39(defvar spook-phrases-file (concat exec-directory "spook.lines") 39(defvar spook-phrases-file (concat data-directory "spook.lines")
40 "Keep your favorite phrases here.") 40 "Keep your favorite phrases here.")
41 41
42(defvar spook-phrase-default-count 15 42(defvar spook-phrase-default-count 15
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index 46edb8e95fc..a4d33d3609f 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -54,7 +54,7 @@
54 (message "Am I CONSING yet?...") 54 (message "Am I CONSING yet?...")
55 (set-buffer buf) 55 (set-buffer buf)
56 (insert-file-contents (or file 56 (insert-file-contents (or file
57 (expand-file-name "yow.lines" exec-directory))) 57 (expand-file-name "yow.lines" data-directory)))
58 (search-forward "\0") 58 (search-forward "\0")
59 (while (progn (skip-chars-forward " \t\n\r\f") (not (eobp))) 59 (while (progn (skip-chars-forward " \t\n\r\f") (not (eobp)))
60 (let ((beg (point))) 60 (let ((beg (point)))