From 363be8f069f55f9fe6a98798384c2cdd97b740d4 Mon Sep 17 00:00:00 2001 From: Steve Youngs Date: Wed, 16 Apr 2003 21:56:18 +0000 Subject: [PATCH] ./ChangeLog: 2003-04-17 Steve Youngs * Makefile.in (XEMACS): Use @EMACS@. * aclocal.m4 (AC_PATH_LISPDIR): Set $datadir to $prefix/lib if building with XEmacs. * aclocal.m4 (AC_SET_BUILD_FLAGS): New. So we can set XEmacs command line options to '-batch -no-autoloads...' for a cleaner build environment. * configure.in: Use it. * configure: Regenerate. ./contrib/ChangeLog: 2003-04-17 Steve Youngs * hashcash.el (hashcash-point-at-bol): Move the fbound test outside of the defalias. (hashcash-point-at-eol): Ditto. ./lisp/ChangeLog: 2003-04-17 Steve Youngs * dgnushack.el: Add a whole swag of autoloads and defaliases to satisfy the byte-compiler when building with XEmacs. * lpath.el (maybe-bind): Add 'w3-meta-content-type-charset-regexp' and 'w3-meta-charset-content-type-regexp' in XEmacs. The upstream W3 doesn't have these. * mailcap.el: Maybe require 'lpr in XEmacs. --- ChangeLog | 33 ++++++++++++++++++++++--------- Makefile.in | 2 +- aclocal.m4 | 21 ++++++++++++++++++++ configure.in | 1 + contrib/ChangeLog | 10 ++++++++-- contrib/hashcash.el | 16 +++++++-------- lisp/ChangeLog | 11 +++++++++++ lisp/dgnushack.el | 47 +++++++++++++++++++++++++++++++++++++++++++++ lisp/lpath.el | 4 +++- lisp/mailcap.el | 6 ++++++ 10 files changed, 129 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09a9f0492..f3f7096e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-04-17 Steve Youngs + + * Makefile.in (XEMACS): Use @EMACS@. + + * aclocal.m4 (AC_PATH_LISPDIR): Set $datadir to $prefix/lib if + building with XEmacs. + + * aclocal.m4 (AC_SET_BUILD_FLAGS): New. So we can set XEmacs + command line options to '-batch -no-autoloads...' for a cleaner + build environment. + + * configure.in: Use it. + + * configure: Regenerate. + 2003-04-16 Reiner Steib From Frank Schmitt @@ -31,7 +46,7 @@ * GNUS-NEWS: Talk about canlock more. -2003-02-13 Kai Gro,A_(Bjohann +2003-02-13 Kai Großjohann * GNUS-NEWS: Add user visible changes from Michael Shields from the past couple of days. Actual text from Michael. @@ -74,11 +89,11 @@ * etc/gnus/gnus.xpm (oort): Make the color replaceable. -2002-12-05 Kai Gro,A_(Bjohann +2002-12-05 Kai Großjohann * etc/smilies/*.pbm: Made them binary. -2002-11-13 Kai Gro,A_(Bjohann +2002-11-13 Kai Großjohann * etc/smilies/blink.xpm: Changed smileys and some new ones from Alex Schroeder . @@ -118,7 +133,7 @@ * ChangeLog, todo: (oops) changed buffer-file-coding-system back to coding. -2001-12-18 Kai Gro,A_(Bjohann +2001-12-18 Kai Großjohann * make-x.bat: Ensure nonempty variable value. Reported by Frank Haun . @@ -132,12 +147,12 @@ * ChangeLog: changed coding to buffer-file-coding-system * todo: same -2001-12-10 Kai Gro,A_(Bjohann +2001-12-10 Kai Großjohann * make-x.bat: Code cleanup. Fix a bug with "/copy". From Frank Schmitt . -2001-11-26 Kai Gro,A_(Bjohann +2001-11-26 Kai Großjohann * make-x.bat: Use parameter "/copy" rather than "copy" for increased dwimishness for old-time DOS users. From Frank Schmitt @@ -163,7 +178,7 @@ * etc/smilies/blink.pbm: Ditto. Contributed by Kim F. Storm . -2001-10-19 Kai Gro,A_(Bjohann +2001-10-19 Kai Großjohann From Frank Schmitt . * make-x.bat: Use correct directory structure for XEmacs on Windows. @@ -186,7 +201,7 @@ * configure.in: Generate texi/ps/Makefile. -2001-09-21 Kai Gro,A_(Bjohann +2001-09-21 Kai Großjohann * make.bat: Use parameter "/copy" rather than "copy" for increased dwimishness for old-time DOS users. @@ -199,7 +214,7 @@ * make.bat: Use infohack.el to create info files. -2001-05-17 Kai Gro,A_(Bjohann +2001-05-17 Kai Großjohann * etc/Makefile.in (datadir): Set this variable, like in the other Makefile.in's. Patch from Gaute B Strokkenes . diff --git a/Makefile.in b/Makefile.in index 91bc14cb6..73b8eb361 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,7 +5,7 @@ srcdir = @srcdir@ @SET_MAKE@ EMACS = @EMACS@ -XEMACS = xemacs +XEMACS = @EMACS@ all: lick info diff --git a/aclocal.m4 b/aclocal.m4 index 4e4e435bd..03a55281c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -84,6 +84,7 @@ AC_DEFUN(AC_PATH_LISPDIR, [ theprefix=$ac_default_prefix fi if test "$EMACS_FLAVOR" = "xemacs"; then + datadir="\$(prefix)/lib" lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/gnus" else lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp" @@ -140,6 +141,26 @@ AC_DEFUN(AC_PATH_INFO_DIR, [ AC_SUBST(info_dir) ]) +dnl +dnl This will set the XEmacs command line options to be slightly different +dnl from the Emacs ones. If building with XEmacs the options will be +dnl "-batch -no-autoloads..." to give a much cleaner build environment. +dnl +AC_DEFUN(AC_SET_BUILD_FLAGS, [ + AC_MSG_CHECKING([which options to pass on to (X)Emacs]) + if test "x$FLAGS" = "x"; then + if test "$EMACS_FLAVOR" = "xemacs"; then + FLAGS="-batch -no-autoloads -l \$(srcdir)/dgnushack.el" + else + FLAGS="-batch -q -no-site-file -l \$(srcdir)/dgnushack.el" + fi + else + FLAGS=$FLAGS + fi + AC_MSG_RESULT($FLAGS) + AC_SUBST(FLAGS) +]) + dnl dnl Check whether a function exists in a library dnl All '_' characters in the first argument are converted to '-' diff --git a/configure.in b/configure.in index 59ed851a9..e4c53c938 100644 --- a/configure.in +++ b/configure.in @@ -23,6 +23,7 @@ AC_PATH_ETCDIR AC_PATH_INFO_DIR AC_CHECK_URL AC_CHECK_W3 +AC_SET_BUILD_FLAGS GNUS_CHECK_FONTS AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index dea710960..2ca172b32 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2003-04-17 Steve Youngs + + * hashcash.el (hashcash-point-at-bol): Move the fbound test + outside of the defalias. + (hashcash-point-at-eol): Ditto. + 2003-03-19 Simon Josefsson * gnus-idna.el: Update. @@ -49,7 +55,7 @@ * gnus-mdrtn.el (gnus-moderated-groups): Removed (require 'gnus-load). -2002-04-24 Kai Gro,A_(Bjohann +2002-04-24 Kai Großjohann * ucs-tables.el (featurep): Barf on XEmacs. @@ -186,7 +192,7 @@ (gpg-with-temp-files): Ditto. (gpg-show-result): Ditto. -2000-11-08 Bj,Av(Brn Torkelsson +2000-11-08 Björn Torkelsson * gpg.el: In Xemacs it is called point-at-eol, not line-end-position diff --git a/contrib/hashcash.el b/contrib/hashcash.el index 6f9ee4700..377021218 100644 --- a/contrib/hashcash.el +++ b/contrib/hashcash.el @@ -1,6 +1,6 @@ ;;; hashcash.el --- Add hashcash payments to email -;; $Revision: 1.9 $ +;; $Revision: 1.10 $ ;; Copyright (C) 1997--2002 Paul E. Foley ;; Copyright (C) 2003 Free Software Foundation @@ -60,15 +60,13 @@ is used instead.") (require 'mail-utils) -(defalias 'hashcash-point-at-bol - (if (fboundp 'point-at-bol) - 'point-at-bol - 'line-beginning-position)) +(if (fboundp 'point-at-bol) + (defalias 'hashcash-point-at-bol 'point-at-bol) + (defalias 'hashcash-point-at-bol 'line-beginning-position)) -(defalias 'hashcash-point-at-eol - (if (fboundp 'point-at-eol) - 'point-at-eol - 'line-end-position)) +(if (fboundp 'point-at-eol) + (defalias 'hashcash-point-at-eol 'point-at-eol) + (defalias 'hashcash-point-at-eol 'line-end-position)) (defun hashcash-strip-quoted-names (addr) (setq addr (mail-strip-quoted-names addr)) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4ec1f20e6..54458f9a6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2003-04-17 Steve Youngs + + * dgnushack.el: Add a whole swag of autoloads and defaliases to + satisfy the byte-compiler when building with XEmacs. + + * lpath.el (maybe-bind): Add 'w3-meta-content-type-charset-regexp' + and 'w3-meta-charset-content-type-regexp' in XEmacs. The upstream + W3 doesn't have these. + + * mailcap.el: Maybe require 'lpr in XEmacs. + 2003-04-16 Simon Josefsson * mml2015.el (mml2015-pgg-sign): Bind pgg-default-user-id to MML diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 0f4041f2a..6d0f4e2dd 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -138,6 +138,53 @@ (defalias 'x-defined-colors 'ignore) (defalias 'read-color 'ignore))) +(eval-and-compile + (when (featurep 'xemacs) + (autoload 'Info-directory "info" nil t) + (autoload 'Info-menu "info" nil t) + (autoload 'annotations-at "annotations") + (autoload 'apropos "apropos" nil t) + (autoload 'apropos-command "apropos" nil t) + (autoload 'bbdb-complete-name "bbdb-com" nil t) + (autoload 'browse-url "browse-url" nil t) + (autoload 'customize-apropos "cus-edit" nil t) + (autoload 'customize-save-variable "cus-edit" nil t) + (autoload 'customize-variable "cus-edit" nil t) + (autoload 'delete-annotation "annotations") + (autoload 'dolist "cl-macs" nil nil 'macro) + (autoload 'enriched-decode "enriched") + (autoload 'info "info" nil t) + (autoload 'make-annotation "annotations") + (autoload 'make-display-table "disp-table") + (autoload 'pp "pp") + (autoload 'ps-despool "ps-print" nil t) + (autoload 'ps-spool-buffer "ps-print" nil t) + (autoload 'ps-spool-buffer-with-faces "ps-print" nil t) + (autoload 'read-passwd "passwd") + (autoload 'regexp-opt "regexp-opt") + (autoload 'reporter-submit-bug-report "reporter") + (autoload 'setenv "process" nil t) + (autoload 'smtpmail-send-it "smtpmail") + (autoload 'sort-numeric-fields "sort" nil t) + (autoload 'sort-subr "sort") + (autoload 'trace-function-background "trace" nil t) + (autoload 'w3-do-setup "w3") + (autoload 'w3-prepare-buffer "w3-display") + (autoload 'w3-region "w3-display" nil t) + (defalias 'frame-char-height 'frame-height) + (defalias 'frame-char-width 'frame-width) + (defalias 'frame-parameter 'frame-property) + (defalias 'make-overlay 'ignore) + (defalias 'overlay-end 'ignore) + (defalias 'overlay-get 'ignore) + (defalias 'overlay-put 'ignore) + (defalias 'overlay-start 'ignore) + (defalias 'overlays-in 'ignore) + (defalias 'replace-dehighlight 'ignore) + (defalias 'replace-highlight 'ignore) + (defalias 'run-with-idle-timer 'ignore) + (defalias 'w3-coding-system-for-mime-charset 'ignore))) + (defun dgnushack-compile (&optional warn) ;;(setq byte-compile-dynamic t) (unless warn diff --git a/lisp/lpath.el b/lisp/lpath.el index b1958092a..20412b94e 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -52,7 +52,9 @@ enable-multibyte-characters gnus-agent-expire-current-dirs language-info-alist mark-active mouse-selection-click-count mouse-selection-click-count-buffer pgg-parse-crc24 - temporary-file-directory transient-mark-mode))) + temporary-file-directory transient-mark-mode + w3-meta-content-type-charset-regexp + w3-meta-charset-content-type-regexp))) (maybe-fbind '(bbdb-complete-name delete-annotation device-connection dfw-device events-to-keys font-lock-set-defaults frame-device diff --git a/lisp/mailcap.el b/lisp/mailcap.el index 8637081fd..6f57a4df0 100644 --- a/lisp/mailcap.el +++ b/lisp/mailcap.el @@ -49,6 +49,12 @@ table) "A syntax table for parsing sgml attributes.") +(eval-and-compile + (when (featurep 'xemacs) + (condition-case nil + (require 'lpr) + (error nil)))) + (defvar mailcap-print-command (mapconcat 'identity (cons (if (boundp 'lpr-command) -- 2.25.1