[PATCH] Announcing 21.4.21
17 years, 1 month
Vin Shelton
Vin Shelton
Updating the web pages to announce 21.4.21.
Still to come: updates announcing the gnuclient setup kit for native
Windows.
- Vin
Releases/ChangeLog addition:
2007-11-10 Vin Shelton <acs(a)xemacs.org>
* 21.4.21.content: Announce 21.4.21.
* index.content: ditto.
web source patch:
Diff command: cvs -q diff -u
Files affected: Releases/index.content Releases/21.4.21.content
Index: Releases/21.4.21.content
===================================================================
RCS file: 21.4.21.content
diff -N 21.4.21.content
--- /dev/null Sat Nov 10 20:46:23 2007
+++ 21.4.21.content Sat Nov 10 20:46:26 2007
＠＠ -0,0 +1,375 ＠＠
+%title%
+XEmacs 21.4.21 "Educational Television" is released
+%author%
+automatically generated from release announcement by release-mail-to-html.el
+%main%
+ <h1><a name="announcement">XEmacs 21.4.21 "Educational Television" is released</a></h1>
+ <p>goto announcement,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+To: xemacs-announce(a)xemacs.org, xemacs-beta(a)xemacs.org
+Subject: XEmacs 21.4.21 "Educational Television" is released
+From: Vin Shelton <acs(a)xemacs.org>
+Organization: The XEmacs Development Team
+Date: Sat, 10 Nov 2007 14:00:47 -0500
+Message-ID: <87abpmudr4.fsf(a)alumni.princeton.edu>
+
+
+* XEmacs 21.4.21 "Educational Television" is released.
+ "Educational Television" is the twentieth-first release in the OXYMORON series.
+
+The latest stable release of XEmacs, XEmacs 21.4.21 - "Educational Television",
+is now available from xemacs.org and its mirrors.
+
+* Availability
+
+Anonymous ftp:
+
+ ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.4
+
+See http://www.xemacs.org/Install/. As of 21.4.18, only a source
+tarball has been supplied. There was virtually no use of the info and
+elc tarballs, so xemacs-21.4.21.tar.gz and xemacs-21.4.21.tar.bz2 are
+the only tarballs supplied.
+
+If you already have a 21.4.20 source tree, a patchkit is available in
+xemacs-21.4.20-21.4.21.patch.gz. This does not update .elcs or .infos,
+they will be rebuilt when you make XEmacs. If you have an earlier
+version, you can repeatedly apply patchkits.
+
+The tarballs and patches are signed with my GPG key, available from
+most public keyservers and also from
+ftp://ftp.xemacs.org/pub/xemacs/pgp-keys/vin_shelton.asc
+
+Here are the MD5 check sums of each of the files related to the XEmacs
+21.4.21 release:
+
+e63f1420788cc45edd56c1a95df02633 xemacs-21.4.20-21.4.21.patch.gz
+878bb94b1bf6da29ce60731130bb5a20 xemacs-21.4.20-21.4.21.patch.gz.asc
+1669330c839780791242fed788ef5482 xemacs-21.4.21.tar.bz2
+3bd85fee135cfe90dd1cdd7e9cb91aae xemacs-21.4.21.tar.bz2.asc
+87b051f12d1bb344ca4da1907100f1b5 xemacs-21.4.21.tar.gz
+03c28f1a76db7baebf25b33dd939bcb6 xemacs-21.4.21.tar.gz.asc
+
+Also, if you don't have the packages yet, see
+
+ http://www.xemacs.org/Documentation/packageGuide.html.
+
+Anonymous (pserver) CVS:
+
+Anonymous CVS is available. We are very grateful to the staff at our
+host, SunSITE.dk, for a lot of help and quick reponse to all our
+requests.
+
+If you haven't used XEmacs CVS recently, we moved the repository
+before the 21.4.6 release. The repository structure is the same as
+before, so it should be possible to reuse an existing checked-out CVS
+tree.
+
+Take care that your Root is set correctly to
+
+ CVSROOT=:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs
+
+On platforms with a Bourne shell and find available, something like
+
+ for r in `find . -name Root`; do echo $CVSROOT > $r; done
+
+will convert your entire tree.
+
+Tags are also the same; to update to release 21.4.21, use the release
+tag "r21-4-21". To set a sticky tag which will always update to the
+current release, use the branch tag "release-21-4".
+
+For more details, see
+
+ http://www.xemacs.org/Develop/cvsaccess.html
+
+
+Sincerely,
+ Vin Shelton
+ Stable Release Manager for XEmacs</pre>
+ <h1><a name="summary">Changes</a> in XEmacs 21.4.21 "Educational Television"</h1>
+ <p>goto <a href="#announcement">announcement</a>,
+ summary,
+ <a href="#changes">changes</a></p>
+ <p>User-Visible Bug Fixes and Improvements</p>
+ <p>Fix: Declare that we use a deprecated ldap interface.</p>
+ <p>Fix: Make user-init file migration more robust.</p>
+ <p>Fix: Clarify docstring in progress-feedback-with-label.</p>
+ <p>Fix: Fix xlwgauge bug which may be related to progress bar crash.</p>
+ <p>Fix: Fix crash when using window manager to close dialog box.</p>
+ <p>Fix: Bound range check for Solaris gcc lossage no longer needed on Solaris 5.10</p>
+ <p>Fix: Fix playing sound on 64-bit linux.</p>
+ <p>Fix: Fix crashes with png display.</p>
+ <p>Fix: Fix double free on modifier map.</p>
+ <p>Fix: Don't close already-closed file ids.</p>
+ <p>Fix: Under Windows, tie execute permission to read permission.</p>
+ <p>Fix: Under Windows, check old-style readonly bit only for non-directories.</p>
+ <p>Fix: Under Windows, the read-only attribute supercedes NTFS ACLs.</p>
+ <p>Update: Update Didier Verna's personal info.</p>
+ <p>Update: Update package download sites.</p>
+ <p>Update: Sync font-lock-add-keywords and font-lock-remove-keywords from GNU Emacs.</p>
+ <p>Update: Update Inno Setup script file.</p>
+ <p>Update: Update Steve Baur's email address.</p>
+ <p>Feature: Add defvar for font-lock-warning-face.</p>
+ <p>Feature: Create additional modified buffer test. </p>
+ <h1><a name="changes">ChangeLogs</a> for XEmacs 21.4.21 "Educational Television"</h1>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ changes</p>
+ <ul>
+ <li>ChangeLog Entries from <a href="#ChangeLog">ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#lib-src:ChangeLog">lib-src/ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#lisp:ChangeLog">lisp/ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#lwlib:ChangeLog">lwlib/ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#man:ChangeLog">man/ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#netinstall:ChangeLog">netinstall/ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#nt:ChangeLog">nt/ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#src:ChangeLog">src/ChangeLog</a></li>
+ <li>ChangeLog Entries from <a href="#tests:ChangeLog">tests/ChangeLog</a></li>
+ </ul>
+ <h2>ChangeLog Entries from <a name="ChangeLog">ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released
+
+2007-08-18 Vin Shelton <acs(a)xemacs.org>
+
+ * modules/ldap/eldap.c: Declare that we use deprecated API.
+ Thanks to Mats Lidell <matsl(a)xemacs.org> for the report & patch:
+ <871wgnqunm.fsf(a)spencer.lidell.homelinux.net>.</pre>
+ <h2>ChangeLog Entries from <a name="lib-src:ChangeLog">lib-src/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released</pre>
+ <h2>ChangeLog Entries from <a name="lisp:ChangeLog">lisp/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released
+
+2007-09-19 Didier Verna <didier(a)xemacs.org>
+
+ Update my personal info.
+ * about.el (xemacs-hackers): Use 'didier instead of 'dv.
+ * about.el (about-other-current-hackers): Ditto.
+ * about.el (about-url-alist): Add my musical website.
+ * about.el (about-personal-info): Update my entry.
+ * about.el (about-hacker-contribution): Ditto.
+
+2007-08-21 Adrian Aichner <adrian(a)xemacs.org>
+
+ * package-get.el (package-get-download-sites): Update download
+ sites in Japan.
+ * package-get.el (package-get-pre-release-download-sites): Ditto.
+
+2007-08-18 Vin Shelton <acs(a)xemacs.org>
+
+ * package-get.el (package-get-pre-release-download-sites): Sync
+ mirror sites with 21.5. (Thanks, Adrian)
+
+2007-08-09 Mike Sperber <mike(a)xemacs.org>
+
+ * startup.el (migrate-user-init-file): Create backup of
+ `user-init-file' before migrating.
+ * startup.el (maybe-migrate-user-init-file): Print
+ information about backup file.
+ (maybe-create-compatibility-dot-emacs): Follow above change.
+
+2006-11-02 Adrian Aichner <adrian(a)xemacs.org>
+
+ * font-lock.el: Sync font-lock-add-keywords and
+ font-lock-remove-keywords from GNU Emacs.
+ * font-lock.el (font-lock-keywords-alist): New.
+ * font-lock.el (font-lock-removed-keywords-alist): New.
+ * font-lock.el (font-lock-add-keywords): New.
+ * font-lock.el (font-lock-update-removed-keyword-alist): New.
+ * font-lock.el (font-lock-remove-keywords): New.
+
+2007-08-16 Vin Shelton <acs(a)xemacs.org>
+
+ * font-lock.el: Add defvar for font-lock-warning-face. Original
+ patch from Hans de Graaff.
+
+2007-07-28 Adrian Aichner <adrian(a)xemacs.org>
+
+ * package-get.el (package-get-download-sites): Document Chile and
+ update Denmark download site.
+ * package-get.el (package-get-pre-release-download-sites): Ditto.
+
+2007-05-20 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * gutter-items.el (progress-feedback-with-label): Clarify docstring.</pre>
+ <h2>ChangeLog Entries from <a name="lwlib:ChangeLog">lwlib/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released
+
+2007-05-20 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ Gauge values are signed integers (ints).
+ (XawGaugeGetValue): Declare return value as int.
+ (XawGaugeSetValue): Declare value as int.
+
+ * xlwgauge.h: Get rid of references to Cardinal in comment.
+
+ * xlwgauge.c (GaugeGetValue): Declare value as int.
+ (GaugeMercury): Declare val0 and val1 as int. Remove redundant casts.
+ (XawGaugeGetValue): Declare return value as int.
+ (XawGaugeSetValue): Declare value as int.
+
+2007-05-17 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * lwlib-Xaw.c (wm_delete_window): Iterate over children of shell
+ (there may be more than one) to find our widget.</pre>
+ <h2>ChangeLog Entries from <a name="man:ChangeLog">man/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released</pre>
+ <h2>ChangeLog Entries from <a name="netinstall:ChangeLog">netinstall/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released</pre>
+ <h2>ChangeLog Entries from <a name="nt:ChangeLog">nt/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released
+
+2007-09-27 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs.iss: Don't set package-get-always-update.
+
+2007-09-25 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs.iss: Put comment wrapper around site-start.el changes and
+ remove those changes on uninstall. Enable ftp.xemacs.org for
+ package retrieval and set the ftp path.
+
+2007-09-19 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs.iss: Various updates: Add support for 21.5; add easypg.</pre>
+ <h2>ChangeLog Entries from <a name="src:ChangeLog">src/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released
+
+2007-08-14 Marcus Crestani <crestani(a)xemacs.org>
+
+ * s/sol2.h: Fix for GCC lossage not needed with SunOS 5.10.
+
+2007-02-17 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * glyphs-eimage.c (png_instantiate_unwind): Avoid recursion.
+ (png_instantiate): Initialize setjmp_buffer early, and avoid
+ recursive entry to error handler.
+
+2007-06-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * linuxplay.c (linux_play_data_or_file): More 64-bit tweaking, and
+ a typo fix.
+
+2007-05-12 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * event-Xt.c (x_reset_modifier_mapping):
+ * event-gtk.c (gtk_reset_modifier_mapping):
+ Zero out the device's modifier map once we've freed it, to prevent
+ a double free on a re-entrant call.
+
+2007-05-17 Vin Shelton <acs(a)xemacs.org>
+
+ * linuxplay.c (linux_play_data_or_file): Fix playing sound on
+ 64-bit linux. Patch from Hans de Graaff.
+
+2007-05-02 Vin Shelton <acs(a)xemacs.org>
+
+ * dumper.c (pdump): Don't close pdump_fd (already closed by
+ fclose() call. Patch from Steve Higham.
+ * callproc.c (Fold_call_process_internal): Don't close fd1 if it's
+ already closed. Patch inspired by Steve Higham.
+
+2007-05-01 Vin Shelton <acs(a)xemacs.org>
+
+ * nt.c (mswindows_stat): Tie _S_IEXEC permission to read access.
+ (mswindows_fstat): Ditto.
+ * sysfile.h: Under Windows, define X_OK to be the same as R_OK.
+
+2007-02-08 Adrian Aichner <adrian(a)xemacs.org>
+
+ * postgresql.c: Update Steve Baur's email address by his request.
+ * postgresql.h: Ditto.
+
+2007-01-04 Vin Shelton <acs(a)xemacs.org>
+
+ * fileio.c (check_writable): Check old-style readonly bit only for
+ non-directories.
+
+2006-12-25 Benson I. Margulies <benson(a)dchbk.us>
+
+ * src/fileio.c (check_writable):
+ Cope with the fact that the read-only attribute trumps Windows NTFS
+ ACLS.</pre>
+ <h2>ChangeLog Entries from <a name="tests:ChangeLog">tests/ChangeLog</a></h2>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+ <pre xml:space="preserve">
+2007-10-07 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs 21.4.21 is released
+
+2007-06-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/mule-tests.el (buffer-modified-p): Test after revert.</pre>
+ <p>goto <a href="#announcement">announcement</a>,
+ <a href="#summary">summary</a>,
+ <a href="#changes">changes</a></p>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: xml
+sgml-omittag:nil
+sgml-shorttag:nil
+sgml-namecase-general:nil
+sgml-general-insert-case:lower
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:("../template.html" "html" "body" "table" "tr" "td")
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Index: Releases/index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/index.content,v
retrieving revision 1.126
diff -a -u -u -r1.126 index.content
--- Releases/index.content 2007/06/12 15:17:23 1.126
+++ Releases/index.content 2007/11/10 19:46:26
＠＠ -73,6 +73,7 ＠＠
</p>
<ul>
+ <li><strong>2007-11-10</strong>: <a href="21.4.21.html">[21.4.21 release notice]</a> <!-- <a href="21.4.21.html#changes">[changelogs]</a> --></li>
<li><strong>2006-12-10</strong>: <a href="21.4.20.html">[21.4.20 release notice]</a> <!-- <a href="21.4.20.html#changes">[changelogs]</a> --></li>
<li><strong>2006-01-30</strong>: <a href="21.4.19.html">[21.4.19 release notice]</a> <!-- <a href="21.4.19.html#changes">[changelogs]</a> --></li>
<li><strong>2005-12-05</strong>: <a href="21.4.18.html">[21.4.18 release notice]</a> <!-- <a href="21.4.18.html#changes">[changelogs]</a> --></li>
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Re: Followup: fix corruption of ~/.emacs when trying to migrate an init file XEmacs can't fully load
17 years, 1 month
Aidan Kehoe
Aidan Kehoe
Ar an chéad lá de mí na Samhain, scríobh Jason Spiro:
> A month ago, I wrote:
> ...
> > This is a patch for a preference-corruption issue.
> ...
> > --- xemacs-21.5.27/lisp/cus-edit.el.orig Tue Jun 26 04:10:18 2007
> > +++ xemacs-21.5.27/lisp/cus-edit.el Tue Jun 26 04:14:52 2007
> > ＠＠ -3756,6 +3756,8 ＠＠
> > ;;;###autoload
> > (defun custom-save-all ()
> > "Save all customizations in `custom-file'."
> > + (when init-file-had-error
> > + (error "Cannot save customizations; init file was not fully loaded"))
> > (let ((inhibit-read-only t))
> > (custom-save-variables)
> > (custom-save-faces)
> >
>
> It seems this has not been applied yet.[1] Would someone please be so kind as
> to review it?
Reviewed and applied. Yes, there was discussion about other approaches, but
no-one’s proposed anything concrete, let alone implemented it, and this
change won’t make either any harder. Thank you!
APPROVE COMMIT
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2007-11-08 Aidan Kehoe <kehoea(a)parhasard.net>
* cus-edit.el (custom-save-all):
Merge Jason Spiro's fix of
c241693f0710021645g642f145n5925c7a35e7b2c58(a)mail.gmail.com , to
avoid corruption of the custom-set-variables and custom-set-fonts
calls in ~/.emacs if XEmacs doesn't understand any part of the
syntax of ~/.emacs .
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/cus-edit.el
===================================================================
RCS
Index: lisp/cus-edit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cus-edit.el,v
retrieving revision 1.25
diff -u -r1.25 cus-edit.el
--- lisp/cus-edit.el 2007/09/20 21:18:35 1.25
+++ lisp/cus-edit.el 2007/11/08 14:41:00
＠＠ -3756,6 +3756,9 ＠＠
;;;###autoload
(defun custom-save-all ()
"Save all customizations in `custom-file'."
+ (when init-file-had-error
+ (error 'invalid-change
+ "Cannot save customizations; init file was not fully loaded"))
(let ((inhibit-read-only t))
(custom-save-variables)
(custom-save-faces)
--
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
- 1 participants
- 0 comments
[R21.4R21.5] `defclass' and `defmethod' autoloads
17 years, 1 month
Michael Sperber
Michael Sperber
This is fallout from upgrading to the latest version of JDE, which
requires the latest versions of the eieio, semantic and speedbar
packages (and some more---it ain't pretty). I know this isn't a
particularly pretty way of supporting those packages---but it's prettier
than whatever else I could think of. I'll commit Friday-ish if nobody
objects.
2007-10-31 Mike Sperber <mike(a)xemacs.org>
* autoload.el (make-autoload): Add `defclass' and `defmethod' as
defmacro-like operators. This is need to enable compilation of
packages that depend on eieio.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
Index: lisp/autoload.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/autoload.el,v
retrieving revision 1.23
diff -u -r1.23 autoload.el
--- lisp/autoload.el 29 May 2006 21:25:49 -0000 1.23
+++ lisp/autoload.el 31 Oct 2007 09:50:41 -0000
＠＠ -249,7 +249,8 ＠＠
((memq car '(defun define-skeleton defmacro define-derived-mode
define-generic-mode easy-mmode-define-minor-mode
easy-mmode-define-global-mode
- define-minor-mode defun* defmacro*))
+ define-minor-mode defun* defmacro*
+ defclass defmethod)) ; from the EIEIO package
(let* ((macrop (memq car '(defmacro defmacro*)))
(name (nth 1 form))
(body (nthcdr (get car 'doc-string-elt) form))
＠＠ -799,6 +800,8 ＠＠
(put 'easy-mmode-define-minor-mode 'doc-string-elt 2)
(put 'define-minor-mode 'doc-string-elt 2)
(put 'define-generic-mode 'doc-string-elt 7)
+(put 'defclass 'doc-string-elt 4)
+(put 'defmethod 'doc-string-elt 3)
;; defin-global-mode has no explicit docstring.
(put 'easy-mmode-define-global-mode 'doc-string-elt 1000)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 2 participants
- 10 comments
[C] xemacsweb: Fix commenting of lisp fragment in About/XEmacsServices.content
17 years, 1 month
Adrian Aichner
Adrian Aichner
COMMIT
Solution is a bit more complicated than I'd like, but neither "--" nor
">" must appear literally inside SGML comments, according to
http://htmlhelp.com/reference/wilbur/misc/comment.html, which isn't
normative, but a good practical explanation for me.
Simplifications are welcome.
A real issue tracker would even be better :-)
Adrian
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: About/ChangeLog
Index: About/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.217
diff -u -U0 -r1.217 ChangeLog
--- About/ChangeLog 5 Nov 2007 11:23:53 -0000 1.217
+++ About/ChangeLog 6 Nov 2007 20:54:39 -0000
＠＠ -0,0 +1,4 ＠＠
+2007-11-06 Adrian Aichner <adrian(a)xemacs.org>
+
+ * XEmacsServices.content: Fix commenting of lisp fragment.
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: About/XEmacsServices.content
===================================================================
RCS About/ChangeLog
===================================================================
RCS
Index: About/XEmacsServices.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/XEmacsServices.content,v
retrieving revision 1.70
diff -u -w -r1.70 XEmacsServices.content
--- About/XEmacsServices.content 5 Nov 2007 11:23:54 -0000 1.70
+++ About/XEmacsServices.content 6 Nov 2007 20:56:54 -0000
＠＠ -50,19 +50,27 ＠＠
</tr>
<!--
-; Evaluate this expresssion below to insert a new, properly numbered
+; Evaluate the lisp expresssion below to insert a new, properly numbered
; issue in the correct place (at the top of the issue list). Take note
-; we have to quote SGML comment endings in this comment section,
-; e.g. as --\>
-(let
- ((next-issue-insert-point
+; we have to quote the SGML comment delimiter in this comment section.
+; See `sgml-comment-begin', `sgml-comment-end', and
+; http://htmlhelp.com/reference/wilbur/misc/comment.html
+(let*
+ ((sgml-comment-begin (format "%c%s%s%s" #x3c "!" "-" "-"))
+ (sgml-comment-end (format "%s%s%c" "-" "-" #x3e))
+ (next-issue-insert-point
(save-excursion
(goto-char (point-min))
(and
- ;; We have to quote SGML comment endings in this comment
- ;; section, e.g. as --\>
+ ;; We have to quote SGML comment delimiters in this comment
+ ;; section.
+ ;; See `sgml-comment-begin', `sgml-comment-end', and
+ ;; http://htmlhelp.com/reference/wilbur/misc/comment.html
(search-forward-regexp
- "[ \t]+<tr>\n[ \t]+<!-- .+ --\>\n[ \t]+<td rowspan=\"7\" valign=\"top\"><a id=\"issue" nil t)
+ (format
+ "[ \t]+<tr>\n[ \t]+%s .+ %s\n[ \t]+<td rowspan=\"7\" valign=\"top\"><a id=\"issue"
+ sgml-comment-begin sgml-comment-end)
+ nil t)
(match-beginning 0))))
(next-issue-number
(1+
＠＠ -75,11 +83,12 ＠＠
(message "failed to find insertion point for next xemacs service issue!")
(goto-char next-issue-insert-point)
(insert
- ;; We have to quote SGML comment endings in this comment section,
- ;; e.g. as --\>
+ ;; We have to quote SGML comment endings in this comment section.
+ ;; See `sgml-comment-begin', `sgml-comment-end', and
+ ;; http://htmlhelp.com/reference/wilbur/misc/comment.html
(format
- " <tr>\n <!-- Issue ID --\>\n <td rowspan=\"7\" valign=\"top\"><a id=\"issue%1$d\" name=\"issue%1$d\">%1$d</a></td>\n <!-- Service(s) --\>\n <td>all services of gwyn.tux.org are unavailable: DNS for xemacs.org, ssh, http, ftp</td>\n <!-- YYYY-MM-DD( HH:MM:SS UTC) Date found --\>\n <td nowrap=\"nowrap\">YYYY-MM-DD( HH:MM:SS UTC)</td>\n <!-- YYYY-MM-DD( HH:MM:SS UTC) Date fixed --\>\n <td nowrap=\"nowrap\">YYYY-MM-DD( HH:MM:SS UTC)</td>\n </tr>\n <tr>\n\t<!-- Error(s), Symptom(s) --\>\n <th colspan=\"3\">Error(s), Symptom(s)</th>\n </tr>\n <tr>\n <td colspan=\"3\">\n\t <p>free-form description of a error or symptom.</p>\n <pre xml:space=\"preserve\">\nSending failed; SMTP protocol error\n221 Closing connection. Good bye.\n\t </pre>\n\t</td>\n </tr>\n <tr>\n\t<!-- Resolution(s) --\>\n <th colspan=\"3\">Resolution(s)</th>\n </tr>\n <tr>\n !
<td colspan=\"3\">\n\t <p>Description of resolution.</p>\n\t</td>\n </tr>\n <tr>\n\t<!-- Reference(s) --\>\n <th colspan=\"3\">References</th>\n </tr>\n <tr>\n <td colspan=\"3\">\n\t <p>References to other information, like URLs for external issue documenation.</p>\n\t</td>\n </tr>\n\n"
- next-issue-number))))
+ " <tr>\n %2$s Issue ID %3$s\n <td rowspan=\"7\" valign=\"top\"><a id=\"issue%1$d\" name=\"issue%1$d\">%1$d</a></td>\n %2$s Service(s) %3$s\n <td>all services of gwyn.tux.org are unavailable: DNS for xemacs.org, ssh, http, ftp</td>\n %2$s YYYY-MM-DD( HH:MM:SS UTC) Date found %3$s\n <td nowrap=\"nowrap\">YYYY-MM-DD( HH:MM:SS UTC)</td>\n %2$s YYYY-MM-DD( HH:MM:SS UTC) Date fixed %3$s\n <td nowrap=\"nowrap\">YYYY-MM-DD( HH:MM:SS UTC)</td>\n </tr>\n <tr>\n\t%2$s Error(s), Symptom(s) %3$s\n <th colspan=\"3\">Error(s), Symptom(s)</th>\n </tr>\n <tr>\n <td colspan=\"3\">\n\t <p>free-form description of a error or symptom.</p>\n <pre xml:space=\"preserve\">\nSending failed; SMTP protocol error\n221 Closing connection. Good bye.\n\t </pre>\n\t</td>\n </tr>\n <tr>\n\t%2$s Resolution(s) %3$s\n <th colspan=\"3\">Resolution(s)</th>\n </tr>\n <tr>\n !
<td colspan=\"3\">\n\t <p>Description of resolution.</p>\n\t</td>\n </tr>\n <tr>\n\t%2$s Reference(s) %3$s\n <th colspan=\"3\">References</th>\n </tr>\n <tr>\n <td colspan=\"3\">\n\t <p>References to other information, like URLs for external issue documenation.</p>\n\t</td>\n </tr>\n\n"
+ next-issue-number sgml-comment-begin sgml-comment-end))))
-->
<tr>
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[C] xemacsweb: Document and resolve issue 35
17 years, 1 month
Adrian Aichner
Adrian Aichner
COMMIT
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: About/ChangeLog
Index: About/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.216
diff -u -U0 -r1.216 ChangeLog
--- About/ChangeLog 12 Oct 2007 22:02:08 -0000 1.216
+++ About/ChangeLog 5 Nov 2007 11:22:59 -0000
＠＠ -0,0 +1,4 ＠＠
+2007-11-05 Adrian Aichner <adrian(a)xemacs.org>
+
+ * XEmacsServices.content: Document and resolve issue 35.
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: About/XEmacsServices.content
===================================================================
RCS
Index: About/XEmacsServices.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/XEmacsServices.content,v
retrieving revision 1.69
diff -u -w -r1.69 XEmacsServices.content
--- About/XEmacsServices.content 12 Oct 2007 22:02:08 -0000 1.69
+++ About/XEmacsServices.content 5 Nov 2007 11:21:59 -0000
＠＠ -50,16 +50,19 ＠＠
</tr>
<!--
-Evaluate this expresssion below to insert a new, properly numbered
-issue in the correct place (at the top of the issue list). Take note
-we have to quote SGML comment endings in this comment section, e.g. as
+; Evaluate this expresssion below to insert a new, properly numbered
+; issue in the correct place (at the top of the issue list). Take note
+; we have to quote SGML comment endings in this comment section,
+; e.g. as --\>
(let
((next-issue-insert-point
(save-excursion
(goto-char (point-min))
(and
+ ;; We have to quote SGML comment endings in this comment
+ ;; section, e.g. as --\>
(search-forward-regexp
- "[ \t]+<tr>\n[ \t]+<!-- .+ --\>\n[ \t]+<td rowspan=\"4\" valign=\"top\"><a id=\"issue" nil t)
+ "[ \t]+<tr>\n[ \t]+<!-- .+ --\>\n[ \t]+<td rowspan=\"7\" valign=\"top\"><a id=\"issue" nil t)
(match-beginning 0))))
(next-issue-number
(1+
＠＠ -72,10 +75,59 ＠＠
(message "failed to find insertion point for next xemacs service issue!")
(goto-char next-issue-insert-point)
(insert
+ ;; We have to quote SGML comment endings in this comment section,
+ ;; e.g. as --\>
(format
- " <tr>\n <!-- Issue ID --\>\n <td rowspan=\"4\" valign=\"top\"><a id=\"issue%d\" name=\"issue%d\">%d</a></td>\n <!-- Service(s) --\>\n <td>Service(s)</td>\n <!-- YYYY-MM-DD( HH:MM:SS UTC) Date found --\>\n <td>YYYY-MM-DD( HH:MM:SS UTC) Date found</td>\n <!-- YYYY-MM-DD( HH:MM:SS UTC) Date fixed --\>\n <td>YYYY-MM-DD( HH:MM:SS UTC) Date fixed</td>\n </tr>\n <tr>\n <!-- Error(s), Symptom(s) --\>\n <td colspan=\"3\">Error(s), Symptom(s)</td>\n </tr>\n <tr>\n <!-- Resolution(s) --\>\n <td colspan=\"3\">Resolution(s)</td>\n </tr>\n <tr>\n <!-- Reference(s) --\>\n <td colspan=\"3\">Reference(s)</td>\n </tr>\n\n"
- next-issue-number next-issue-number next-issue-number))))
+ " <tr>\n <!-- Issue ID --\>\n <td rowspan=\"7\" valign=\"top\"><a id=\"issue%1$d\" name=\"issue%1$d\">%1$d</a></td>\n <!-- Service(s) --\>\n <td>all services of gwyn.tux.org are unavailable: DNS for xemacs.org, ssh, http, ftp</td>\n <!-- YYYY-MM-DD( HH:MM:SS UTC) Date found --\>\n <td nowrap=\"nowrap\">YYYY-MM-DD( HH:MM:SS UTC)</td>\n <!-- YYYY-MM-DD( HH:MM:SS UTC) Date fixed --\>\n <td nowrap=\"nowrap\">YYYY-MM-DD( HH:MM:SS UTC)</td>\n </tr>\n <tr>\n\t<!-- Error(s), Symptom(s) --\>\n <th colspan=\"3\">Error(s), Symptom(s)</th>\n </tr>\n <tr>\n <td colspan=\"3\">\n\t <p>free-form description of a error or symptom.</p>\n <pre xml:space=\"preserve\">\nSending failed; SMTP protocol error\n221 Closing connection. Good bye.\n\t </pre>\n\t</td>\n </tr>\n <tr>\n\t<!-- Resolution(s) --\>\n <th colspan=\"3\">Resolution(s)</th>\n </tr>\n <tr>\n !
<td colspan=\"3\">\n\t <p>Description of resolution.</p>\n\t</td>\n </tr>\n <tr>\n\t<!-- Reference(s) --\>\n <th colspan=\"3\">References</th>\n </tr>\n <tr>\n <td colspan=\"3\">\n\t <p>References to other information, like URLs for external issue documenation.</p>\n\t</td>\n </tr>\n\n"
+ next-issue-number))))
-->
+
+ <tr>
+ <!-- Issue ID -->
+ <td rowspan="7" valign="top"><a id="issue35" name="issue35">35</a></td>
+ <!-- Service(s) -->
+ <td>
+ <ul>
+ <li><a href="http://www.dk.xemacs.org/">http://www.dk.xemacs.org/</a></li>
+ <li>CVS access to cvs.xemacs.org</li>
+ <li>ssh access to sunsite.dk</li>
+ </ul>
+ </td>
+ <!-- YYYY-MM-DD( HH:MM:SS UTC) Date found -->
+ <td nowrap="nowrap">2007-11-03</td>
+ <!-- YYYY-MM-DD( HH:MM:SS UTC) Date fixed -->
+ <td nowrap="nowrap">2007-11-05</td>
+ </tr>
+ <tr>
+ <!-- Error(s), Symptom(s) -->
+ <th colspan="3">Error(s), Symptom(s)</th>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <p>Services time out.</p>
+ </td>
+ </tr>
+ <tr>
+ <!-- Resolution(s) -->
+ <th colspan="3">Resolution(s)</th>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <p>The issue was caused by disk capacity overflow. The
+ problem has been resolved, httpd and sshd have been
+ restarted.</p>
+ </td>
+ </tr>
+ <tr>
+ <!-- Reference(s) -->
+ <th colspan="3">References</th>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <p>See <a href="http://dotsrc.org/">http://dotsrc.org/</a>
+ for latest news on the issue.</p>
+ </td>
+ </tr>
<tr>
<!-- Issue ID -->
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 3 participants
- 5 comments
[AC] Fix recent image related crashes
17 years, 1 month
Didier Verna
Didier Verna
NOTE: This patch has been committed. The version below is
informational only (whitespace differences have been removed).
Dear reviewers,
this should fix recently observed crashes related to image
specifiers. This was due to an unfinished part of my previous patch that
I had forgotten about. My apologies.
src/ChangeLog addition:
2007-11-05 Didier Verna <didier(a)xemacs.org>
* glyphs.c (potential_pixmap_file_instanciator): Fix comment
describing its behavior.
* glyphs.c (xbm_mask_file_munging): Update semantics of file and
mask_file arguments to reflect recent changes in
potential_pixmap_file_instanciator (see patch below).
* glyphs-x.c (autodetect_normalize): Update call to
xbm_mask_file_munging to reflect the above change.
* glyphs-gtk.c (autodetect_normalize): Ditto.
XEmacs source patch:
Diff command: cvs -q diff -u -t -b -B -w
Files affected: src/glyphs-gtk.c src/glyphs-x.c src/glyphs.c
Index: src/glyphs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.57
diff -u -u -t -b -B -w -r1.57 glyphs.c
--- src/glyphs.c 15 Oct 2007 09:55:50 -0000 1.57
+++ src/glyphs.c 5 Nov 2007 14:51:41 -0000
＠＠ -2530,9 +2530,10 ＠＠
/* pixmap file functions */
/************************************************************************/
-/* If INSTANTIATOR refers to inline data, return Qnil.
+/* If INSTANTIATOR refers to inline data, return Qt.
If INSTANTIATOR refers to data in a file, return the full filename
- if it exists; otherwise, return a cons of (filename).
+ if it exists, Qnil if there's no console method for locating the file, or
+ (filename) if there was an error locating the file.
FILE_KEYWORD and DATA_KEYWORD are symbols specifying the
keywords used to look up the file and inline data,
＠＠ -2751,10 +2752,10 ＠＠
/* This is unclean but it's fairly standard -- a number of the
bitmaps in /usr/include/X11/bitmaps use it -- so we support
it. */
- if (NILP (mask_file)
+ if (EQ (mask_file, Qt)
/* don't override explicitly specified mask data. */
&& NILP (assq_no_quit (Q_mask_data, alist))
- && !NILP (file))
+ && !EQ (file, Qt))
{
mask_file = MAYBE_LISP_CONTYPE_METH
(decode_console_type(console_type, ERROR_ME),
＠＠ -2834,7 +2835,6 ＠＠
alist);
}
- /* #### FIXME: Hmmm... what about mask being Qt ?? -- dvl */
alist = xbm_mask_file_munging (alist, file, mask_file, console_type);
{
＠＠ -2904,11 +2904,11 ＠＠
if (EQ (file, Qt) && EQ (mask_file, Qt)) /* no conversion necessary */
RETURN_UNGCPRO (inst);
-
- /* #### FIXME: and what about file / mask being Qt ? -- dvl */
alist = tagged_vector_to_alist (inst);
{
+ /* #### FIXME: what if EQ (file, Qt) && !EQ (mask, Qt) ? Is that possible?
+ If so, we have a problem... -- dvl */
Lisp_Object data = make_string_from_file (file);
alist = remassq_no_quit (Q_file, alist);
/* there can't be a :data at this point. */
Index: src/glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.85
diff -u -u -t -b -B -w -r1.85 glyphs-x.c
--- src/glyphs-x.c 15 Oct 2007 09:55:50 -0000 1.85
+++ src/glyphs-x.c 5 Nov 2007 14:51:41 -0000
＠＠ -1718,7 +1718,7 ＠＠
alist = Fcons (Fcons (Q_hotspot_y, make_int (yhot)),
alist);
- alist = xbm_mask_file_munging (alist, filename, Qnil, console_type);
+ alist = xbm_mask_file_munging (alist, filename, Qt, console_type);
{
Lisp_Object result = alist_to_tagged_vector (Qxbm, alist);
Index: src/glyphs-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.c,v
retrieving revision 1.32
diff -u -u -t -b -B -w -r1.32 glyphs-gtk.c
--- src/glyphs-gtk.c 22 Nov 2005 11:24:44 -0000 1.32
+++ src/glyphs-gtk.c 5 Nov 2007 14:51:41 -0000
＠＠ -1614,7 +1614,7 ＠＠
alist = Fcons (Fcons (Q_hotspot_y, make_int (yhot)),
alist);
- alist = xbm_mask_file_munging (alist, filename, Qnil, console_type);
+ alist = xbm_mask_file_munging (alist, filename, Qt, console_type);
{
Lisp_Object result = alist_to_tagged_vector (Qxbm, alist);
--
Resistance is futile. You will be jazzimilated.
Didier Verna, didier(a)lrde.epita.fr, http://www.lrde.epita.fr/~didier
EPITA / LRDE, 14-16 rue Voltaire Tel.+33 (1) 44 08 01 85
94276 Le Kremlin-Bicêtre, France Fax.+33 (1) 53 14 59 22 didier(a)xemacs.org
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
Re: [PATCH pkgs/ediff] Adapt ediff dependencies to new vc
17 years, 1 month
Ville Skyttä
Ville Skyttä
On Friday 02 November 2007, Michael Kifer wrote:
> > Since you wanted me to peel the onion :-)
> >
> > After I fixed the typo, here's what I found:
> >
> > 1. >>Error occurred processing ediff-diff.el: Cannot open load file:
> > vc-hooks So I added vc to the REQUIRES line.
>
> That one is ok. But the ones below are strange. There is no reference to
> tramp or format-spec anywhere in ediff.
Yes, as I mailed to you before, that's because our packages system's
dependency implementation sucks: dependencies are not recursive. tramp and
gnus really do need to be added to ediff/Makefile's REQUIRES; need for them
cascades from the addition of vc.
Except for the one defalias Vin found today (which by the way did not fail the
packages build for me), the patches I posted earlier this week fix all of
these issues as far as I can tell, I have already offered to apply them...
> --michael
>
> > 2. >>Error occurred processing ediff-diff.el: Cannot open load file:
> > tramp I added tramp
> >
> > 3. >>Error occurred processing ediff-diff.el: Cannot open load file:
> > format-spec I added gnus
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
Re: [PATCH pkgs/ediff] Adapt ediff dependencies to new vc
17 years, 1 month
Michael Kifer
Michael Kifer
> Since you wanted me to peel the onion :-)
>
> After I fixed the typo, here's what I found:
>
> 1. >>Error occurred processing ediff-diff.el: Cannot open load file: vc-hooks
> So I added vc to the REQUIRES line.
That one is ok. But the ones below are strange. There is no reference to
tramp or format-spec anywhere in ediff.
--michael
> 2. >>Error occurred processing ediff-diff.el: Cannot open load file: tramp
> I added tramp
>
> 3. >>Error occurred processing ediff-diff.el: Cannot open load file: format-spec
> I added gnus
>
>
> Regards,
> Vin
>
>
>
> On Nov 2, 2007 11:30 AM, Michael Kifer <kifer(a)cs.sunysb.edu> wrote:
> >
> > Thanks. Sorry for the typo.
> > I committed the change.
> > Why did you add gnus and tramp to REQUIRES?
> >
> >
> > --michael
> >
> >
> > > With the latest round of changes to ediff, I can no longer build the packages:
> > >
> > > >>Error occurred processing ediff-diff.el: Symbol's value as variable
> > > is void: vc-workfile-version
> > >
> > > Done
> > > make[2]: *** [ediff-diff.elc] Error 1
> > >
> > > Indeed, vc-workfile is a function. The patch below allows things to compile.
> > >
> > > diff -u {scmroot/xemacs-packages,$BLDROOT/xemacs-packages-$(today)}/xemacs-packages/ediff/$f
> > > done
> > > --- scmroot/xemacs-packages/xemacs-packages/ediff/ediff-vers.el
> > > 2007-11-02 10:12:31.000000000 -0400
> > > +++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/ediff-vers.el
> > > 2007-11-02 10:57:47.000000000 -0400
> > > ＠＠ -60,7 +60,7 ＠＠
> > > (defalias 'ediff-vc-working-revision
> > > (if (fboundp 'vc-working-revision)
> > > 'vc-working-revision
> > > - vc-workfile-version))
> > > + 'vc-workfile-version))
> > >
> > > ;; VC.el support
> > >
> > > --- scmroot/xemacs-packages/xemacs-packages/ediff/Makefile
> > > 2007-08-30 20:06:05.000000000 -0400
> > > +++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/Makefile
> > > 2007-11-02 10:59:07.000000000 -0400
> > > ＠＠ -22,7 +22,7 ＠＠
> > > MAINTAINER = Michael Kifer <kifer(a)cs.sunysb.edu>
> > > PACKAGE = ediff
> > > PKG_TYPE = regular
> > > -REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes
> > > +REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes gnus tramp vc
> > > CATEGORY = standard
> > >
> > > ELCS = ediff-diff.elc ediff-help.elc ediff-hook.elc ediff-init.elc \
> > >
> > >
> > > Regards,
> > > Vin
> > >
> >
> >
> >
> >
>
>
>
> --
> The Journey by Mary Oliver
> http://www.poemhunter.com/p/m/poem.asp?poet=6771&poem=30506
>
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
Re: [PATCH pkgs/ediff] Adapt ediff dependencies to new vc
17 years, 1 month
Vin Shelton
Vin Shelton
Since you wanted me to peel the onion :-)
After I fixed the typo, here's what I found:
1. >>Error occurred processing ediff-diff.el: Cannot open load file: vc-hooks
So I added vc to the REQUIRES line.
2. >>Error occurred processing ediff-diff.el: Cannot open load file: tramp
I added tramp
3. >>Error occurred processing ediff-diff.el: Cannot open load file: format-spec
I added gnus
Regards,
Vin
On Nov 2, 2007 11:30 AM, Michael Kifer <kifer(a)cs.sunysb.edu> wrote:
>
> Thanks. Sorry for the typo.
> I committed the change.
> Why did you add gnus and tramp to REQUIRES?
>
>
> --michael
>
>
> > With the latest round of changes to ediff, I can no longer build the packages:
> >
> > >>Error occurred processing ediff-diff.el: Symbol's value as variable
> > is void: vc-workfile-version
> >
> > Done
> > make[2]: *** [ediff-diff.elc] Error 1
> >
> > Indeed, vc-workfile is a function. The patch below allows things to compile.
> >
> > diff -u {scmroot/xemacs-packages,$BLDROOT/xemacs-packages-$(today)}/xemacs-packages/ediff/$f
> > done
> > --- scmroot/xemacs-packages/xemacs-packages/ediff/ediff-vers.el
> > 2007-11-02 10:12:31.000000000 -0400
> > +++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/ediff-vers.el
> > 2007-11-02 10:57:47.000000000 -0400
> > ＠＠ -60,7 +60,7 ＠＠
> > (defalias 'ediff-vc-working-revision
> > (if (fboundp 'vc-working-revision)
> > 'vc-working-revision
> > - vc-workfile-version))
> > + 'vc-workfile-version))
> >
> > ;; VC.el support
> >
> > --- scmroot/xemacs-packages/xemacs-packages/ediff/Makefile
> > 2007-08-30 20:06:05.000000000 -0400
> > +++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/Makefile
> > 2007-11-02 10:59:07.000000000 -0400
> > ＠＠ -22,7 +22,7 ＠＠
> > MAINTAINER = Michael Kifer <kifer(a)cs.sunysb.edu>
> > PACKAGE = ediff
> > PKG_TYPE = regular
> > -REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes
> > +REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes gnus tramp vc
> > CATEGORY = standard
> >
> > ELCS = ediff-diff.elc ediff-help.elc ediff-hook.elc ediff-init.elc \
> >
> >
> > Regards,
> > Vin
> >
>
>
>
>
--
The Journey by Mary Oliver
http://www.poemhunter.com/p/m/poem.asp?poet=6771&poem=30506
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
Re: [PATCH pkgs/ediff] Adapt ediff dependencies to new vc
17 years, 1 month
Michael Kifer
Michael Kifer
Thanks. Sorry for the typo.
I committed the change.
Why did you add gnus and tramp to REQUIRES?
--michael
> With the latest round of changes to ediff, I can no longer build the packages:
>
> >>Error occurred processing ediff-diff.el: Symbol's value as variable
> is void: vc-workfile-version
>
> Done
> make[2]: *** [ediff-diff.elc] Error 1
>
> Indeed, vc-workfile is a function. The patch below allows things to compile.
>
> diff -u {scmroot/xemacs-packages,$BLDROOT/xemacs-packages-$(today)}/xemacs-packages/ediff/$f
> done
> --- scmroot/xemacs-packages/xemacs-packages/ediff/ediff-vers.el
> 2007-11-02 10:12:31.000000000 -0400
> +++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/ediff-vers.el
> 2007-11-02 10:57:47.000000000 -0400
> ＠＠ -60,7 +60,7 ＠＠
> (defalias 'ediff-vc-working-revision
> (if (fboundp 'vc-working-revision)
> 'vc-working-revision
> - vc-workfile-version))
> + 'vc-workfile-version))
>
> ;; VC.el support
>
> --- scmroot/xemacs-packages/xemacs-packages/ediff/Makefile
> 2007-08-30 20:06:05.000000000 -0400
> +++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/Makefile
> 2007-11-02 10:59:07.000000000 -0400
> ＠＠ -22,7 +22,7 ＠＠
> MAINTAINER = Michael Kifer <kifer(a)cs.sunysb.edu>
> PACKAGE = ediff
> PKG_TYPE = regular
> -REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes
> +REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes gnus tramp vc
> CATEGORY = standard
>
> ELCS = ediff-diff.elc ediff-help.elc ediff-hook.elc ediff-init.elc \
>
>
> Regards,
> Vin
>
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments