patch: DESTDIR support for XEmacs 21.5.18
19 years, 9 months
Mike FABIAN
Mike FABIAN
A patch to add DESTDIR support to the Makefiles of XEmacs 21.5.18
is attached. This should make it a bit easier for distributors to build
XEmacs packages.
I had already submitted such a patch in February 2004, but Steve
Youngs pointed out some problems. As I was busy with other things I
had no time to improve this patch until now.
2004-12-31 Mike FABIAN <mfabian(a)suse.de>
* Makefile.in.in:
* dynodump/Makefile.in.in:
* etc/tests/external-widget/Makefile:
* lib-src/Makefile.in.in:
* lwlib/Makefile.in.in:
* man/Makefile:
* modules/base64/Makefile:
* modules/common/Makefile.common:
* modules/zlib/Makefile:
* netinstall/Makefile.in.in:
* src/Makefile.in.in:
* tests/tooltalk/Makefile:
Add DESTDIR support.
--
Mike FABIAN <mfabian(a)suse.de> http://www.suse.de/~mfabian
睡眠不足はいい仕事の敵だ。
- 3 participants
- 5 comments
[CORE (21.5)] Delete words without touching kill-ring
19 years, 9 months
Steve Youngs
Steve Youngs
This comes from SXEmacs so I'm not going to commit without another
Reviewer's go ahead.
Also, the key bindings here... they were the first ones that came to
me, I have no attachment to them so if you can think of better ones,
cool.:-)
21.5 patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: lisp/ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: lisp/simple.el lisp/keydefs.el
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.653
diff -u -p -U0 -r1.653 ChangeLog
--- lisp/ChangeLog 17 Mar 2005 09:26:07 -0000 1.653
+++ lisp/ChangeLog 23 Mar 2005 04:04:11 -0000
＠＠ -0,0 +1,12 ＠＠
+2005-03-23 Steve Youngs <steve(a)sxemacs.org>
+
+ From Johann Oskarsson <johann(a)myrkraverk.com>
+
+ * simple.el (delete-word): New.
+ (backward-delete-word): New.
+ Delete words without messing with the kill-ring.
+
+ * keydefs.el: Keybindings for above...
+ `M-D' -- `delete-word'
+ `C-BS' -- `backward-delete-word'
+
Index: lisp/keydefs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/keydefs.el,v
retrieving revision 1.18
diff -u -p -u -r1.18 keydefs.el
--- lisp/keydefs.el 28 Apr 2003 16:18:23 -0000 1.18
+++ lisp/keydefs.el 23 Mar 2005 04:02:53 -0000
＠＠ -299,6 +299,7 ＠＠ Keymap for characters following C-c.")
(define-key global-map "\M-f" 'forward-word)
(define-key global-map "\M-b" 'backward-word)
(define-key global-map "\M-d" 'kill-word)
+(define-key global-map "\M-D" 'delete-word)
(define-key global-map "\M-<" 'beginning-of-buffer)
(define-key global-map "\M->" 'end-of-buffer)
＠＠ -405,6 +406,7 ＠＠ Keymap for characters following C-c.")
;; Default binding of "Control-h" is help.
(define-key global-map 'backspace 'delete-backward-char)
(define-key global-map '(meta backspace) 'backward-kill-word)
+(define-key global-map '(control backspace) 'backward-delete-word)
(define-key global-map [(control x) backspace] 'backward-kill-sentence)
(define-key global-map "\M-\C-z" 'activate-region)
Index: lisp/simple.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v
retrieving revision 1.50
diff -u -p -u -r1.50 simple.el
--- lisp/simple.el 23 Feb 2005 22:25:16 -0000 1.50
+++ lisp/simple.el 23 Mar 2005 04:02:55 -0000
＠＠ -2745,6 +2745,19 ＠＠ With argument, do this that many times."
(interactive "*p")
(kill-word (- (or count 1))))
+(defun delete-word (&optional count)
+ "Delete characters forward until encountering the end of a word.
+With optional argument COUNT, do this that many times."
+ (interactive "*p")
+ (delete-region (point) (save-excursion (forward-word count) (point))))
+
+(defun backward-delete-word (&optional count)
+ "Delete characters backward until encountering the end of a word.
+With argument, do this that many times."
+ (interactive "*p")
+ (delete-word (- (or count 1))))
+
+
(defun current-word (&optional strict)
"Return the word point is on (or a nearby word) as a string.
If optional arg STRICT is non-nil, return nil unless point is within
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| I am Dyslexic of Borg. |
| Fusistance is retile. Your arse will be laminated. |
|------------------------------------<steve(a)sxemacs.org>---|
- 3 participants
- 5 comments
Re: [Q] Re: [PATCH] Prefer XEmacs as X11 application class and as default frame name
19 years, 9 months
Michael Sperber
Michael Sperber
>>>>> "Stephen" == Stephen J Turnbull <stephen(a)xemacs.org> writes:
Stephen> Let's not go there. We're not at all compatible, and haven't been for
Stephen> a decade. If we're going to make the change, we should make it all
Stephen> the way and just do it.
That'd be fine with me, too.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
- 3 participants
- 2 comments
[COMMIT] Texinfo line-end-position -> point-at-eol, whitespace cleanup
19 years, 9 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
Thank you, Katsumi, and excuse the delay.
This change makes texinfo-node-name work, and quiets down the generation of
Gnus’ texinfo documentation. From b9yd5ushx8q.fsf(a)jpl.org .
xemacs-packages/texinfo/ChangeLog addition:
2005-02-23 Katsumi Yamaoka <yamaoka(a)jpl.org>
* texinfmt.el (texinfo-format-scan): Silence whitespace-cleanup.
* texnfo-upd.el (texinfo-copy-node-name): Use point-at-eol instead
of line-end-position.
xemacs-packages/text-modes/ChangeLog addition:
2005-03-25 Aidan Kehoe <kehoea(a)parhasard.net>
* whitespace.el (whitespace-cleanup): Integrate this change from
the FSF:
2003-06-10 Rajesh Vaidheeswarran <rv(a)gnu.org>
* whitespace.el (whitespace-cleanup): Respect user
preference for silence.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/text-modes/whitespace.el xemacs-packages/texinfo/texnfo-upd.el xemacs-packages/texinfo/texinfmt.el
Index: xemacs-packages/texinfo/texinfmt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/texinfo/texinfmt.el,v
retrieving revision 1.13
diff -u -u -r1.13 texinfmt.el
--- xemacs-packages/texinfo/texinfmt.el 2004/12/08 19:19:42 1.13
+++ xemacs-packages/texinfo/texinfmt.el 2005/03/25 17:05:09
＠＠ -985,7 +985,8 ＠＠
(error "Unterminated ＠%s" (car (car texinfo-stack)))))
;; Remove excess whitespace
- (whitespace-cleanup))
+ (let ((whitespace-silent t))
+ (whitespace-cleanup)))
(defvar texinfo-copying-text ""
"Text of the copyright notice and copying permissions.")
Index: xemacs-packages/texinfo/texnfo-upd.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/texinfo/texnfo-upd.el,v
retrieving revision 1.3
diff -u -u -r1.3 texnfo-upd.el
--- xemacs-packages/texinfo/texnfo-upd.el 2004/11/08 02:16:19 1.3
+++ xemacs-packages/texinfo/texnfo-upd.el 2005/03/25 17:05:11
＠＠ -492,13 +492,12 ＠＠
after the node command up to the first comma on the line, if any, and
return the text as a string. Leaves point at the beginning of the
line. If there is no node name, returns an empty string."
-
(save-excursion
(buffer-substring
(progn (forward-word 1) ; skip over node command
(skip-chars-forward " \t") ; and over spaces
(point))
- (if (search-forward "," (line-end-position) t) ; bound search
+ (if (search-forward "," (point-at-eol) t) ; bound search
(1- (point))
(end-of-line) (point)))))
Index: xemacs-packages/text-modes/whitespace.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/whitespace.el,v
retrieving revision 1.2
diff -u -u -r1.2 whitespace.el
--- xemacs-packages/text-modes/whitespace.el 2005/02/09 23:39:13 1.2
+++ xemacs-packages/text-modes/whitespace.el 2005/03/25 17:05:11
＠＠ -572,7 +572,8 ＠＠
(if whitespace-any
(whitespace-cleanup)
(progn
- (message "%s clean" buffer-file-name)
+ (if (not whitespace-silent)
+ (message "%s clean" buffer-file-name))
(whitespace-update-modeline)))
(setq tab-width whitespace-tabwith-saved))))
--
“I, for instance, am gung-ho about open source because my family is being
held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle,
when we say something in public? No-one!” -- Danny O’Brien
- 1 participants
- 0 comments
[COMMIT] Andrey Slusar's FreeBSD fixes.
19 years, 9 months
Aidan Kehoe
Aidan Kehoe
NOTE: This patch has been committed.
Andrey Slusar's FreeBSD fixes for fakemail.c, unexelf.c, as sent in
86d5uq2e3i.fsf(a)santinel.home.ua of a month ago. Excuse the delay, and thank
you, Andrey!
lib-src/ChangeLog addition:
2005-03-25 Andrey Slusar <anrays(a)gmail.com>
* fakemail.c (CURRENT_USER): Define it if FreeBSD version is >=
400000. Also, when FreeBSD version is >= 400000 geteuid returns
uid_t instead of unsigned short.
src/ChangeLog addition:
2005-02-24 Andrey Slusar <anrays(a)gmail.com>
* unexelf.c: define `Elfw(type)' for FreeBSD alpha and amd64.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/unexelf.c lib-src/fakemail.c
Index: lib-src/fakemail.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/fakemail.c,v
retrieving revision 1.8
diff -u -u -r1.8 fakemail.c
--- lib-src/fakemail.c 2005/01/26 09:53:28 1.8
+++ lib-src/fakemail.c 2005/03/25 16:31:01
＠＠ -149,9 +149,17 ＠＠
extern char *malloc (), *realloc ();
#endif
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
+#define CURRENT_USER
+#endif
+
#ifdef CURRENT_USER
extern struct passwd *getpwuid ();
-extern unsigned short geteuid ();
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
+extern uid_t geteuid ();
+#else
+extern unsigned short geteuid ();
+#endif
static struct passwd *my_entry;
#define cuserid(s) \
(my_entry = getpwuid ((int) geteuid ()), \
Index: src/unexelf.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexelf.c,v
retrieving revision 1.16
diff -u -u -r1.16 unexelf.c
--- src/unexelf.c 2004/09/20 19:20:05 1.16
+++ src/unexelf.c 2005/03/25 16:31:02
＠＠ -477,6 +477,14 ＠＠
# include <sys/exec_elf.h>
#endif
+#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__))
+# ifdef __STDC__
+# define ElfW(type) Elf64_##type
+# else
+# define ElfW(type) Elf64_/**/type
+# endif
+#endif
+
#if __GNU_LIBRARY__ - 0 >= 6
# include <link.h> /* get ElfW etc */
#endif
--
“I, for instance, am gung-ho about open source because my family is being
held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle,
when we say something in public? No-one!” -- Danny O’Brien
- 1 participants
- 0 comments
[AC21.5] egetenv not defined in device-x.c
19 years, 9 months
Marcus Crestani
Marcus Crestani
APPROVE COMMIT 21.5
Add missing #include directive for process.h to device-x.c.
src/ChangeLog addition:
2005-03-25 Marcus Crestani <crestani(a)xemacs.org>
* device-x.c: Include process.h for egetenv.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: tests/automated/c-tests.el src/device-x.c
Warning: Remote host denied X11 forwarding.
Index: src/device-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v
retrieving revision 1.62
diff -u -r1.62 device-x.c
--- src/device-x.c 24 Mar 2005 12:18:01 -0000 1.62
+++ src/device-x.c 25 Mar 2005 00:50:36 -0000
＠＠ -36,6 +36,7 ＠＠
#include "events.h"
#include "faces.h"
#include "frame-impl.h"
+#include "process.h" /* for egetenv */
#include "redisplay.h"
#include "sysdep.h"
#include "window.h"
--
Marcus
- 2 participants
- 1 comments
[S21.4] -fno-gnu-linker doesn't work - remove it
19 years, 9 months
Vin Shelton
Vin Shelton
This combines yesterday's 2 proposed patches for configure: removing
the non-working -fno-gnu-linker call from gcc under Solaris 5.5 and
below and also replaces 'head -1' 'with sed 1q'.
xemacs-21.4/ChangeLog addition:
2005-03-23 Vin Shelton <acs(a)xemacs.org>
* configure.in: Remove -fno-gnu-linker option from Solaris
dynodump builds; it doesn't do anything.
Don't use 'head -1' - it's deprecated by coreutils-5.3.0 on some
platforms.
21.4 source patch:
Diff command: cvs -q diff -u
Files affected: configure.in
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.151.2.31
diff -a -u -u -r1.151.2.31 configure.in
--- configure.in 2005/01/31 02:54:47 1.151.2.31
+++ configure.in 2005/03/24 00:45:38
＠＠ -2090,8 +2090,6 ＠＠
*86* ) dynodump_arch=i386 ;;
powerpc ) dynodump_arch=ppc ;;
esac
- dnl Dynodump requires the system linker
- test "$GCC" = "yes" && XE_APPEND(-fno-gnu-linker, ld_switch_site)
fi
dnl Feed s&m crud to src/Makefile
＠＠ -5031,8 +5029,8 ＠＠
dnl Let's save some helpful-for-debugging info like compiler and libc versions..
dnl First, see if it's gcc - the same check works everyplace...
case "$CC" in
- gcc*) echo " Compiler version: `$CC --version | head -1`"
- echo " Compiler specs file: `$CC -v 2>&1 | sed 's/.* \([[^ ]]\)/\1/' | head -1`"
+ gcc*) echo " Compiler version: `$CC --version | sed 1q`"
+ echo " Compiler specs file: `$CC -v 2>&1 | sed 's/.* \([[^ ]]\)/\1/' | sed 1q`"
;;
dnl non-gcc machine-specific magic - contributions welcome
*) case "$canonical" in
＠＠ -5063,7 +5061,7 ＠＠
;;
*-*-solaris*)
- ccvers=`$CC -V 2>&1 | head -1`
+ ccvers=`$CC -V 2>&1 | sed 1q`
if test ! -z "$ccvers" ; then
echo " Compiler version: $ccvers"
fi
- 1 participants
- 1 comments
[PATCH] (Revised) Move to XEmacs for X11 app class, frame name.
19 years, 9 months
Aidan Kehoe
Aidan Kehoe
Now uses USE_EMACS_AS_DEFAULT_APPLICATION_CLASS as the environment var to
check for the old behaviour; throwing out the old behaviour entirely would
be impolite, given that we hadn’t deprecated it at all.
etc/ChangeLog addition:
2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net>
* NEWS: Mention the move to XEmacs as the application class.
* sample.Xresources: Emacs as app class -> XEmacs as app class
man/ChangeLog addition:
2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net>
* xemacs/custom.texi (X Resources):
"Emacs" as the application class -> "XEmacs" as the application
class, mention the old resource class determination behaviour, and
how one can temporarily re-instate it.
src/ChangeLog addition:
2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net>
* device-x.c (x_init_device): Only do the old application class
determination behaviour if the
USE_EMACS_AS_DEFAULT_APPLICATION_CLASS environment variable is
set; otherwise, we use XEmacs.
* device-x.c (vars_of_device_x): Update the docstring for
x-emacs-application-class.
* frame.c: default-frame-name is now "XEmacs", unless the old X11
resources behaviour has been requested.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/frame.c src/device-x.c man/xemacs/custom.texi etc/sample.Xresources etc/NEWS
Index: etc/NEWS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/NEWS,v
retrieving revision 1.73
diff -u -u -r1.73 NEWS
--- etc/NEWS 2004/09/21 09:24:11 1.73
+++ etc/NEWS 2005/03/24 01:27:49
＠＠ -35,6 +35,7 ＠＠
-- Bignums have been implemented.
-- Windows users have benefit of the full Win32 Unicode API.
-- (in process) Xft provides antialiased fonts on X11.
+ -- "XEmacs" used as X11 application class
** Bignum implementation.
＠＠ -42,6 +43,18 ＠＠
works", and very precise floating point calculation is available.
This also means that large buffers (over 2^30 = 1GB) can be
manipulated.
+
+** "XEmacs" used as X11 application class
+
+Previously, XEmacs checked the X11 resource database for resources starting
+with XEmacs, and used "XEmacs" as its application class if any existed,
+otherwise using "Emacs" for backward compatibility. Because of divergence
+between the reseource GNU Emacs and XEmacs use, this has been changed; if
+you don't have the time to migrate your resource DB right now, set
+USE_EMACS_AS_DEFAULT_APPLICATION_CLASS in your environment before starting
+XEmacs, for the old behavior. This workaround will go away in the course of
+the next major release, though, so you will have to migrate your resources
+at some point.
* Changes in XEmacs 21.4
Index: etc/sample.Xresources
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/sample.Xresources,v
retrieving revision 1.2
diff -u -u -r1.2 sample.Xresources
--- etc/sample.Xresources 2003/06/30 09:12:28 1.2
+++ etc/sample.Xresources 2005/03/24 01:27:49
＠＠ -27,66 +27,66 ＠＠
! one of "black" or "white" on monochrome systems.
!
! The valid color names on your system can be found by looking in the file
-! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.
+! `rgb.txt', usually found in /usr/X11R6/lib/X11/ or /usr/openwin/lib/X11/.
! Set the foreground and background colors of the `default' face.
! The default face colors are the base for most of the other faces'
! colors. The default background is gray80, and the default foreground
! is black.
-Emacs.default.attributeBackground: gray80
-Emacs.default.attributeForeground: black
+XEmacs.default.attributeBackground: gray80
+XEmacs.default.attributeForeground: black
! Set the modeline colors.
-Emacs.modeline*attributeForeground: Black
-Emacs.modeline*attributeBackground: Gray75
+XEmacs.modeline*attributeForeground: Black
+XEmacs.modeline*attributeBackground: Gray75
! Set the color of the text cursor.
-Emacs.text-cursor*attributeBackground: Red3
+XEmacs.text-cursor*attributeBackground: Red3
! If you want to set the color of the mouse pointer, do this:
-! Emacs.pointer*attributeForeground: Black
+! XEmacs.pointer*attributeForeground: Black
! If you want to set the background of the mouse pointer, do this:
-! Emacs.pointer*attributeBackground: White
+! XEmacs.pointer*attributeBackground: White
! Note that by default, the pointer foreground and background are the same
! as the default face.
! Set the menubar colors. This overrides the default foreground and
! background colors specified above.
-Emacs*menubar*Foreground: Gray30
-Emacs*menubar*Background: Gray75
+XEmacs*menubar*Foreground: Gray30
+XEmacs*menubar*Background: Gray75
! This is for buttons in the menubar.
! Yellow would be better, but that would map to white on monochrome.
-Emacs*menubar.buttonForeground: Blue
-Emacs*XlwMenu.selectColor: ForestGreen
-Emacs*XmToggleButton.selectColor: ForestGreen
+XEmacs*menubar.buttonForeground: Blue
+XEmacs*XlwMenu.selectColor: ForestGreen
+XEmacs*XmToggleButton.selectColor: ForestGreen
! Specify the colors of popup menus.
-Emacs*popup*Foreground: Black
-Emacs*popup*Background: Gray75
+XEmacs*popup*Foreground: Black
+XEmacs*popup*Background: Gray75
! Specify the colors of the various sub-widgets of the dialog boxes.
-Emacs*dialog*Foreground: Black
+XEmacs*dialog*Foreground: Black
! #A5C0C1 is a shade of blue
-Emacs*dialog*Background: #A5C0C1
+XEmacs*dialog*Background: #A5C0C1
! The following three are for Motif dialog boxes ...
-Emacs*dialog*XmTextField*Background: WhiteSmoke
-Emacs*dialog*XmText*Background: WhiteSmoke
-Emacs*dialog*XmList*Background: WhiteSmoke
+XEmacs*dialog*XmTextField*Background: WhiteSmoke
+XEmacs*dialog*XmText*Background: WhiteSmoke
+XEmacs*dialog*XmList*Background: WhiteSmoke
! While this one is for Athena dialog boxes.
-Emacs*dialog*Command*Background: WhiteSmoke
+XEmacs*dialog*Command*Background: WhiteSmoke
! Athena dialog boxes are sometimes built with the Xaw3d
! variant of the Athena toolkit.
! XEmacs being nice to 8bit displays, it defaults to:
-Emacs*dialog*Command*beNiceToColormap: true
+XEmacs*dialog*Command*beNiceToColormap: true
! If you are shocked by the ugliness of the 3d rendition,
! you may want to set (even on 8bit displays) the above to false.
! Xlw Scrollbar colors
-Emacs*XlwScrollBar.Foreground: Gray30
-Emacs*XlwScrollBar.Background: Gray75
-Emacs*XmScrollBar.Foreground: Gray30
-Emacs*XmScrollBar.Background: Gray75
+XEmacs*XlwScrollBar.Foreground: Gray30
+XEmacs*XlwScrollBar.Background: Gray75
+XEmacs*XmScrollBar.Foreground: Gray30
+XEmacs*XmScrollBar.Background: Gray75
!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
＠＠ -95,8 +95,8 ＠＠
! either "opposite" (default) or "same". Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
-! Emacs*XlwScrollBar.SliderStyle: dimple
-! Emacs*XlwScrollBar.ArrowPosition: opposite
+! XEmacs*XlwScrollBar.SliderStyle: dimple
+! XEmacs*XlwScrollBar.ArrowPosition: opposite
!
＠＠ -107,53 +107,53 ＠＠
!
! To change the heights and widths of the toolbars:
!
-! Emacs.topToolBarHeight: 37
-! Emacs.bottomToolBarHeight: 0
-! Emacs.leftToolBarWidth: 0
-! Emacs.rightToolBarWidth: 0
-
-Emacs*topToolBarShadowColor: Gray90
-Emacs*bottomToolBarShadowColor: Gray40
-Emacs*backgroundToolBarColor: Gray75
-Emacs*toolBarShadowThickness: 2
+! XEmacs.topToolBarHeight: 37
+! XEmacs.bottomToolBarHeight: 0
+! XEmacs.leftToolBarWidth: 0
+! XEmacs.rightToolBarWidth: 0
+
+XEmacs*topToolBarShadowColor: Gray90
+XEmacs*bottomToolBarShadowColor: Gray40
+XEmacs*backgroundToolBarColor: Gray75
+XEmacs*toolBarShadowThickness: 2
! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
!
-! Emacs.scrollBarWidth: 0
+! XEmacs.scrollBarWidth: 0
!
! To change it for a particular frame, do this:
!
-! Emacs*FRAME-NAME.scrollBarWidth: 0
+! XEmacs*FRAME-NAME.scrollBarWidth: 0
! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
!
-! Emacs.scrollBarHeight: 0
+! XEmacs.scrollBarHeight: 0
!
! To change it for a particular frame, do this:
!
-! Emacs*FRAME-NAME.scrollBarHeight: 0
+! XEmacs*FRAME-NAME.scrollBarHeight: 0
! To dynamically change the labels used for menubar buttons...
!
-! Emacs*XlwMenu.resourceLabels: True
-! Emacs*XlwMenu.newFrame.labelString: Open Another Window
+! XEmacs*XlwMenu.resourceLabels: True
+! XEmacs*XlwMenu.newFrame.labelString: Open Another Window
! To have the Motif scrollbars on the left instead of the right, do this:
!
-! Emacs*scrollBarPlacement: BOTTOM_LEFT
+! XEmacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead
! To have Motif scrollbars act more like Xt scrollbars...
!
-! Emacs*XmScrollBar.translations: #override \n\
+! XEmacs*XmScrollBar.translations: #override \n\
! <Btn1Down>: PageDownOrRight(0) \n\
! <Btn3Down>: PageUpOrLeft(0)
＠＠ -179,22 +179,22 ＠＠
! by lisp code which tries a number of different possibilities in order
! of preference. If you wish to override it, use this:
!
-! Emacs.default.attributeFont: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+! XEmacs.default.attributeFont: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
!
-! Emacs.italic.attributeFont: -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
+! XEmacs.italic.attributeFont: -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! If you choose a font which does not have a bold-italic version,
! you can specify some other font to use for it here:
!
-! Emacs.bold-italic.attributeFont: -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-*
+! XEmacs.bold-italic.attributeFont: -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
!
-! Emacs*debugger.highlight.attributeBackground: PaleTurquoise
+! XEmacs*debugger.highlight.attributeBackground: PaleTurquoise
!
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.
＠＠ -230,29 +230,29 ＠＠
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
!
-Emacs*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+XEmacs*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+XEmacs*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+XEmacs*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+XEmacs*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.
-Emacs*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+XEmacs*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
! Dialog box translations.
! =======================
! This accelerator binds <return> in a dialog box to <activate> on button1
-Emacs*dialog*button1.accelerators:#override\
+XEmacs*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n
! Translations to make the TextField widget behave more like XEmacs
-Emacs*XmTextField.translations: #override\n\
+XEmacs*XmTextField.translations: #override\n\
!<Key>osfBackSpace: delete-previous-character()\n\
!<Key>osfDelete: delete-previous-character()\n\
!Ctrl<Key>h: delete-previous-character()\n\
＠＠ -280,7 +280,7 ＠＠
! ArmAndActivate() for buttons that appear in dialog boxes. This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.
-Emacs*dialog*XmPushButton.translations:#override\n\
+XEmacs*dialog*XmPushButton.translations:#override\n\
<Btn1Down>: Arm()\n\
<Btn1Down>,<Btn1Up>: Activate()\
Disarm()\n\
＠＠ -301,7 +301,7 ＠＠
! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.
! Choose a subset of the following styles or reorder to taste
-Emacs*ximStyles: XIMPreeditPosition|XIMStatusArea\
+XEmacs*ximStyles: XIMPreeditPosition|XIMStatusArea\
XIMPreeditPosition|XIMStatusNothing\
XIMPreeditPosition|XIMStatusNone\
XIMPreeditNothing|XIMStatusArea\
＠＠ -312,8 +312,8 ＠＠
XIMPreeditNone|XIMStatusNone
! XIM Preedit and Status foreground and background
-Emacs*EmacsFrame.ximForeground: black
-Emacs*EmacsFrame.ximBackground: white
+XEmacs*EmacsFrame.ximForeground: black
+XEmacs*EmacsFrame.ximBackground: white
! XIM fontset (defaults to system fontset default)
-! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
+! XEmacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
Index: man/xemacs/custom.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/custom.texi,v
retrieving revision 1.18
diff -u -u -r1.18 custom.texi
--- man/xemacs/custom.texi 2003/10/10 12:39:45 1.18
+++ man/xemacs/custom.texi 2005/03/24 01:27:52
＠＠ -2145,42 +2145,54 ＠＠
＠cindex X resources
＠findex x-create-frame
-Historically, XEmacs has used the X resource application class ＠samp{Emacs}
+Historically, XEmacs used the X resource application class ＠samp{Emacs}
for its resources. Unfortunately, GNU Emacs uses the same application
class, and resources are not compatible between the two Emacsen. This
-sharing of the application class often leads to trouble if you want to
+sharing of the application class often led to trouble if you wanted to
run both variants.
-Starting with XEmacs 21, XEmacs uses the class ＠samp{XEmacs} if it finds
-any XEmacs resources in the resource database when the X connection is
-initialized. Otherwise, it will use the class ＠samp{Emacs} for
-backwards compatibility. The variable ＠code{x-emacs-application-class}
-may be consulted to determine the application class being used.
-
-The examples in this section assume the application class is ＠samp{Emacs}.
-
-The Emacs resources are generally set per-frame. Each Emacs frame can have
-its own name or the same name as another, depending on the name passed to the
-＠code{make-frame} function.
+XEmacs now uses the X resource application class ＠samp{XEmacs}.
+Versions since 21.5.21 normally do this without any acrobatics of code,
+but previous versions checked the X resource database for resources
+starting in ＠samp{XEmacs}, and if none were found, they used
+＠samp{Emacs}, for greater backward compatibility. Currently, we advise
+moving your X resources to using the ＠samp{XEmacs} class, but if, in the
+short term, you want to stay with the old behavior, you can start XEmacs
+with the environment variable ＠b{USE_EMACS_AS_DEFAULT_APPLICATION_CLASS}
+set to some value; this will restore the pre-21.5.21 behavior.
+
+The examples in this section assume the application class is
+＠samp{XEmacs}. From Lisp, you can examine the
+＠code{x-emacs-application-class} variable to determine which is being
+used in the running application.
+
+XEmacs' resources are generally set per-frame. Each XEmacs frame can
+have its own name or the same name as another, depending on the name
+passed to the ＠code{make-frame} function. Up until 21.5.21, the default
+frame name was ＠samp{emacs}; since then, it has been ＠samp{XEmacs}, but
+in the short term the old default can be restored by the
+＠b{USE_EMACS_AS_DEFAULT_APPLICATION_CLASS} environment variable
+mentioned above. See the docstring for the Lisp variable
+`default-frame-name'.
You can specify resources for all frames with the syntax:
＠example
-Emacs*parameter: value
+XEmacs*parameter: value
＠end example
＠noindent
or
＠example
-Emacs*EmacsFrame.parameter:value
+XEmacs*EmacsFrame.parameter:value
＠end example
＠noindent
You can specify resources for a particular frame with the syntax:
＠example
-Emacs*FRAME-NAME.parameter: value
+XEmacs*FRAME-NAME.parameter: value
＠end example
＠noindent
＠＠ -2196,58 +2208,58 ＠＠
＠node Geometry Resources
＠subsection Geometry Resources
-To make the default size of all Emacs frames be 80 columns by 55 lines,
+To make the default size of all XEmacs frames be 80 columns by 55 lines,
do this:
＠example
-Emacs*EmacsFrame.geometry: 80x55
+XEmacs*EmacsFrame.geometry: 80x55
＠end example
＠noindent
To set the geometry of a particular frame named ＠samp{fred}, do this:
＠example
-Emacs*fred.geometry: 80x55
+XEmacs*fred.geometry: 80x55
＠end example
＠noindent
Important! Do not use the following syntax:
＠example
-Emacs*geometry: 80x55
+XEmacs*geometry: 80x55
＠end example
＠noindent
You should never use ＠code{*geometry} with any X application. It does
-not say "make the geometry of Emacs be 80 columns by 55 lines." It
-really says, "make Emacs and all subwindows thereof be 80x55 in whatever
+not say "make the geometry of XEmacs be 80 columns by 55 lines." It
+really says, "make XEmacs and all subwindows thereof be 80x55 in whatever
units they care to measure in." In particular, that is both telling the
-Emacs text pane to be 80x55 in characters, and telling the menubar pane
+XEmacs text pane to be 80x55 in characters, and telling the menubar pane
to be 80x55 pixels, which is surely not what you want.
As a special case, this geometry specification also works (and sets the
-default size of all Emacs frames to 80 columns by 55 lines):
+default size of all XEmacs frames to 80 columns by 55 lines):
＠example
-Emacs.geometry: 80x55
+XEmacs.geometry: 80x55
＠end example
＠noindent
since that is the syntax used with most other applications (since most
-other applications have only one top-level window, unlike Emacs). In
+other applications have only one top-level window, unlike XEmacs). In
general, however, the top-level shell (the unmapped ApplicationShell
-widget named ＠samp{Emacs} that is the parent of the shell widgets that
+widget named ＠samp{XEmacs} that is the parent of the shell widgets that
actually manage the individual frames) does not have any interesting
resources on it, and you should set the resources on the frames instead.
The ＠code{-geometry} command-line argument sets only the geometry of the
-initial frame created by Emacs.
+initial frame created by XEmacs.
A more complete explanation of geometry-handling is
＠itemize ＠bullet
＠item
-The ＠code{-geometry} command-line option sets the ＠code{Emacs.geometry}
+The ＠code{-geometry} command-line option sets the ＠code{XEmacs.geometry}
resource, that is, the geometry of the ApplicationShell.
＠item
＠＠ -2261,7 +2273,7 ＠＠
＠item
For the first frame created, the position of the frame is taken from the
-ApplicationShell (＠code{Emacs.geometry}) if it is specified, otherwise
+ApplicationShell (＠code{XEmacs.geometry}) if it is specified, otherwise
from the geometry of the frame.
＠item
＠＠ -2277,15 +2289,15 ＠＠
＠subsection Iconic Resources
Analogous to ＠code{-geometry}, the ＠code{-iconic} command-line option
-sets the iconic flag of the ApplicationShell (＠code{Emacs.iconic}) and
+sets the iconic flag of the ApplicationShell (＠code{XEmacs.iconic}) and
always applies to the first frame created regardless of its name.
However, it is possible to set the iconic flag on particular frames (by
-name) by using the ＠code{Emacs*FRAME-NAME.iconic} resource.
+name) by using the ＠code{XEmacs*FRAME-NAME.iconic} resource.
＠node Resource List
＠subsection Resource List
-Emacs frames accept the following resources:
+XEmacs frames accept the following resources:
＠table ＠asis
＠item ＠code{geometry} (class ＠code{Geometry}): string
＠＠ -2382,7 +2394,7 ＠＠
such as a modem connection.
＠end table
-Emacs devices accept the following resources:
+XEmacs devices accept the following resources:
＠table ＠asis
＠item ＠code{textPointer} (class ＠code{Cursor}): cursor-name
＠＠ -2425,14 +2437,14 ＠＠
The attributes of faces are also per-frame. They can be specified as:
＠example
-Emacs.FACE_NAME.parameter: value
+XEmacs.FACE_NAME.parameter: value
＠end example
＠noindent
or
＠example
-Emacs*FRAME_NAME.FACE_NAME.parameter: value
+XEmacs*FRAME_NAME.FACE_NAME.parameter: value
＠end example
＠noindent
＠＠ -2447,7 +2459,7 ＠＠
The foreground and background colors of this face.
＠item ＠code{attributeBackgroundPixmap} (class ＠code{AttributeBackgroundPixmap}): file-name
-The name of an ＠sc{xbm} file (or ＠sc{xpm} file, if your version of Emacs
+The name of an ＠sc{xbm} file (or ＠sc{xpm} file, if your version of XEmacs
supports ＠sc{xpm}), to use as a background stipple.
＠item ＠code{attributeUnderline} (class ＠code{AttributeUnderline}): boolean
＠＠ -2456,8 +2468,8 ＠＠
All text is displayed in some face, defaulting to the face named
＠code{default}. To set the font of normal text, use
-(a)code{Emacs*default.attributeFont}. To set it in the frame named
-＠code{fred}, use ＠code{Emacs*fred.default.attributeFont}.
+(a)code{XEmacs*default.attributeFont}. To set it in the frame named
+＠code{fred}, use ＠code{XEmacs*fred.default.attributeFont}.
These are the names of the predefined faces:
＠＠ -2466,15 +2478,15 ＠＠
Everything inherits from this.
＠item bold
-If this is not specified in the resource database, Emacs tries to find a
+If this is not specified in the resource database, XEmacs tries to find a
bold version of the font of the default face.
＠item italic
-If this is not specified in the resource database, Emacs tries to find
+If this is not specified in the resource database, XEmacs tries to find
an italic version of the font of the default face.
＠item bold-italic
-If this is not specified in the resource database, Emacs tries to find a
+If this is not specified in the resource database, XEmacs tries to find a
bold-italic version of the font of the default face.
＠item modeline
＠＠ -2569,11 +2581,11 ＠＠
colors: It uses whatever resources are appropriate to the type of widget
which is used to implement it.
-If Emacs was compiled to use only the Lucid Motif-lookalike menu widgets,
+If XEmacs was compiled to use only the Lucid Motif-lookalike menu widgets,
then one way to specify the font of the menubar would be
＠example
-Emacs*menubar*font: *-courier-medium-r-*-*-*-120-*-*-*-*-*-*
+XEmacs*menubar*font: *-courier-medium-r-*-*-*-120-*-*-*-*-*-*
＠end example
If both the Lucid Motif-lookalike menu widgets and X Font Sets are
＠＠ -2593,7 +2605,7 ＠＠
If the Motif library is being used, then one would have to use
＠example
-Emacs*menubar*fontList: *-courier-medium-r-*-*-*-120-*-*-*-*-*-*
+XEmacs*menubar*fontList: *-courier-medium-r-*-*-*-120-*-*-*-*-*-*
＠end example
because the Motif library uses the ＠code{fontList} resource name instead
cvs server: cannot find modules/ldap/configure
Index: src/device-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v
retrieving revision 1.61
diff -u -u -r1.61 device-x.c
--- src/device-x.c 2005/02/03 16:30:35 1.61
+++ src/device-x.c 2005/03/24 01:27:54
＠＠ -614,14 +614,22 ＠＠
LISP_STRING_TO_EXTERNAL (Vx_emacs_application_class, app_class, Qctext);
else
{
- app_class = (NILP (Vx_emacs_application_class) &&
- have_xemacs_resources_in_xrdb (dpy))
+ if (egetenv ("USE_EMACS_AS_DEFAULT_APPLICATION_CLASS"))
+ {
+ app_class = (NILP (Vx_emacs_application_class) &&
+ have_xemacs_resources_in_xrdb (dpy))
#ifdef INFODOCK
- ? "InfoDock"
+ ? "InfoDock"
#else
- ? "XEmacs"
+ ? "XEmacs"
#endif
-: "Emacs";
+ : "Emacs";
+ }
+ else
+ {
+ app_class = "XEmacs";
+ }
+
/* need to update Vx_emacs_application_class: */
Vx_emacs_application_class = build_string (app_class);
}
＠＠ -2096,14 +2104,14 ＠＠
this variable may only be changed before emacs is dumped, or by setting it
in the file lisp/term/x-win.el.
-If this variable is nil before the connection to the X server is first
-initialized (which it is by default), the X resource database will be
-consulted and the value will be set according to whether any resources
-are found for the application class `XEmacs'. If the user has set any
-resources for the XEmacs application class, the XEmacs process will use
-the application class `XEmacs'. Otherwise, the XEmacs process will use
-the application class `Emacs' which is backwards compatible to previous
-XEmacs versions but may conflict with resources intended for GNU Emacs.
+If this variable is nil on startup, the application uses `XEmacs'. Versions
+previous to 21.5.21 examined the resource database and used `XEmacs' if any
+resources beginning with that string existed, and `Emacs' otherwise, for
+greated backward compatibility. However, this has always tended to conflict
+with GNU Emacs, so this behavior is deprecated--in the short term, you can
+restore it in a post-21.5.21 XEmacs by setting the
+USE_EMACS_AS_DEFAULT_APPLICATION_CLASS environment variable to some value,
+but in the medium and long term, you should migrate your X resources.
*/ );
Vx_emacs_application_class = Qnil;
Index: src/frame.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame.c,v
retrieving revision 1.68
diff -u -u -r1.68 frame.c
--- src/frame.c 2005/02/03 16:30:36 1.68
+++ src/frame.c 2005/03/24 01:27:56
＠＠ -37,6 +37,7 ＠＠
#include "glyphs.h"
#include "gutter.h"
#include "menubar.h"
+#include "process.h" /* for egetenv */
#include "redisplay.h"
#include "scrollbar.h"
#include "toolbar.h"
＠＠ -492,10 +493,28 ＠＠
CHECK_STRING (name);
frame_name_is_defaulted = 0;
}
- else if (STRINGP (Vdefault_frame_name))
- name = Vdefault_frame_name;
- else
- name = build_string ("emacs");
+ else if (!initialized)
+ {
+ /* We leave Vdefault_frame_name alone here so that it'll remain Qnil
+ in the dumped executable, and we can choose it at runtime. */
+ name = build_string("XEmacs");
+ }
+ else if (NILP (Vdefault_frame_name))
+ {
+ if (egetenv ("USE_EMACS_AS_DEFAULT_APPLICATION_CLASS"))
+ {
+ Vdefault_frame_name = build_string ("emacs");
+ }
+ else
+ {
+ Vdefault_frame_name = build_string ("XEmacs");
+ }
+ }
+
+ if (NILP(name) && STRINGP(Vdefault_frame_name))
+ {
+ name = Vdefault_frame_name;
+ }
if (!NILP (Fstring_match (make_string ((const Ibyte *) "\\.", 2), name,
Qnil, Qnil)))
＠＠ -3815,12 +3834,14 ＠＠
This can be overridden by arguments to `make-frame'. This must be a string.
This is used primarily for picking up X resources, and is *not* the title
of the frame. (See `frame-title-format'.)
+
+Previous to 21.5.21, this defaulted to `emacs'; since that release, it has
+defaulted to `XEmacs'. In the short term you can restore the old default by
+setting the environment variable USE_EMACS_AS_DEFAULT_APPLICATION_CLASS
+(which does affect the frame name, despite what it's called) to some value
+before starting XEmacs, but this is deprecated.
*/ );
-#ifndef INFODOCK
- Vdefault_frame_name = build_string ("emacs");
-#else
- Vdefault_frame_name = build_string ("InfoDock");
-#endif
+ Vdefault_frame_name = Qnil;
DEFVAR_LISP ("default-frame-plist", &Vdefault_frame_plist /*
Plist of default values for frame creation, other than the first one.
--
“I, for instance, am gung-ho about open source because my family is being
held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle,
when we say something in public? No-one!” -- Danny O’Brien
- 2 participants
- 2 comments
[PATCH] (Revised) Use VM as default user agent if possible
19 years, 9 months
Aidan Kehoe
Aidan Kehoe
This version doesn’t add any framework for defaulting stuff based on
packages’ presence.
etc/ChangeLog addition:
2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net>
* NEWS: Mention that the compatible, MIME-capable vm-user-agent
will be used as the default value for mail-user-agent if it's
available.
lisp/ChangeLog addition:
2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net>
* menubar-items.el (default-menubar): Make VM available as a mail
composition package, better describe sendmail.el
* simple.el (mail-user-agent): Update its docstring to mention VM,
default it to xemacs-default-user-agent.
* simple.el (vm-user-agent): Add it--taken from the VM package.
* simple.el (xemacs-default-composefunc): New.
* simple.el (xemacs-default-sendfunc): New.
* simple.el ('xemacs-default-user-agent): New. User agent that
chooses between sendmail-user-agent and vm-user-agent depending on
availability, and re-initialises mail-user-agent with that
information.
man/ChangeLog addition:
2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net>
* xemacs/sending.texi (Sending Mail): Note that we default to VM
for the sake of its MIME support when available.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: man/xemacs/sending.texi lisp/simple.el lisp/menubar-items.el etc/NEWS
Index: etc/NEWS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/NEWS,v
retrieving revision 1.73
diff -u -u -r1.73 NEWS
--- etc/NEWS 2004/09/21 09:24:11 1.73
+++ etc/NEWS 2005/03/24 01:38:00
＠＠ -35,6 +35,8 ＠＠
-- Bignums have been implemented.
-- Windows users have benefit of the full Win32 Unicode API.
-- (in process) Xft provides antialiased fonts on X11.
+ -- If you don't set it, and VM is available, mail-user-agent defaults to
+ the compatible vm-user-agent, for the sake of its MIME support.
** Bignum implementation.
Index: lisp/menubar-items.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/menubar-items.el,v
retrieving revision 1.46
diff -u -u -r1.46 menubar-items.el
--- lisp/menubar-items.el 2005/02/03 05:03:38 1.46
+++ lisp/menubar-items.el 2005/03/24 01:38:16
＠＠ -886,7 +886,12 ＠＠
:active (boundp 'ps-print-color-p)])
("%_Internet"
("%_Compose Mail With"
- ["Default Emacs Mailer"
+ ["VM mail package"
+ (customize-set-variable 'mail-user-agent 'vm-user-agent)
+ :style radio
+ :selected (eq mail-user-agent 'vm-user-agent)
+ :active (get 'vm-user-agent 'composefunc)]
+ ["Bare-bones Emacs Mailer"
(customize-set-variable 'mail-user-agent 'sendmail-user-agent)
:style radio
:selected (eq mail-user-agent 'sendmail-user-agent)]
Index: lisp/simple.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v
retrieving revision 1.50
diff -u -u -r1.50 simple.el
--- lisp/simple.el 2005/02/23 22:25:16 1.50
+++ lisp/simple.el 2005/03/24 01:38:19
＠＠ -3306,16 +3306,20 ＠＠
;; BEGIN SYNCHED WITH FSF 21.2.
-(defcustom mail-user-agent 'sendmail-user-agent
+(defcustom mail-user-agent 'xemacs-default-user-agent
"*Your preference for a mail composition package.
Various Emacs Lisp packages (e.g. Reporter) require you to compose an
outgoing email message. This variable lets you specify which
mail-sending package you prefer.
-Valid values include:
-
- `sendmail-user-agent' -- use the default Emacs Mail package.
- See Info node `(emacs)Sending Mail'.
+Valid values may include:
+
+ `vm-user-agent' -- use Kyle Jones' VM, as documented in the `(vm)'
+ Info node. Compatible with `sendmail-user-agent'
+ and can handle attachments and non-ASCII content,
+ which the former can't.
+ `sendmail-user-agent' -- use the former preferred, bare-bones, Emacs Mail
+ package. See Info node `(xemacs)Sending Mail'.
`mh-e-user-agent' -- use the Emacs interface to the MH mail system.
See Info node `(mh-e)'.
`message-user-agent' -- use the Gnus Message package.
＠＠ -3324,12 +3328,22 ＠＠
paraphernalia, particularly the Gcc: header for
archiving.
+If you examine the value of this variable before setting it or composing a
+mail, it will have another value, `xemacs-default-user-agent'--this is to
+allow XEmacs to choose the more capable and compatible `vm-user-agent' if
+available, in preference to `sendmail-user-agent'. The latter, while part
+of the base XEmacs Lisp code, and very lightweight, doesn't support MIME, a
+considerable disadvantage today.
+
Additional valid symbols may be available; check with the author of
your package for details. The function should return non-nil if it
succeeds.
See also `read-mail-command' concerning reading mail."
-:type '(radio (function-item :tag "Default Emacs mail"
+:type '(radio (function-item :tag "VM mail package"
+ :format "%t\n"
+ vm-user-agent)
+ (function-item :tag "Bare-bones Emacs mail"
:format "%t\n"
sendmail-user-agent)
(function-item :tag "Emacs interface to MH"
＠＠ -3379,8 +3393,49 ＠＠
(put symbol 'abortfunc (or abortfunc 'kill-buffer))
(put symbol 'hookvar (or hookvar 'mail-send-hook)))
+(define-mail-user-agent 'vm-user-agent
+ 'vm-compose-mail
+ 'vm-mail-send-and-exit)
+
(define-mail-user-agent 'sendmail-user-agent
'sendmail-user-agent-compose 'mail-send-and-exit)
+
+(defun xemacs-default-composefunc (&rest args)
+ "Check if VM is available; if so, set `mail-user-agent' to
+`vm-user-agent', pass `args' to the corresponding mail composition function,
+and return its result. Otherwise, set `mail-user-agent' to
+`sendmail-user-agent', pass `args' to its composition function, and return
+its result. "
+ (cond
+ ((featurep 'vm-autoloads)
+ (if (eq mail-user-agent 'xemacs-default-user-agent)
+ (setq mail-user-agent 'vm-user-agent))
+ (apply (get 'vm-user-agent 'composefunc) args))
+ (t
+ (if (eq mail-user-agent 'xemacs-default-user-agent)
+ (setq mail-user-agent 'sendmail-user-agent)))
+ (apply (get 'sendmail-user-agent 'composefunc) args)))
+
+;; Shouldn't be necessary, as xemacs-default-composefunc should always have
+;; been called first, but is here for completeness.
+(defun xemacs-default-sendfunc (&rest args)
+ "Check if VM is available; if so, set `mail-user-agent' to
+`vm-user-agent', pass `args' to the corresponding mail send function, and
+return its result. Otherwise, set `mail-user-agent' to
+`sendmail-user-agent', pass `args' to its send function, and return its
+result. "
+ (cond
+ ((featurep 'vm-autoloads)
+ (if (eq mail-user-agent 'xemacs-default-user-agent)
+ (setq mail-user-agent 'vm-user-agent))
+ (apply (get 'vm-user-agent 'sendfunc) args))
+ (t
+ (if (eq mail-user-agent 'xemacs-default-user-agent)
+ (setq mail-user-agent 'vm-user-agent)))
+ (apply (get 'sendmail-user-agent 'sendfunc) args)))
+
+(define-mail-user-agent 'xemacs-default-user-agent
+ 'xemacs-default-composefunc 'xemacs-default-sendfunc)
(define-mail-user-agent 'message-user-agent
'message-mail 'message-send-and-exit
Index: man/xemacs/sending.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/sending.texi,v
retrieving revision 1.4
diff -u -u -r1.4 sending.texi
--- man/xemacs/sending.texi 2001/04/12 18:22:30 1.4
+++ man/xemacs/sending.texi 2005/03/24 01:38:23
＠＠ -40,6 +40,16 ＠＠
＠kbd{C-u C-x m} is another way to switch back to a message in progress:
it will search for an existing, unsent mail message buffer and select it.
+Starting with version 21.5, the default mail composition package in
+XEmacs is VM, which is compatible with `sendmail.el' (the old default,
+as described in this document) and has thorough support for attachments
+and non-ASCII messages. ＠xref{(vm)}, for the full VM documentation,
+should you want information on these features. XEmacs' package system
+can mean that VM isn't installed---in that case, `sendmail.el' will
+be the fallback. If your mail buffer is called ``*mail*'', then
+you probably don't have VM installed; ＠pxref{Packages} for information
+on how to install the package.
+
＠menu
* Format: Mail Format. Format of the mail being composed.
* Headers: Mail Headers. Details of allowed mail header fields.
cvs server: cannot find modules/ldap/configure
--
“I, for instance, am gung-ho about open source because my family is being
held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle,
when we say something in public? No-one!” -- Danny O’Brien
- 1 participants
- 0 comments
[COMMIT] Update some usage & error messages to use the --with-* syntax
19 years, 9 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
I had thought, and mentioned in mail, that the copy of configure in the
repository was out of date, but it turned out I had a sticky tag
locally. While looking into it, I noticed some docstrings that needed
changing.
ChangeLog addition:
2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net>
* configure: Regenerate.
* configure.ac (XE_COMPLEX_ARG_ENABLE): --OPTION -> --with-OPTION
in various docstrings and error messages.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: configure.ac configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.245
diff -u -u -r1.245 configure
--- configure 2005/03/15 12:37:07 1.245
+++ configure 2005/03/24 00:26:20
＠＠ -967,7 +967,7 ＠＠
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-prefix=no Don't compile the value of --prefix into the
+ --with-prefix=no Don't compile the value for `prefix' into the
executable.
--with-site-lisp=no Allow for a site-lisp directory in the XEmacs
hierarchy searched before the installation packages.
＠＠ -1072,8 +1072,9 ＠＠
--with-compiler C compiler to use
--with-xemacs-compiler compiler to use to compile just the xemacs
executable and C modules. If you want to compile
- XEmacs as C++, use e.g. `--xemacs-compiler=g++'.
- This turns on a lot of additional error-checking.
+ XEmacs as C++, use e.g.
+ `--with-xemacs-compiler=g++'. This turns on a lot of
+ additional error-checking.
--with-cflags Compiler flags (such as -O); setting this overrides
all default compiler flags except those that control
warnings.
＠＠ -2334,7 +2335,7 ＠＠
if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
(echo "$progname: Usage error:"
echo " " "Only one of \`dbm' and \`gnudbm' may be specified
-with the \`--$optname' option."
+with the \`--enable-database' option."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.4
diff -u -u -r1.4 configure.ac
--- configure.ac 2005/03/15 12:37:14 1.4
+++ configure.ac 2005/03/24 00:26:25
＠＠ -492,7 +492,7 ＠＠
dnl parse flags
AC_ARG_WITH([prefix],
- AC_HELP_STRING([--with-prefix=no],[Don't compile the value of --prefix into the executable.]),
+ AC_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]),
[true], [with_prefix=yes])
AC_ARG_WITH([site-lisp],
AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]),
＠＠ -751,7 +751,7 ＠＠
AC_ARG_WITH([xemacs-compiler],
AC_HELP_STRING([--with-xemacs-compiler],[compiler to use to compile just the xemacs executable and C modules.
If you want to compile XEmacs as C++, use e.g.
- `--xemacs-compiler=g++'. This turns on a lot of
+ `--with-xemacs-compiler=g++'. This turns on a lot of
additional error-checking.]),
[], [])
＠＠ -818,7 +818,7 ＠＠
[
if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified
-with the \`--$optname' option.")
+with the \`--enable-database' option.")
fi
],
[],
＠＠ -1685,7 +1685,7 ＠＠
fi
dnl Choose a compiler from (in order)
-dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC
+dnl --with-compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC
test -n "$with_compiler" && CC="$with_compiler"
if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler
case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac
＠＠ -1753,7 +1753,7 ＠＠
dnl The compiler used to build xemacs, as opposed to the compiler
dnl used by configure and lib-src, is determined from the following
dnl sources, in order of priority:
-dnl o --xemacs-compiler configure flag
+dnl o --with-xemacs-compiler configure flag
dnl o XEMACS_CC environment variable
dnl o same as the regular compiler, (determined previously)
--
“I, for instance, am gung-ho about open source because my family is being
held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle,
when we say something in public? No-one!” -- Danny O’Brien
- 1 participants
- 0 comments