[COMMIT] Eliminate some non-X11 build failures
The disadvantage with this is that it doesn’t eliminate the x-symbol errors
I see, which seem to be related to treating a locale as requiring a defined
device type. But it does help some.
APPROVE COMMIT
NOTE: This patch has been committed.
xemacs-packages/eudc/ChangeLog addition:
2007-10-13 Aidan Kehoe <kehoea(a)parhasard.net>
* eudc.el:
Only install the menu if we're an interactive process.
xemacs-packages/mh-e/ChangeLog addition:
2007-10-13 Aidan Kehoe <kehoea(a)parhasard.net>
* mh-utils.el (mh-funcall-if-exists):
If a function is bound at compile time, that has a limited amount
to do with whether it's bound at runtime. Don't trust the check at
compile time, use the runtime check instead.
* mh-xemacs-icons.el (require):
#'require of toolbar is superflous, since we may well be compiled
by a build without toolbar support but run on one with toolbar
support, and the previous change to mh-utils.el makes the
compile-time state irrelevant.
XEmacs Packages source patch:
Diff command: cvs -q diff -Nu
Files affected: xemacs-packages/mh-e/mh-xemacs-icons.el
===================================================================
RCS xemacs-packages/mh-e/mh-utils.el
===================================================================
RCS xemacs-packages/eudc/eudc.el
===================================================================
RCS
Index: xemacs-packages/eudc/eudc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/eudc/eudc.el,v
retrieving revision 1.22
diff -u -u -r1.22 eudc.el
--- xemacs-packages/eudc/eudc.el 2001/08/17 12:31:41 1.22
+++ xemacs-packages/eudc/eudc.el 2007/10/13 14:47:00
＠＠ -1344,13 +1344,11 ＠＠
(message "")) ; Remove modeline message
(not (featurep 'eudc-options-file)))
(load eudc-options-file))
-
-
+
;;; Install the full menu
-(unless (featurep 'infodock)
+(unless (or (featurep 'infodock) noninteractive)
(eudc-install-menu))
-
;;; The following installs a short menu for EUDC at XEmacs startup.
;;;###autoload
＠＠ -1397,7 +1395,8 ＠＠
(if (not (featurep 'eudc-autoloads))
(if (string-match "XEmacs" emacs-version)
(if (and (featurep 'menubar)
- (not (featurep 'infodock)))
+ (not (featurep 'infodock))
+ (not noninteractive))
(add-submenu '("Tools") menu))
(require 'easymenu)
(cond
Index: xemacs-packages/mh-e/mh-utils.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mh-e/mh-utils.el,v
retrieving revision 1.7
diff -u -u -r1.7 mh-utils.el
--- xemacs-packages/mh-e/mh-utils.el 2003/09/02 23:39:26 1.7
+++ xemacs-packages/mh-e/mh-utils.el 2007/10/13 14:47:02
＠＠ -118,8 +118,8 ＠＠
(defmacro mh-funcall-if-exists (function &rest args)
"Call FUNCTION with ARGS as parameters if it exists."
- (if (fboundp function)
- `(funcall ',function ,＠args)))
+ `(if (fboundp ',function)
+ (funcall ',function ,＠args)))
(defmacro mh-make-local-hook (hook)
"Make HOOK local if needed.
Index: xemacs-packages/mh-e/mh-xemacs-icons.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mh-e/mh-xemacs-icons.el,v
retrieving revision 1.2
diff -u -u -r1.2 mh-xemacs-icons.el
--- xemacs-packages/mh-e/mh-xemacs-icons.el 2005/03/11 07:14:20 1.2
+++ xemacs-packages/mh-e/mh-xemacs-icons.el 2007/10/13 14:47:02
＠＠ -42,8 +42,6 ＠＠
;; Avoid compiler warning
(eval-and-compile
(require 'mh-utils)
- ;; See http://list-archive.xemacs.org/xemacs-beta/200307/msg00138.html
- (require 'toolbar)
(defvar mh-xemacs-toolbar-folder-toolbar nil)
(defvar mh-xemacs-toolbar-letter-toolbar nil))
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches