[emacs-snapshot-debian commit] Split misc-unseparated.dpatch into
small patches @ emacs-snapshot-debian--main--0
Jérôme Marant
jerome at marant.org
Sat Jul 30 10:20:36 UTC 2005
Revision: emacs-snapshot-debian--main--0--patch-8
Archive: jerome at debian.org--2005
Creator: Jerome Marant <jerome at marant.org>
Date: sam jui 30 12:19:48 CEST 2005
Standard-date: 2005-07-30 10:19:48 GMT
New-files: patches/.arch-ids/debian-cssc-vc-backend.dpatch.id
patches/.arch-ids/debian-default-info-directory.dpatch.id
patches/.arch-ids/debian-default-mta-parameters.dpatch.id
patches/.arch-ids/debian-emacs-flavor.dpatch.id
patches/.arch-ids/debian-emacs-manpage.dpatch.id
patches/.arch-ids/debian-emacs-news.dpatch.id
patches/.arch-ids/debian-mail-from-style.dpatch.id
patches/debian-cssc-vc-backend.dpatch
patches/debian-default-info-directory.dpatch
patches/debian-default-mta-parameters.dpatch
patches/debian-emacs-flavor.dpatch
patches/debian-emacs-manpage.dpatch
patches/debian-emacs-news.dpatch
patches/debian-mail-from-style.dpatch
Removed-files: patches/.arch-ids/misc-unseparated.dpatch.id
patches/misc-unseparated.dpatch
Renamed-files: patches/.arch-ids/version-mention-debian.dpatch.id patches/.arch-ids/debian-version-mention.dpatch.id
patches/version-mention-debian.dpatch patches/debian-version-mention.dpatch
Modified-files: patches/00list
patches/debian-version-mention.dpatch
New-patches: jerome at debian.org--2005/emacs-snapshot-debian--main--0--patch-8
Summary: Split misc-unseparated.dpatch into small patches
Keywords:
* looking for jerome at debian.org--2005/emacs-snapshot-debian--main--0--patch-7 to compare with
* build pristine tree for jerome at debian.org--2005/emacs-snapshot-debian--main--0--patch-7
* comparing to jerome at debian.org--2005/emacs-snapshot-debian--main--0--patch-7: ..................... done.
* modified files
--- orig/patches/00list
+++ mod/patches/00list
@@ -1,4 +1,8 @@
-misc-unseparated
-#movemail-mailspool
-version-mention-debian
-#fix-x-vs-no-x-diffs
+debian-version-mention
+debian-cssc-vc-backend
+debian-default-info-directory
+debian-default-mta-parameters
+debian-emacs-flavor
+debian-emacs-manpage
+debian-emacs-news
+debian-mail-from-style
--- orig/patches/version-mention-debian.dpatch
+++ mod/patches/debian-version-mention.dpatch
@@ -1,5 +1,5 @@
#! /bin/sh -e
-## 500-version-mention-debian.dpatch by Rob Browning <rlb at defaultvalue.org>
+## debian-version-mention.dpatch by Rob Browning <rlb at defaultvalue.org>
##
## DP: ** (version) has been modified to indicate Debian modifications.
## DP: Author: rlb
* added files
--- /dev/null
+++ mod/patches/.arch-ids/debian-cssc-vc-backend.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sat Jul 30 12:07:10 2005 9076.0
--- /dev/null
+++ mod/patches/.arch-ids/debian-default-info-directory.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sat Jul 30 12:07:10 2005 9076.1
--- /dev/null
+++ mod/patches/.arch-ids/debian-default-mta-parameters.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sat Jul 30 12:07:10 2005 9076.2
--- /dev/null
+++ mod/patches/.arch-ids/debian-emacs-flavor.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sat Jul 30 12:07:10 2005 9076.3
--- /dev/null
+++ mod/patches/.arch-ids/debian-emacs-manpage.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sat Jul 30 12:07:10 2005 9076.4
--- /dev/null
+++ mod/patches/.arch-ids/debian-emacs-news.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sat Jul 30 12:07:10 2005 9076.5
--- /dev/null
+++ mod/patches/.arch-ids/debian-mail-from-style.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sat Jul 30 12:07:10 2005 9076.6
--- /dev/null
+++ mod/patches/debian-cssc-vc-backend.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-cssc-vc-backend.dpatch by Rob Browning
+##
+## ** Use CSSC instead of SCCS.
+
+ at DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el trunk/lisp/vc-hooks.el
+--- v/home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el 2004-05-18 22:43:49.000000000 +0200
++++ trunk/lisp/vc-hooks.el 2004-05-18 22:44:32.000000000 +0200
+@@ -71,8 +71,8 @@
+ :group 'vc)
+
+ (defcustom vc-path
+- (if (file-directory-p "/usr/sccs")
+- '("/usr/sccs")
++ (if (file-directory-p "/usr/lib/cssc")
++ '("/usr/lib/cssc")
+ nil)
+ "*List of extra directories to search for version control commands."
+ :type '(repeat directory)
--- /dev/null
+++ mod/patches/debian-default-info-directory.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-default-info-directory.dpatch by Rob Browning <rlb at defaultvalue.org>
+##
+## DP: ** Info-default-directory-list includes /usr/share/info/emacs-MAJOR
+## DP: Info-default-directory-list was modified to reflect the install
+## DP: location of the info files. This location allows multiple emacsen to
+## DP: coexist on the same Debian system.
+## DP: Provided by: Rob Browning <rlb at defaultvalue.org>
+
+ at DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/site-init.el trunk/lisp/site-init.el
+--- /home/rlb/deb/emacs21/trunk/lisp/site-init.el 1969-12-31 18:00:00.000000000 -0600
++++ trunk/lisp/site-init.el 2003-09-11 01:16:53.000000000 -0500
+@@ -0,0 +1,3 @@
++(setq Info-default-directory-list
++ ;; the command line info doesn't seem to need this, but emacs does.
++ (append Info-default-directory-list '("/usr/share/info/emacs-snapshot/")))
+
+
--- /dev/null
+++ mod/patches/debian-default-mta-parameters.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-default-mta-parameters.dpatch by Rob Browning <rlb at defaultvalue.org>
+##
+## DP: ** The default for message-sendmail-f-is-evil has been changed to t.
+## DP: This is correct for Debian systems where we know the MTA should be
+## DP: trusted.
+## DP: Provided by: Rob Browning <rlb at defaultvalue.org>
+
+ at DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el trunk/lisp/gnus/message.el
+--- /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el 2005-04-25 21:03:02.847276408 +0200
++++ trunk/lisp/gnus/message.el 2005-04-25 21:06:15.133044528 +0200
+@@ -717,9 +717,14 @@
+ (const never)
+ (const ask)))
+
+-(defcustom message-sendmail-f-is-evil nil
++;; message-sendmail-f-is-evil is nil here in the upstream source, but
++;; sendmail works right under Debian Linux, so we want t. [was
++;; orignally reported for emacs 19 as debian#7051]
++(defcustom message-sendmail-f-is-evil t
+ "*Non-nil means don't add \"-f username\" to the sendmail command line.
+-Doing so would be even more evil than leaving it out."
++Doing so would be even more evil than leaving it out.
++Under Debian/GNU/Linux, sendmail works right, so it should be safe for
++this to be set to true."
+ :group 'message-sending
+ :link '(custom-manual "(message)Mail Variables")
+ :type 'boolean)
--- /dev/null
+++ mod/patches/debian-emacs-flavor.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-emacs-flavor.dpatch by Rob Browning <rlb at defaultvalue.org>
+##
+## DP: ** Define a Debian-specific Emacs flavor.
+## DP: Provided by: Rob Browning <rlb at defaultvalue.org>
+
+ at DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/startup.el trunk/lisp/startup.el
+--- /home/rlb/deb/emacs21/trunk/lisp/startup.el 2004-05-18 22:36:39.000000000 +0200
++++ trunk/lisp/startup.el 2004-05-18 22:40:42.000000000 +0200
+@@ -285,6 +285,10 @@
+
+ (defvar normal-top-level-add-subdirs-inode-list nil)
+
++(defconst debian-emacs-flavor 'emacs-snapshot
++ "A symbol representing the particular debian flavor of emacs running.
++Something like 'emacs20, 'xemacs20, etc.")
++
+ (defvar no-blinking-cursor nil)
+
+ (defvar pure-space-overflow nil
+@@ -784,9 +788,18 @@
+ ;; Run the site-start library if it exists. The point of this file is
+ ;; that it is run before .emacs. There is no point in doing this after
+ ;; .emacs; that is useless.
+- (if site-run-file
+- (load site-run-file t t))
++ ;; (if site-run-file
++ ;; (load site-run-file t t))
+
++ ;; Debian version of site-start.
++ (if site-run-file
++ (progn
++ ;; Load all the debian package snippets.
++ ;; It's in here because we want -q to kill it too.
++ (if (load "debian-startup" t t nil)
++ (debian-startup debian-emacs-flavor))
++ ;; Now the normal site file...
++ (load site-run-file t t nil)))
+ ;; Sites should not disable this. Only individuals should disable
+ ;; the startup message.
+ (setq inhibit-startup-message nil)
--- /dev/null
+++ mod/patches/debian-emacs-manpage.dpatch
@@ -0,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-emacs-manpage.dpatch by Rob Browning <rlb at defaultvalue.org>
+##
+## DP: ** Some documentation references to /usr/local/ have been changed to /usr.
+## DP: Provided by: Rob Browning <rlb at defaultvalue.org>
+
+ at DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/etc/emacs.1 trunk/etc/emacs.1
+--- /home/rlb/deb/emacs21/trunk/etc/emacs.1 2004-05-18 22:17:22.000000000 +0200
++++ trunk/etc/emacs.1 2004-05-18 22:22:33.000000000 +0200
+@@ -201,7 +201,7 @@
+ window in reverse video.
+ .TP
+ .B \-i
+-Use the "kitchen sink" bitmap icon when iconifying the
++Use the Emacs icon when iconifying the
+ .I Emacs
+ window.
+ .TP
+@@ -253,7 +253,7 @@
+ .IR X (1)
+ for more information.
+ The width and height are specified in characters; the default is 80 by
+-24. See the Emacs manual, section "Options for Window Size and Position",
++40. See the Emacs manual, section "Options for Window Size and Position",
+ for information on how window sizes interact
+ with selecting or deselecting the tool bar and menu bar.
+ .PP
+@@ -430,29 +430,29 @@
+ manual is also included in the Emacs source distribution.
+ .PP
+ .SH FILES
+-/usr/local/info - files for the Info documentation browser
++/usr/share/info - files for the Info documentation browser
+ (a subsystem of Emacs) to refer to. Currently not much of Unix
+ is documented here, but the complete text of the Emacs reference
+ manual is included in a convenient tree structured form.
+
+-/usr/local/share/emacs/$VERSION/src - C source files and object files
++/usr/share/emacs/$VERSION/src - C source files and object files
+
+ /usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
+ that define most editing commands. Some are preloaded;
+ others are autoloaded from this directory when used.
+
+-/usr/local/share/emacs/$VERSION/etc - various programs that are used with
++/usr/share/emacs/$VERSION/etc - various programs that are used with
+ GNU Emacs, and some files of information.
+
+-/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation
++/usr/share/emacs/$VERSION/etc/DOC.* - contains the documentation
+ strings for the Lisp primitives and preloaded Lisp functions
+ of GNU Emacs. They are stored here to reduce the size of
+ Emacs proper.
+
+-/usr/local/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
++/usr/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
+ vs. other versions of Emacs.
+ .br
+-/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
++/usr/share/emacs/$VERSION/etc/SERVICE lists people offering
+ various services to assist users of GNU Emacs, including education,
+ troubleshooting, porting and customization.
+ .br
+@@ -460,7 +460,7 @@
+ programs in the Emacs Lisp extension language, which has not yet been fully
+ documented.
+
+-/usr/local/com/emacs/lock - holds lock files that are made for all
++/usr/com/emacs/lock - holds lock files that are made for all
+ files being modified in Emacs, to prevent simultaneous modification
+ of one file by two users.
+
+@@ -487,7 +487,7 @@
+ Send requests to be added to mailing lists to the special list
+ info-gnu-emacs-request at prep.ai.mit.edu (or the corresponding UUCP
+ address). For more information about Emacs mailing lists, see the
+-file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be
++file /usr/share/emacs/$VERSION/etc/MAILINGLISTS. Bugs tend actually to be
+ fixed if they can be isolated, so it is in your interest to report
+ them in such a way that they can be easily reproduced.
+ .PP
\ Pas de fin de ligne à la fin du fichier.
--- /dev/null
+++ mod/patches/debian-emacs-news.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-emacs-news.dpatch by Rob Browning <rlb at defaultvalue.org>
+##
+## DP: ** Mention Debian-specific changes in the Emacs NEWS file.
+## DP: Provided by: Rob Browning <rlb at defaultvalue.org>
+
+ at DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/etc/NEWS trunk/etc/NEWS
+--- /home/rlb/deb/emacs21/trunk/etc/NEWS 2005-04-25 22:16:07.314736040 +0200
++++ trunk/etc/NEWS 2005-04-25 22:16:55.360431984 +0200
+@@ -15,6 +15,11 @@
+ so we will look at it and add it to the manual.
+
+
++* Debian specific changes to Emacs
++
++Please see /usr/share/doc/emacs-snapshot/README.Debian.gz.
++
++
+ * Installation Changes in Emacs 22.1
+
+ ** Emacs includes now support for loading image libraries on demand.
\ Pas de fin de ligne à la fin du fichier.
--- /dev/null
+++ mod/patches/debian-mail-from-style.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-mail-from-style.dpatch by Rob Browning <rlb at defaultvalue.org>
+##
+## DP: ** mail-from-style changed from 'angles to 'system-default by default.
+## DP: Provided by: Rob Browning <rlb at defaultvalue.org>
+
+ at DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el trunk/lisp/mail/sendmail.el
+--- /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el 2004-05-18 22:30:17.000000000 +0200
++++ trunk/lisp/mail/sendmail.el 2004-05-18 22:30:50.000000000 +0200
+@@ -43,7 +43,7 @@
+ :group 'mail)
+
+ ;;;###autoload
+-(defcustom mail-from-style 'angles "\
++(defcustom mail-from-style 'system-default "\
+ *Specifies how \"From:\" fields look.
+
+ If `nil', they contain just the return address like:
\ Pas de fin de ligne à la fin du fichier.
* removed files
--- orig/patches/.arch-ids/misc-unseparated.dpatch.id
+++ /dev/null
@@ -1 +0,0 @@
-Jerome Marant <jerome at marant.org> Sat Feb 19 15:07:41 2005 5847.1
--- orig/patches/misc-unseparated.dpatch
+++ /dev/null
@@ -1,225 +0,0 @@
-#! /bin/sh -e
-## misc-unseparated.dpatch by Rob Browning <rlb at defaultvalue.org>
-##
-## DP: ** Some documentation references to /usr/local/ have been changed to /usr.
-## DP:
-## DP: ** Emacs runs debian-startup
-## DP: Emacs runs debian-startup during the startup process unless
-## DP: site-run-file is false.
-## DP:
-## DP: ** The default for message-sendmail-f-is-evil has been changed to t.
-## DP: This is correct for Debian systems where we know the MTA should be
-## DP: trusted.
-## DP:
-## DP: ** mail-from-style changed from 'angles to 'system-default by default.
-## DP:
-## DP: ** debian-emacs-flavor is a global variable bound to 'emacs21.
-## DP: Author: rlb
-## DP:
-## DP: ** Info-default-directory-list includes /usr/share/info/emacs-MAJOR
-## DP: Author: rlb
-## DP: Info-default-directory-list was modified to reflect the install
-## DP: location of the info files. This location allows multiple emacsen to
-## DP: coexist on the same Debian system.
-## DP:
-## DP: ** The build process was modified to accommodate Debian packaging.
-## DP: Author: rlb
-## DP: Emacs has to be able to install into a directory that will
-## DP: not be the eventual run directory without embedding the install
-## DP: directory in any of the resulting files.
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
-diff -urNad /home/rlb/deb/emacs21/trunk/etc/NEWS trunk/etc/NEWS
---- /home/rlb/deb/emacs21/trunk/etc/NEWS 2005-04-25 22:16:07.314736040 +0200
-+++ trunk/etc/NEWS 2005-04-25 22:16:55.360431984 +0200
-@@ -15,6 +15,11 @@
- so we will look at it and add it to the manual.
-
-
-+* Debian specific changes to Emacs
-+
-+Please see /usr/share/doc/emacs-snapshot/README.Debian.gz.
-+
-+
- * Installation Changes in Emacs 22.1
-
- ** Emacs includes now support for loading image libraries on demand.
-diff -urNad /home/rlb/deb/emacs21/trunk/etc/emacs.1 trunk/etc/emacs.1
---- /home/rlb/deb/emacs21/trunk/etc/emacs.1 2004-05-18 22:17:22.000000000 +0200
-+++ trunk/etc/emacs.1 2004-05-18 22:22:33.000000000 +0200
-@@ -201,7 +201,7 @@
- window in reverse video.
- .TP
- .B \-i
--Use the "kitchen sink" bitmap icon when iconifying the
-+Use the Emacs icon when iconifying the
- .I Emacs
- window.
- .TP
-@@ -253,7 +253,7 @@
- .IR X (1)
- for more information.
- The width and height are specified in characters; the default is 80 by
--24. See the Emacs manual, section "Options for Window Size and Position",
-+40. See the Emacs manual, section "Options for Window Size and Position",
- for information on how window sizes interact
- with selecting or deselecting the tool bar and menu bar.
- .PP
-@@ -430,29 +430,29 @@
- manual is also included in the Emacs source distribution.
- .PP
- .SH FILES
--/usr/local/info - files for the Info documentation browser
-+/usr/share/info - files for the Info documentation browser
- (a subsystem of Emacs) to refer to. Currently not much of Unix
- is documented here, but the complete text of the Emacs reference
- manual is included in a convenient tree structured form.
-
--/usr/local/share/emacs/$VERSION/src - C source files and object files
-+/usr/share/emacs/$VERSION/src - C source files and object files
-
- /usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
- that define most editing commands. Some are preloaded;
- others are autoloaded from this directory when used.
-
--/usr/local/share/emacs/$VERSION/etc - various programs that are used with
-+/usr/share/emacs/$VERSION/etc - various programs that are used with
- GNU Emacs, and some files of information.
-
--/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation
-+/usr/share/emacs/$VERSION/etc/DOC.* - contains the documentation
- strings for the Lisp primitives and preloaded Lisp functions
- of GNU Emacs. They are stored here to reduce the size of
- Emacs proper.
-
--/usr/local/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
-+/usr/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
- vs. other versions of Emacs.
- .br
--/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
-+/usr/share/emacs/$VERSION/etc/SERVICE lists people offering
- various services to assist users of GNU Emacs, including education,
- troubleshooting, porting and customization.
- .br
-@@ -460,7 +460,7 @@
- programs in the Emacs Lisp extension language, which has not yet been fully
- documented.
-
--/usr/local/com/emacs/lock - holds lock files that are made for all
-+/usr/com/emacs/lock - holds lock files that are made for all
- files being modified in Emacs, to prevent simultaneous modification
- of one file by two users.
-
-@@ -487,7 +487,7 @@
- Send requests to be added to mailing lists to the special list
- info-gnu-emacs-request at prep.ai.mit.edu (or the corresponding UUCP
- address). For more information about Emacs mailing lists, see the
--file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be
-+file /usr/share/emacs/$VERSION/etc/MAILINGLISTS. Bugs tend actually to be
- fixed if they can be isolated, so it is in your interest to report
- them in such a way that they can be easily reproduced.
- .PP
-diff -urNad /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el trunk/lisp/gnus/message.el
---- /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el 2005-04-25 21:03:02.847276408 +0200
-+++ trunk/lisp/gnus/message.el 2005-04-25 21:06:15.133044528 +0200
-@@ -717,9 +717,14 @@
- (const never)
- (const ask)))
-
--(defcustom message-sendmail-f-is-evil nil
-+;; message-sendmail-f-is-evil is nil here in the upstream source, but
-+;; sendmail works right under Debian Linux, so we want t. [was
-+;; orignally reported for emacs 19 as debian#7051]
-+(defcustom message-sendmail-f-is-evil t
- "*Non-nil means don't add \"-f username\" to the sendmail command line.
--Doing so would be even more evil than leaving it out."
-+Doing so would be even more evil than leaving it out.
-+Under Debian/GNU/Linux, sendmail works right, so it should be safe for
-+this to be set to true."
- :group 'message-sending
- :link '(custom-manual "(message)Mail Variables")
- :type 'boolean)
-diff -urNad /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el trunk/lisp/mail/sendmail.el
---- /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el 2004-05-18 22:30:17.000000000 +0200
-+++ trunk/lisp/mail/sendmail.el 2004-05-18 22:30:50.000000000 +0200
-@@ -43,7 +43,7 @@
- :group 'mail)
-
- ;;;###autoload
--(defcustom mail-from-style 'angles "\
-+(defcustom mail-from-style 'system-default "\
- *Specifies how \"From:\" fields look.
-
- If `nil', they contain just the return address like:
-diff -urNad /home/rlb/deb/emacs21/trunk/lisp/site-init.el trunk/lisp/site-init.el
---- /home/rlb/deb/emacs21/trunk/lisp/site-init.el 1969-12-31 18:00:00.000000000 -0600
-+++ trunk/lisp/site-init.el 2003-09-11 01:16:53.000000000 -0500
-@@ -0,0 +1,3 @@
-+(setq Info-default-directory-list
-+ ;; the command line info doesn't seem to need this, but emacs does.
-+ (append Info-default-directory-list '("/usr/share/info/emacs-snapshot/")))
-diff -urNad /home/rlb/deb/emacs21/trunk/lisp/startup.el trunk/lisp/startup.el
---- /home/rlb/deb/emacs21/trunk/lisp/startup.el 2004-05-18 22:36:39.000000000 +0200
-+++ trunk/lisp/startup.el 2004-05-18 22:40:42.000000000 +0200
-@@ -285,6 +285,10 @@
-
- (defvar normal-top-level-add-subdirs-inode-list nil)
-
-+(defconst debian-emacs-flavor 'emacs-snapshot
-+ "A symbol representing the particular debian flavor of emacs running.
-+Something like 'emacs20, 'xemacs20, etc.")
-+
- (defvar no-blinking-cursor nil)
-
- (defvar pure-space-overflow nil
-@@ -784,9 +788,18 @@
- ;; Run the site-start library if it exists. The point of this file is
- ;; that it is run before .emacs. There is no point in doing this after
- ;; .emacs; that is useless.
-- (if site-run-file
-- (load site-run-file t t))
-+ ;; (if site-run-file
-+ ;; (load site-run-file t t))
-
-+ ;; Debian version of site-start.
-+ (if site-run-file
-+ (progn
-+ ;; Load all the debian package snippets.
-+ ;; It's in here because we want -q to kill it too.
-+ (if (load "debian-startup" t t nil)
-+ (debian-startup debian-emacs-flavor))
-+ ;; Now the normal site file...
-+ (load site-run-file t t nil)))
- ;; Sites should not disable this. Only individuals should disable
- ;; the startup message.
- (setq inhibit-startup-message nil)
-diff -urNad /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el trunk/lisp/vc-hooks.el
---- v/home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el 2004-05-18 22:43:49.000000000 +0200
-+++ trunk/lisp/vc-hooks.el 2004-05-18 22:44:32.000000000 +0200
-@@ -71,8 +71,8 @@
- :group 'vc)
-
- (defcustom vc-path
-- (if (file-directory-p "/usr/sccs")
-- '("/usr/sccs")
-+ (if (file-directory-p "/usr/lib/cssc")
-+ '("/usr/lib/cssc")
- nil)
- "*List of extra directories to search for version control commands."
- :type '(repeat directory)
More information about the pkg-emacs-commits
mailing list