Mercurial > emacs
diff lisp/startup.el @ 90200:f9a65d7ebd29
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 459-473)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 86-87)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 07 Jul 2005 12:43:14 +0000 |
parents | bb71c6cf2009 6fb026ad601f |
children | fbb2bea03df9 |
line wrap: on
line diff
--- a/lisp/startup.el Thu Jun 30 00:31:46 2005 +0000 +++ b/lisp/startup.el Thu Jul 07 12:43:14 2005 +0000 @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -37,7 +37,7 @@ "Non-nil once command line has been processed.") (defgroup initialization nil - "Emacs start-up procedure" + "Emacs start-up procedure." :group 'internal) (defcustom inhibit-startup-message nil @@ -287,6 +287,8 @@ (defvar no-blinking-cursor nil) +(defvar default-frame-background-mode) + (defvar pure-space-overflow nil "Non-nil if building Emacs overflowed pure space.")