aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-16 15:02:59 -0400
committerGlenn Morris2012-04-16 15:02:59 -0400
commit68892d275b8dff830ba48e271d8dc71ba84b2b14 (patch)
tree3faedf63e5e6ada80b83085e418e30e7edbf0754
parent20f0c46dcdb597702fbb444729ec35411c036352 (diff)
downloademacs-68892d275b8dff830ba48e271d8dc71ba84b2b14.tar.gz
emacs-68892d275b8dff830ba48e271d8dc71ba84b2b14.zip
* lisp/play/yow.el (yow-file): Use expand-file-name rather than concat.
Remove old comment.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/play/yow.el8
2 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24b564b6d70..68225f1bec8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-04-16 Glenn Morris <rgm@gnu.org> 12012-04-16 Glenn Morris <rgm@gnu.org>
2 2
3 * play/yow.el (yow-file): Use expand-file-name rather than concat.
4
3 * progmodes/perl-mode.el (c-macro-expand): 5 * progmodes/perl-mode.el (c-macro-expand):
4 Remove unnecessary autoload (it is in loaddefs.el). 6 Remove unnecessary autoload (it is in loaddefs.el).
5 7
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index fa32fdf8272..864f49709fe 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -1,6 +1,6 @@
1;;; yow.el --- quote random zippyisms 1;;; yow.el --- quote random zippyisms
2 2
3;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6;; Author: Richard Mlynarik 6;; Author: Richard Mlynarik
@@ -24,10 +24,6 @@
24;;; Commentary: 24;;; Commentary:
25 25
26;; Important pinheadery for GNU Emacs. 26;; Important pinheadery for GNU Emacs.
27;;
28;; See cookie1.el for implementation. Note --- the `n' argument of yow
29;; from the 18.xx implementation is no longer; we only support *random*
30;; random access now.
31 27
32;;; Code: 28;;; Code:
33 29
@@ -38,7 +34,7 @@
38 :prefix "yow-" 34 :prefix "yow-"
39 :group 'games) 35 :group 'games)
40 36
41(defcustom yow-file (concat data-directory "yow.lines") 37(defcustom yow-file (expand-file-name data-directory "yow.lines")
42 "File containing pertinent pinhead phrases." 38 "File containing pertinent pinhead phrases."
43 :type 'file 39 :type 'file
44 :group 'yow) 40 :group 'yow)