From: Vinicius Jose Latorre Date: Sat, 12 Jul 2003 00:20:38 +0000 (+0000) Subject: copyright line fix & bdf-directory-list init fix X-Git-Tag: ttn-vms-21-2-B4~9381 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a1e19738c24394ffbc4a38cee0ce2df8db23897;p=emacs.git copyright line fix & bdf-directory-list init fix --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d80481f6a7..d892cb29df6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-07-11 Vinicius Jose Latorre + + * ps-bdf.el: Fix copyright line. + (bdf-directory-list): Fix initialization code. + 2003-07-11 John Paul Wallington * emacs-lisp/ring.el (ring-empty-p): Use `zerop'. diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el index 00d5e1e15f4..838cec330bd 100644 --- a/lisp/ps-bdf.el +++ b/lisp/ps-bdf.el @@ -1,11 +1,11 @@ ;;; ps-bdf.el --- BDF font file handler for ps-print -;; Copyright (C) 1998,99,2001 Electrotechnical Laboratory, JAPAN. +;; Copyright (C) 1998, 1999, 2001, 2003 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Keywords: wp, BDF, font, PostScript ;; Maintainer: Kenichi Handa -;; Time-stamp: <2001-07-15 12:25:51 pavel> +;; Time-stamp: <2003/07/11 21:13:44 vinicius> ;; This file is part of GNU Emacs. @@ -40,8 +40,7 @@ ;;;###autoload (defvar bdf-directory-list - (if (and (memq system-type '(ms-dos windows-nt)) - (boundp 'installation-directory)) + (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "*List of directories to search for `BDF' font files. @@ -49,8 +48,7 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;; MS-DOS and MS-Windows users like to move the binary around after ;; it's built, but the value above is computed at load-up time. -(and (and (memq system-type '(ms-dos windows-nt)) - (boundp 'installation-directory)) +(and (memq system-type '(ms-dos windows-nt)) (setq bdf-directory-list (list (expand-file-name "fonts/bdf" installation-directory))))