commit/xemacs-packages: 3 new changesets
10 years, 10 months
Bitbucket
3 new commits in xemacs-packages:
https://bitbucket.org/xemacs/xemacs-packages/commits/0201f6b68615/
Changeset: 0201f6b68615
User: Norbert Koch
Date: 2014-05-13 08:19:43
Summary: update tramp
Affected #: 1 file
diff -r b6640ac229a4be7fd67431bb7fafb967e2302379 -r 0201f6b68615f3b804f4e17c21bf1d24de12de3e .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -50,7 +50,7 @@
689c9d91c5decdc54983a82589c9c4d01fc39f43 xemacs-packages/forms
2b68d4f6d6bf0b8dad34e7d94868c8fc2dbb0d18 xemacs-packages/fortran-modes
f8371cdd355b3b6288640fb84db3b039237de23a xemacs-packages/frame-icon
-71fc676f87a217495d727f60b2ce8853cbbd5e31 xemacs-packages/fsf-compat
+8fe8c2df42a169a88d984b46fcf699e588975d56 xemacs-packages/fsf-compat
d53a8387757746cc6c55bd754be1a2848e04aa29 xemacs-packages/games
61ebe6c6b1bf84bf0fe5685ef66fed734bd00679 xemacs-packages/general-docs
f649d3209420d89482731b7f3d290314f20b1923 xemacs-packages/gnats
@@ -114,7 +114,7 @@
497e37ee09551c8615a6b7f06cb91025815d10c3 xemacs-packages/tm
c654835e16b425c0c23c0ee742549346333b0942 xemacs-packages/tooltalk
e534e0dbe77a33527a3c5cb25f629a0cf10c5ccd xemacs-packages/tpu
-0892454ab2fe330753b0ca75f59150149b6bee99 xemacs-packages/tramp
+cd01316d8d7f917cc9b433656c56eafef4729ce5 xemacs-packages/tramp
d144e4a87a6d666a221b9c6bc6fd8b4cb9dc5bc5 xemacs-packages/vc
b2da4055175dbe90cda50d34d666fd4931dfa200 xemacs-packages/vc-cc
c4dafa4f318d98b34f6e54e9424dc3f53767ece5 xemacs-packages/vhdl
https://bitbucket.org/xemacs/xemacs-packages/commits/d3f5990e0a63/
Changeset: d3f5990e0a63
User: Norbert Koch
Date: 2014-05-13 08:20:44
Summary: XEmacs Package Release
Affected #: 1 file
diff -r 0201f6b68615f3b804f4e17c21bf1d24de12de3e -r d3f5990e0a63daba3afbc827725a56eed983b1bd ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-13 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: tramp.
+
2014-05-12 Norbert Koch <viteno(a)xemacs.org>
* Packages released: fsf-compat.
https://bitbucket.org/xemacs/xemacs-packages/commits/4cdd31fd6037/
Changeset: 4cdd31fd6037
User: Norbert Koch
Date: 2014-05-13 08:28:20
Summary: release tramp
Affected #: 1 file
diff -r d3f5990e0a63daba3afbc827725a56eed983b1bd -r 4cdd31fd60372454166bc395594787e44e3cc680 .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -114,7 +114,7 @@
497e37ee09551c8615a6b7f06cb91025815d10c3 xemacs-packages/tm
c654835e16b425c0c23c0ee742549346333b0942 xemacs-packages/tooltalk
e534e0dbe77a33527a3c5cb25f629a0cf10c5ccd xemacs-packages/tpu
-cd01316d8d7f917cc9b433656c56eafef4729ce5 xemacs-packages/tramp
+95c19ef5bb4319c710b7198eab9bc158cac0d421 xemacs-packages/tramp
d144e4a87a6d666a221b9c6bc6fd8b4cb9dc5bc5 xemacs-packages/vc
b2da4055175dbe90cda50d34d666fd4931dfa200 xemacs-packages/vc-cc
c4dafa4f318d98b34f6e54e9424dc3f53767ece5 xemacs-packages/vhdl
Repository URL: https://bitbucket.org/xemacs/xemacs-packages/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/tramp: 2 new changesets
10 years, 10 months
Bitbucket
2 new commits in tramp:
https://bitbucket.org/xemacs/tramp/commits/cb91940d3538/
Changeset: cb91940d3538
User: Norbert Koch
Date: 2014-05-13 08:20:44
Summary: XEmacs Package Release 1.47
Affected #: 2 files
diff -r cd01316d8d7f917cc9b433656c56eafef4729ce5 -r cb91940d3538fc9e0beb8cf09978973e965c73be ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-13 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.47 released.
+
2014-04-07 Michael Albinus <michael.albinus(a)gmx.de>
* Makefile (AUTHOR_VERSION): Bump to 2.2.9.
diff -r cd01316d8d7f917cc9b433656c56eafef4729ce5 -r cb91940d3538fc9e0beb8cf09978973e965c73be Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.46
+VERSION = 1.47
AUTHOR_VERSION = 2.2.9
MAINTAINER = Michael Albinus <michael.albinus(a)gmx.de>
PACKAGE = tramp
https://bitbucket.org/xemacs/tramp/commits/95c19ef5bb43/
Changeset: 95c19ef5bb43
User: Norbert Koch
Date: 2014-05-13 08:20:44
Summary: Added tag tramp-1_47 for changeset cb91940d3538
Affected #: 1 file
diff -r cb91940d3538fc9e0beb8cf09978973e965c73be -r 95c19ef5bb4319c710b7198eab9bc158cac0d421 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -78,3 +78,4 @@
78503cdb7c6a73ed0321d7afb813aa584c910ffb tramp-1_44
b37d4dee16df55e98b2bf7df765a66921c13e1cb tramp-1_45
156b380231bf249715b8db883776a5e6735eb3d5 tramp-1_46
+cb91940d3538fc9e0beb8cf09978973e965c73be tramp-1_47
Repository URL: https://bitbucket.org/xemacs/tramp/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/xemacs-packages: 4 new changesets
10 years, 10 months
Bitbucket
4 new commits in xemacs-packages:
https://bitbucket.org/xemacs/xemacs-packages/commits/adab68b425d6/
Changeset: adab68b425d6
User: Norbert Koch
Date: 2014-04-07 08:47:07
Summary: update fsf-compat
Affected #: 1 file
diff -r beeb6d6c0d319659f114447d737110aceebe3908 -r adab68b425d6f06d13da9d995ae2ce414c0d5fda .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -73,7 +73,7 @@
ccb3d74d9f75a12b77197f480da12f31e495a98d xemacs-packages/mine
d87e94b356f7bb56cab2489ed45f5b8e1d879e23 xemacs-packages/misc-games
306282595cd6c40b1ac35d774319165413dbf8b4 xemacs-packages/mmm-mode
-89c61585a9a799cc0cbeb69ab1e841732ffdc3eb xemacs-packages/net-utils
+ef126f7174bc2881f45780f33721e1f3b4135319 xemacs-packages/net-utils
fd7ad264907107574dbbe5492304ec4a9786d658 xemacs-packages/ocaml
a0a3bac469f2d74a0af53140dace0cc455060c43 xemacs-packages/oo-browser
26abf69511758b2c3c84cee706ca36080aec3de8 xemacs-packages/os-utils
https://bitbucket.org/xemacs/xemacs-packages/commits/d1c6465eec9a/
Changeset: d1c6465eec9a
User: Norbert Koch
Date: 2014-04-07 08:55:20
Summary: XEmacs Package Release
Affected #: 1 file
diff -r adab68b425d6f06d13da9d995ae2ce414c0d5fda -r d1c6465eec9a5b2746bfe328462eb9e65c9497e8 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-07 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: fsf-compat, net-utils.
+
2014-01-07 Norbert Koch <viteno(a)xemacs.org>
* Packages released: edit-utils.
https://bitbucket.org/xemacs/xemacs-packages/commits/97d981acad36/
Changeset: 97d981acad36
User: Norbert Koch
Date: 2014-05-12 09:04:04
Summary: Merge (forgotten push)
Affected #: 1 file
diff -r d1c6465eec9a5b2746bfe328462eb9e65c9497e8 -r 97d981acad36c32b534b625e201edbfb6a4672a8 .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -50,7 +50,7 @@
689c9d91c5decdc54983a82589c9c4d01fc39f43 xemacs-packages/forms
2b68d4f6d6bf0b8dad34e7d94868c8fc2dbb0d18 xemacs-packages/fortran-modes
f8371cdd355b3b6288640fb84db3b039237de23a xemacs-packages/frame-icon
-65d33b7ebc516f9bba2e936a6bdc005a2d806e7e xemacs-packages/fsf-compat
+71fc676f87a217495d727f60b2ce8853cbbd5e31 xemacs-packages/fsf-compat
d53a8387757746cc6c55bd754be1a2848e04aa29 xemacs-packages/games
61ebe6c6b1bf84bf0fe5685ef66fed734bd00679 xemacs-packages/general-docs
f649d3209420d89482731b7f3d290314f20b1923 xemacs-packages/gnats
@@ -73,7 +73,7 @@
ccb3d74d9f75a12b77197f480da12f31e495a98d xemacs-packages/mine
d87e94b356f7bb56cab2489ed45f5b8e1d879e23 xemacs-packages/misc-games
306282595cd6c40b1ac35d774319165413dbf8b4 xemacs-packages/mmm-mode
-ef126f7174bc2881f45780f33721e1f3b4135319 xemacs-packages/net-utils
+4ed5c0a1817d68d946e9bfad4d6d2ac9ffa281e3 xemacs-packages/net-utils
fd7ad264907107574dbbe5492304ec4a9786d658 xemacs-packages/ocaml
a0a3bac469f2d74a0af53140dace0cc455060c43 xemacs-packages/oo-browser
26abf69511758b2c3c84cee706ca36080aec3de8 xemacs-packages/os-utils
https://bitbucket.org/xemacs/xemacs-packages/commits/b6640ac229a4/
Changeset: b6640ac229a4
User: Norbert Koch
Date: 2014-05-12 09:04:49
Summary: XEmacs Package Release
Affected #: 1 file
diff -r 97d981acad36c32b534b625e201edbfb6a4672a8 -r b6640ac229a4be7fd67431bb7fafb967e2302379 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-12 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: fsf-compat.
+
2014-04-07 Norbert Koch <viteno(a)xemacs.org>
* Packages released: fsf-compat, net-utils.
Repository URL: https://bitbucket.org/xemacs/xemacs-packages/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/net-utils: 2 new changesets
10 years, 10 months
Bitbucket
2 new commits in net-utils:
https://bitbucket.org/xemacs/net-utils/commits/33fd8510a358/
Changeset: 33fd8510a358
User: Norbert Koch
Date: 2014-04-07 08:55:19
Summary: XEmacs Package Release 1.58
Affected #: 2 files
diff -r fe88762e04d0625def659b3b0954b8c695090c78 -r 33fd8510a358c80889295171808af505609ef778 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-07 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.58 released.
+
2014-03-25 Steve Youngs <steve(a)sxemacs.org>
* google-query.el (google-query): Complete refactoring. Instead
diff -r fe88762e04d0625def659b3b0954b8c695090c78 -r 33fd8510a358c80889295171808af505609ef778 Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.57
+VERSION = 1.58
AUTHOR_VERSION = N/A
MAINTAINER = Steve Youngs <steve(a)youngs.au.com>
PACKAGE = net-utils
https://bitbucket.org/xemacs/net-utils/commits/4ed5c0a1817d/
Changeset: 4ed5c0a1817d
User: Norbert Koch
Date: 2014-04-07 08:55:20
Summary: Added tag net-utils-1_58 for changeset 33fd8510a358
Affected #: 1 file
diff -r 33fd8510a358c80889295171808af505609ef778 -r 4ed5c0a1817d68d946e9bfad4d6d2ac9ffa281e3 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -93,3 +93,4 @@
39728bcbaf746365f181b7168fe7843acf3f619c sumo-2003-02-05
58672f38d3afb914b80e69fa049855bc9244ff56 sumo-2006-05-10
2bf3970f3d1960f9b38b303a592bb9da3f0c020f net-utils-1_57
+33fd8510a358c80889295171808af505609ef778 net-utils-1_58
Repository URL: https://bitbucket.org/xemacs/net-utils/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/fsf-compat: 5 new changesets
10 years, 10 months
Bitbucket
5 new commits in fsf-compat:
https://bitbucket.org/xemacs/fsf-compat/commits/d414cdb8fd30/
Changeset: d414cdb8fd30
User: Norbert Koch
Date: 2014-04-07 08:55:15
Summary: XEmacs Package Release 1.20
Affected #: 2 files
diff -r 65d33b7ebc516f9bba2e936a6bdc005a2d806e7e -r d414cdb8fd30cd84cd9eb7006fadcbb78d211509 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-07 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.20 released.
+
2009-08-14 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.19 released.
diff -r 65d33b7ebc516f9bba2e936a6bdc005a2d806e7e -r d414cdb8fd30cd84cd9eb7006fadcbb78d211509 Makefile
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
# This XEmacs package contains independent single file lisp packages
-VERSION = 1.19
+VERSION = 1.20
AUTHOR_VERSION =
MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = fsf-compat
https://bitbucket.org/xemacs/fsf-compat/commits/cace3f09611d/
Changeset: cace3f09611d
User: Norbert Koch
Date: 2014-04-07 08:55:15
Summary: Added tag fsf-compat-1_20 for changeset d414cdb8fd30
Affected #: 1 file
diff -r d414cdb8fd30cd84cd9eb7006fadcbb78d211509 -r cace3f09611d6b3a38ad56b87988333343ca9d1c .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -65,3 +65,4 @@
b82b5434da4014c8e05b6b5bf8fd777fc8f5ff2c sumo-2003-02-05
60cc1e2c36f7bd00d43a2650966c1511cba21807 sumo-2006-05-10
6f862ed49f27e8160e7045316f0fb7453ae06eae fsf-compat-1_13
+d414cdb8fd30cd84cd9eb7006fadcbb78d211509 fsf-compat-1_20
https://bitbucket.org/xemacs/fsf-compat/commits/71fc676f87a2/
Changeset: 71fc676f87a2
User: Norbert Koch
Date: 2014-05-12 09:04:04
Summary: Merge (forgotten push)
Affected #: 6 files
diff -r cace3f09611d6b3a38ad56b87988333343ca9d1c -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-06 Jerry James <james(a)xemacs.org>
+
+ * button.el: New. From Emacs 24.3.
+
2014-04-07 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.20 released.
diff -r cace3f09611d6b3a38ad56b87988333343ca9d1c -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 Makefile
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@
EXTRA_SOURCES = README
-ELCS = overlay.elc thingatpt.elc timer.elc x-popup-menu.elc goto-addr.elc
+ELCS = button.elc goto-addr.elc overlay.elc thingatpt.elc timer.elc \
+ x-popup-menu.elc
include ../../XEmacs.rules
diff -r cace3f09611d6b3a38ad56b87988333343ca9d1c -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 button.el
--- /dev/null
+++ b/button.el
@@ -0,0 +1,520 @@
+;;; button.el --- clickable buttons
+;;
+;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
+;;
+;; Author: Miles Bader <miles(a)gnu.org>
+;; Keywords: extensions
+;; Package: emacs
+;;
+;; This file is part of XEmacs.
+;;
+;; XEmacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This package defines functions for inserting and manipulating
+;; clickable buttons in Emacs buffers, such as might be used for help
+;; hyperlinks, etc.
+;;
+;; In some ways it duplicates functionality also offered by the
+;; `widget' package, but the button package has the advantage that it
+;; is (1) much faster, (2) much smaller, and (3) much, much, simpler
+;; (the code, that is, not the interface).
+;;
+;; Buttons can either use extents, in which case the button is
+;; represented by the extent itself, or text-properties, in which case
+;; the button is represented by a marker or buffer-position pointing
+;; somewhere in the button. In the latter case, no markers into the
+;; buffer are retained, which is important for speed if there are are
+;; extremely large numbers of buttons. Note however that if there is
+;; an existing face text-property at the site of the button, the
+;; button face may not be visible. Using extents avoids this.
+;;
+;; Using `define-button-type' to define default properties for buttons
+;; is not necessary, but it is encouraged, since doing so makes the
+;; resulting code clearer and more efficient.
+;;
+
+;;; Code:
+
+
+;; Globals
+
+(defface button '((t (:underline t)))
+ "Default face used for buttons."
+:group 'faces)
+
+(defvar button-map
+ (let ((map (make-sparse-keymap 'button-map)))
+ ;; The following definition needs to avoid using escape sequences that
+ ;; might get converted to ^M when building loaddefs.el
+ (define-key map [(control ?m)] 'push-button)
+ (define-key map [button2] 'push-button)
+ map)
+ "Keymap used by buttons.")
+
+(defvar button-buffer-map
+ (let ((map (make-sparse-keymap 'button-buffer-map)))
+ (define-key map [?\t] 'forward-button)
+ (define-key map "\e\t" 'backward-button)
+ (define-key map [backtab] 'backward-button)
+ map)
+ "Keymap useful for buffers containing buttons.
+Mode-specific keymaps may want to use this as their parent keymap.")
+
+;; Default properties for buttons
+(put 'default-button 'face 'button)
+(put 'default-button 'mouse-face 'highlight)
+(put 'default-button 'keymap button-map)
+(put 'default-button 'type 'button)
+;; action may be either a function to call, or a marker to go to
+(put 'default-button 'action 'ignore)
+(put 'default-button 'help-echo "mouse-2, RET: Push this button")
+;; Make extent buttons go away if their underlying text is deleted.
+(put 'default-button 'detachable t)
+;; Prevent insertions adjacent to the text-property buttons from
+;; inheriting its properties.
+(put 'default-button 'rear-nonsticky t)
+
+;; A `category-symbol' property for the default button type
+(put 'button 'button-category-symbol 'default-button)
+
+
+;; Button types (which can be used to hold default properties for buttons)
+
+;; Because button-type properties are inherited by buttons using the
+;; special `category' property (implemented by both extents and
+;; text-properties), we need to store them on a symbol to which the
+;; `category' properties can point. Instead of using the symbol that's
+;; the name of each button-type, however, we use a separate symbol (with
+;; `-button' appended, and uninterned) to store the properties. This is
+;; to avoid name clashes.
+
+;; [this is an internal function]
+(defsubst button-category-symbol (type)
+ "Return the symbol used by button-type TYPE to store properties.
+Buttons inherit them by setting their `category' property to that symbol."
+ (or (get type 'button-category-symbol)
+ (error "Unknown button type `%s'" type)))
+
+;;;###autoload
+(defun define-button-type (name &rest properties)
+ "Define a `button type' called NAME (a symbol).
+The remaining arguments form a sequence of PROPERTY VALUE pairs,
+specifying properties to use as defaults for buttons with this type
+\(a button's type may be set by giving it a `type' property when
+creating the button, using the :type keyword argument).
+
+In addition, the keyword argument :supertype may be used to specify a
+button-type from which NAME inherits its default property values
+\(however, the inheritance happens only when NAME is defined; subsequent
+changes to a supertype are not reflected in its subtypes)."
+ (let ((catsym (make-symbol (concat (symbol-name name) "-button")))
+ (super-catsym
+ (button-category-symbol
+ (or (plist-get properties 'supertype)
+ (plist-get properties :supertype)
+ 'button))))
+ ;; Provide a link so that it's easy to find the real symbol.
+ (put name 'button-category-symbol catsym)
+ ;; Initialize NAME's properties using the global defaults.
+ (let ((default-props (symbol-plist super-catsym)))
+ (while default-props
+ (put catsym (pop default-props) (pop default-props))))
+ ;; Add NAME as the `type' property, which will then be returned as
+ ;; the type property of individual buttons.
+ (put catsym 'type name)
+ ;; Add the properties in PROPERTIES to the real symbol.
+ (while properties
+ (let ((prop (pop properties)))
+ (when (eq prop :supertype)
+ (setq prop 'supertype))
+ (put catsym prop (pop properties))))
+ ;; Make sure there's a `supertype' property
+ (unless (get catsym 'supertype)
+ (put catsym 'supertype 'button))
+ name))
+
+(defun button-type-put (type prop val)
+ "Set the button-type TYPE's PROP property to VAL."
+ (put (button-category-symbol type) prop val))
+
+(defun button-type-get (type prop)
+ "Get the property of button-type TYPE named PROP."
+ (get (button-category-symbol type) prop))
+
+(defun button-type-subtype-p (type supertype)
+ "Return t if button-type TYPE is a subtype of SUPERTYPE."
+ (or (eq type supertype)
+ (and type
+ (button-type-subtype-p (button-type-get type 'supertype)
+ supertype))))
+
+
+;; Button properties and other attributes
+
+(defun button-start (button)
+ "Return the position at which BUTTON starts."
+ (if (extentp button)
+ (extent-start-position button)
+ ;; Must be a text-property button.
+ (or (previous-single-property-change (1+ button) 'button)
+ (point-min))))
+
+(defun button-end (button)
+ "Return the position at which BUTTON ends."
+ (if (extentp button)
+ (extent-end-position button)
+ ;; Must be a text-property button.
+ (or (next-single-property-change button 'button)
+ (point-max))))
+
+(defun button-get (button prop)
+ "Get the property of button BUTTON named PROP."
+ (cond ((extentp button)
+ (or (extent-property button prop)
+ (let ((category (extent-property button 'category)))
+ (when category
+ (get category prop)))))
+ ((button--area-button-p button)
+ (get-text-property (cdr button)
+ prop (button--area-button-string button)))
+ (t ; Must be a text-property button.
+ (get-text-property button prop))))
+
+(defun button-put (button prop val)
+ "Set BUTTON's PROP property to VAL."
+ ;; Treat some properties specially.
+ (cond ((memq prop '(type :type))
+ ;; We translate a `type' property a `category' property, since
+ ;; that's what's actually used by extents/text-properties for
+ ;; inheriting properties.
+ (setq prop 'category)
+ (setq val (button-category-symbol val)))
+ ((eq prop 'category)
+ ;; Disallow updating the `category' property directly.
+ (error "Button `category' property may not be set directly")))
+ ;; Add the property.
+ (cond ((extentp button)
+ (set-extent-property button prop val))
+ ((button--area-button-p button)
+ (setq button (button--area-button-string button))
+ (put-text-property 0 (length button) prop val button))
+ (t ; Must be a text-property button.
+ (put-text-property
+ (or (previous-single-property-change (1+ button) 'button)
+ (point-min))
+ (or (next-single-property-change button 'button)
+ (point-max))
+ prop val))))
+
+;;;###autoload
+(defun button-activate (button &optional use-mouse-action)
+ "Call BUTTON's action property.
+If USE-MOUSE-ACTION is non-nil, invoke the button's mouse-action
+instead of its normal action; if the button has no mouse-action,
+the normal action is used instead.
+
+The action can either be a marker or a function. If it's a
+marker then goto it. Otherwise if it is a function then it is
+called with BUTTON as only argument. BUTTON is either an
+extent, a buffer position, or (for buttons in the mode-line or
+header-line) a string."
+ (let ((action (or (and use-mouse-action (button-get button 'mouse-action))
+ (button-get button 'action))))
+ (if (markerp action)
+ (save-selected-window
+ (select-window (display-buffer (marker-buffer action)))
+ (goto-char action)
+ (recenter 0))
+ (funcall action button))))
+
+(defun button-label (button)
+ "Return BUTTON's text label."
+ (if (button--area-button-p button)
+ (substring-no-properties (button--area-button-string button))
+ (buffer-substring-no-properties (button-start button)
+ (button-end button))))
+
+(defsubst button-type (button)
+ "Return BUTTON's button-type."
+ (button-get button 'type))
+
+(defun button-has-type-p (button type)
+ "Return t if BUTTON has button-type TYPE, or one of TYPE's subtypes."
+ (button-type-subtype-p (button-get button 'type) type))
+
+(defun button--area-button-p (b)
+ "Return non-nil if BUTTON is an area button.
+Such area buttons are used for buttons in the mode-line and header-line."
+ (stringp (car-safe b)))
+
+(defalias 'button--area-button-string #'car)
+
+;; Creating extent buttons
+
+;;;###autoload
+(defun make-button (beg end &rest properties)
+ "Make a button from BEG to END in the current buffer.
+The remaining arguments form a sequence of PROPERTY VALUE pairs,
+specifying properties to add to the button.
+In addition, the keyword argument :type may be used to specify a
+button-type from which to inherit other properties; see
+`define-button-type'.
+
+Also see `make-text-button', `insert-button'."
+ (when (> beg end)
+ (setq beg (prog1 end (setq end beg))))
+ (let ((extent (make-extent beg end)))
+ (set-extent-property extent 'start-open t)
+ (while properties
+ (button-put extent (pop properties) (pop properties)))
+ ;; Put a pointer to the button in the extent, so it's easy to get
+ ;; when we don't actually have a reference to the extent.
+ (set-extent-property extent 'button extent)
+ ;; If the user didn't specify a type, use the default.
+ (unless (extent-property extent 'category)
+ (set-extent-property extent 'category 'default-button))
+ ;; EXTENT is the button, so return it
+ extent))
+
+;;;###autoload
+(defun insert-button (label &rest properties)
+ "Insert a button with the label LABEL.
+The remaining arguments form a sequence of PROPERTY VALUE pairs,
+specifying properties to add to the button.
+In addition, the keyword argument :type may be used to specify a
+button-type from which to inherit other properties; see
+`define-button-type'.
+
+Also see `insert-text-button', `make-button'."
+ (apply #'make-button
+ (prog1 (point) (insert label))
+ (point)
+ properties))
+
+
+;; Creating text-property buttons
+
+;;;###autoload
+(defun make-text-button (beg end &rest properties)
+ "Make a button from BEG to END in the current buffer.
+The remaining arguments form a sequence of PROPERTY VALUE pairs,
+specifying properties to add to the button.
+In addition, the keyword argument :type may be used to specify a
+button-type from which to inherit other properties; see
+`define-button-type'.
+
+This function is like `make-button', except that the button is actually
+part of the text instead of being a property of the buffer. That is,
+this function uses text properties, the other uses extents.
+Creating large numbers of buttons can also be somewhat faster
+using `make-text-button'. Note, however, that if there is an existing
+face property at the site of the button, the button face may not be visible.
+You may want to use `make-button' in that case.
+
+BEG can also be a string, in which case it is made into a button.
+
+Also see `insert-text-button'."
+ (let ((object nil)
+ (type-entry
+ (or (plist-member properties 'type)
+ (plist-member properties :type))))
+ (when (stringp beg)
+ (setq object beg beg 0 end (length object)))
+ ;; Disallow setting the `category' property directly.
+ (when (plist-get properties 'category)
+ (error "Button `category' property may not be set directly"))
+ (if (null type-entry)
+ ;; The user didn't specify a `type' property, use the default.
+ (setq properties (cons 'category (cons 'default-button properties)))
+ ;; The user did specify a `type' property. Translate it into a
+ ;; `category' property, which is what's actually used by
+ ;; text-properties for inheritance.
+ (setcar type-entry 'category)
+ (setcar (cdr type-entry)
+ (button-category-symbol (car (cdr type-entry)))))
+ ;; Now add all the text properties at once
+ (add-text-properties beg end
+ ;; Each button should have a non-eq `button'
+ ;; property so that next-single-property-change can
+ ;; detect boundaries reliably.
+ (cons 'button (cons (list t) properties))
+ object)
+ ;; Return something that can be used to get at the button.
+ (or object beg)))
+
+(defun insert-text-button (label &rest properties)
+ "Insert a button with the label LABEL.
+The remaining arguments form a sequence of PROPERTY VALUE pairs,
+specifying properties to add to the button.
+In addition, the keyword argument :type may be used to specify a
+button-type from which to inherit other properties; see
+`define-button-type'.
+
+This function is like `insert-button', except that the button is
+actually part of the text instead of being a property of the buffer.
+Creating large numbers of buttons can also be somewhat faster using
+`insert-text-button'.
+
+Also see `make-text-button'."
+ (apply #'make-text-button
+ (prog1 (point) (insert label))
+ (point)
+ properties))
+
+
+;; Finding buttons in a buffer
+
+;;;###autoload
+(defun button-at (pos)
+ "Return the button at position POS in the current buffer, or nil.
+If the button at POS is a text property button, the return value
+is a marker pointing to POS."
+ (let ((button (get-char-property pos 'button)))
+ (if (or (extentp button) (null button))
+ button
+ ;; Must be a text-property button; return a marker pointing to it.
+ (copy-marker pos t))))
+
+;;;###autoload
+(defun next-button (pos &optional count-current)
+ "Return the next button after position POS in the current buffer.
+If COUNT-CURRENT is non-nil, count any button at POS in the search,
+instead of starting at the next button."
+ (unless count-current
+ ;; Search for the next button boundary.
+ (setq pos (next-single-char-property-change pos 'button)))
+ (and (< pos (point-max))
+ (or (button-at pos)
+ ;; We must have originally been on a button, and are now in
+ ;; the inter-button space. Recurse to find a button.
+ (next-button pos))))
+
+;;;###autoload
+(defun previous-button (pos &optional count-current)
+ "Return the previous button before position POS in the current buffer.
+If COUNT-CURRENT is non-nil, count any button at POS in the search,
+instead of starting at the next button."
+ (let ((button (button-at pos)))
+ (if button
+ (if count-current
+ button
+ ;; We started out on a button, so move to its start and look
+ ;; for the previous button boundary.
+ (setq pos (previous-single-char-property-change
+ (button-start button) 'button))
+ (let ((new-button (button-at pos)))
+ (if new-button
+ ;; We are in a button again; this can happen if there
+ ;; are adjacent buttons (or at bob).
+ (unless (= pos (button-start button)) new-button)
+ ;; We are now in the space between buttons.
+ (previous-button pos))))
+ ;; We started out in the space between buttons.
+ (setq pos (previous-single-char-property-change pos 'button))
+ (or (button-at pos)
+ (and (> pos (point-min))
+ (button-at (1- pos)))))))
+
+
+;; User commands
+
+;;;###autoload
+(defun push-button (&optional pos use-mouse-action)
+ "Perform the action specified by a button at location POS.
+POS may be either a buffer position or a mouse-event. If
+USE-MOUSE-ACTION is non-nil, invoke the button's mouse-action
+instead of its normal action; if the button has no mouse-action,
+the normal action is used instead. The action may be either a
+function to call or a marker to display and is invoked using
+`button-activate' (which see).
+
+POS defaults to point, except when `push-button' is invoked
+interactively as the result of a mouse-event, in which case, the
+mouse event is used.
+If there's no button at POS, do nothing and return nil, otherwise
+return t."
+ (interactive
+ (list (if (mouse-event-p last-command-event) last-command-event (point))))
+ (if (and (not (integerp pos)) (eventp pos))
+ ;; POS is a mouse event; switch to the proper window/buffer
+ (with-current-buffer (event-buffer pos)
+ (if (event-over-text-area-p pos)
+ (push-button (event-point pos) t)
+ (button-activate (event-point pos) t)))
+ ;; POS is just normal position
+ (let ((button (button-at (or pos (point)))))
+ (when button
+ (button-activate button use-mouse-action)
+ t))))
+
+;;;###autoload
+(defun forward-button (n &optional wrap display-message)
+ "Move to the Nth next button, or Nth previous button if N is negative.
+If N is 0, move to the start of any button at point.
+If WRAP is non-nil, moving past either end of the buffer continues from the
+other end.
+If DISPLAY-MESSAGE is non-nil, the button's help-echo string is displayed.
+Any button with a non-nil `skip' property is skipped over.
+Returns the button found."
+ (interactive "p\nd\nd")
+ (let (button)
+ (if (zerop n)
+ ;; Move to start of current button
+ (if (setq button (button-at (point)))
+ (goto-char (button-start button)))
+ ;; Move to Nth next button
+ (let ((iterator (if (> n 0) #'next-button #'previous-button))
+ (wrap-start (if (> n 0) (point-min) (point-max)))
+ opoint fail)
+ (setq n (abs n))
+ (setq button t) ; just to start the loop
+ (while (and (null fail) (> n 0) button)
+ (setq button (funcall iterator (point)))
+ (when (and (not button) wrap)
+ (setq button (funcall iterator wrap-start t)))
+ (when button
+ (goto-char (button-start button))
+ ;; Avoid looping forever (e.g., if all the buttons have
+ ;; the `skip' property).
+ (cond ((null opoint)
+ (setq opoint (point)))
+ ((= opoint (point))
+ (setq fail t)))
+ (unless (button-get button 'skip)
+ (setq n (1- n)))))))
+ (if (null button)
+ (error (if wrap "No buttons!" "No more buttons"))
+ (let ((msg (and display-message (button-get button 'help-echo))))
+ (when msg
+ (message "%s" msg)))
+ button)))
+
+;;;###autoload
+(defun backward-button (n &optional wrap display-message)
+ "Move to the Nth previous button, or Nth next button if N is negative.
+If N is 0, move to the start of any button at point.
+If WRAP is non-nil, moving past either end of the buffer continues from the
+other end.
+If DISPLAY-MESSAGE is non-nil, the button's help-echo string is displayed.
+Any button with a non-nil `skip' property is skipped over.
+Returns the button found."
+ (interactive "p\nd\nd")
+ (forward-button (- n) wrap display-message))
+
+
+(provide 'button)
+
+;;; button.el ends here
diff -r cace3f09611d6b3a38ad56b87988333343ca9d1c -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 overlay.el
--- a/overlay.el
+++ b/overlay.el
@@ -291,6 +291,49 @@
prop)))
(set-extent-property overlay prop value))
+(defun copy-overlay (o)
+ "Return a copy of overlay O."
+ (let ((o1 (if (overlay-buffer o)
+ (make-overlay (overlay-start o) (overlay-end o)
+ ;; FIXME: there's no easy way to find the
+ ;; insertion-type of the two markers.
+ (overlay-buffer o))
+ (let ((o1 (make-overlay (point-min) (point-min))))
+ (delete-overlay o1)
+ o1)))
+ (props (overlay-properties o)))
+ (while props
+ (overlay-put o1 (pop props) (pop props)))
+ o1))
+
+(defun remove-overlays (&optional beg end name val)
+ "Clear BEG and END of overlays whose property NAME has value VAL.
+Overlays might be moved and/or split.
+BEG and END default respectively to the beginning and end of buffer."
+ ;; This speeds up the loops over overlays.
+ (unless beg (setq beg (point-min)))
+ (unless end (setq end (point-max)))
+ (overlay-recenter end)
+ (if (< end beg)
+ (setq beg (prog1 end (setq end beg))))
+ (save-excursion
+ (dolist (o (overlays-in beg end))
+ (when (eq (overlay-get o name) val)
+ ;; Either push this overlay outside beg...end
+ ;; or split it to exclude beg...end
+ ;; or delete it entirely (if it is contained in beg...end).
+ (if (< (overlay-start o) beg)
+ (if (> (overlay-end o) end)
+ (progn
+ (move-overlay (copy-overlay o)
+ (overlay-start o) beg)
+ (move-overlay o end (overlay-end o)))
+ (move-overlay o (overlay-start o) beg))
+ (if (> (overlay-end o) end)
+ (move-overlay o end (overlay-end o))
+ (delete-overlay o)))))))
+
+
(provide 'overlay)
;;; overlay.el ends here
diff -r cace3f09611d6b3a38ad56b87988333343ca9d1c -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 subr-fsf.el
--- /dev/null
+++ b/subr-fsf.el
@@ -0,0 +1,29 @@
+;;; subr-fsf.el --- Complement the core basic lisp subroutines for XEmacs
+
+;; Copyright (C) 2014
+;; Free Software Foundation, Inc.
+
+;; Maintainer: XEmacs Development Team
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;;###autoload
+(defalias 'wholenump 'natnump)
+
+;;;###autoload
+(defmacro declare-function (fn file &optional arglist fileonly))
diff -r cace3f09611d6b3a38ad56b87988333343ca9d1c -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 timer.el
--- a/timer.el
+++ b/timer.el
@@ -113,8 +113,10 @@
(defun timer-activate-when-idle (timer &optional dont-wait)
"Arrange to activate TIMER whenever Emacs is next idle.
DONT-WAIT is for Emacs compatibility and is currently ignored."
- (set-itimer-is-idle timer t)
- (activate-itimer timer))
+ (when (and (not (itimer-live-p timer))
+ (not (get-itimer (itimer-name timer))))
+ (set-itimer-is-idle timer t)
+ (activate-itimer timer)))
;; can't do this, different kind of timer
;;(defalias 'disable-timeout 'cancel-timer)
https://bitbucket.org/xemacs/fsf-compat/commits/d4571655f255/
Changeset: d4571655f255
User: Norbert Koch
Date: 2014-05-12 09:04:49
Summary: XEmacs Package Release 1.21
Affected #: 2 files
diff -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 -r d4571655f25538ad0ef7644226f78515f08c9f64 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-12 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.21 released.
+
2014-05-06 Jerry James <james(a)xemacs.org>
* button.el: New. From Emacs 24.3.
diff -r 71fc676f87a217495d727f60b2ce8853cbbd5e31 -r d4571655f25538ad0ef7644226f78515f08c9f64 Makefile
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
# This XEmacs package contains independent single file lisp packages
-VERSION = 1.20
+VERSION = 1.21
AUTHOR_VERSION =
MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = fsf-compat
https://bitbucket.org/xemacs/fsf-compat/commits/8fe8c2df42a1/
Changeset: 8fe8c2df42a1
User: Norbert Koch
Date: 2014-05-12 09:04:49
Summary: Added tag fsf-compat-1_21 for changeset d4571655f255
Affected #: 1 file
diff -r d4571655f25538ad0ef7644226f78515f08c9f64 -r 8fe8c2df42a169a88d984b46fcf699e588975d56 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -66,3 +66,4 @@
60cc1e2c36f7bd00d43a2650966c1511cba21807 sumo-2006-05-10
6f862ed49f27e8160e7045316f0fb7453ae06eae fsf-compat-1_13
d414cdb8fd30cd84cd9eb7006fadcbb78d211509 fsf-compat-1_20
+d4571655f25538ad0ef7644226f78515f08c9f64 fsf-compat-1_21
Repository URL: https://bitbucket.org/xemacs/fsf-compat/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[PATCH 21.5] Bind print-circle when printing backtraces
10 years, 10 months
Jerry James
PATCH 21.5
Yesterday, I received a bug report filed against the Fedora XFT build
of XEmacs. (The default build is non-XFT, for the curious.) This bug
report shows at least two bugs. This patch addresses the first.
The XFT build segfaults (looks like a NULL pointer gets passed to
FCPatternObjectAddWithBinding), and tries to print a backtrace. But
the backtrace printing gets into an infinite loop and blows the stack,
like this (line numbers translated to current Mercurial head):
1. debug_backtrace: print.c, line 3089
2. Fbacktrace: eval.c, line 7216
3. Fprin1: print.c, line 1128
4. print_internal: print.c, line 2507
5. print_compiled_function: bytecode.c, line 2339
6. print_internal: print.c, line 2507
7. print_vector_internal: print.c, line 1600
8. goto #4
Apparently, the way we print compiled functions includes printing some
internal vector, which includes a pointer back to the compiled
function. Here is a portion of the output that XEmacs generates
before it explodes, with some whitespace changes for readability:
#<compiled-function (from "/builddir/build/BUILD/xemacs-21.5.34/lisp/faces.elc")
(locale inst-list prop devtype-spec) "...(264)"
[#:G23465 devtype #:G23464 devtype-spec tag-set x nil
derive-device-type-from-locale-and-tag-set functionp plist-get
error unimplemented "mapper"
vectorp assoc t 1 #<compiled-function ...
I don't understand that part, but it seems like binding print-circle
while printing a backtrace would be a good idea in any case. That is
what this patch does.
diff -r 2d20d57d4e7b src/ChangeLog
--- a/src/ChangeLog Wed May 07 13:33:50 2014 -0600
+++ b/src/ChangeLog Thu May 08 08:51:32 2014 -0600
@@ -1,3 +1,9 @@
+2014-05-08 Jerry James <james(a)xemacs.org>
+
+ * print.c (struct debug_bindings): Add print_circle field.
+ (debug_print_exit): Restore print_circle.
+ (debug_print_enter): Save print_circle binding and set it.
+
2014-01-27 Michael Sperber <mike(a)xemacs.org>
* symbols.c (Fdefine_function): Allow optional `docstring'
diff -r 2d20d57d4e7b src/print.c
--- a/src/print.c Wed May 07 13:33:50 2014 -0600
+++ b/src/print.c Thu May 08 08:51:32 2014 -0600
@@ -164,6 +164,7 @@
int print_depth;
int print_readably;
int print_unbuffered;
+ int print_circle;
int in_debug_print;
int gc_currently_forbidden;
Lisp_Object Vprint_length;
@@ -2847,6 +2848,7 @@
print_depth = bindings->print_depth;
print_readably = bindings->print_readably;
print_unbuffered = bindings->print_unbuffered;
+ print_circle = bindings->print_circle;
in_debug_print = bindings->in_debug_print;
gc_currently_forbidden = bindings->gc_currently_forbidden;
Vprint_length = bindings->Vprint_length;
@@ -2873,6 +2875,7 @@
bindings->print_depth = print_depth;
bindings->print_readably = print_readably;
bindings->print_unbuffered = print_unbuffered;
+ bindings->print_circle = print_circle;
bindings->in_debug_print = in_debug_print;
bindings->gc_currently_forbidden = gc_currently_forbidden;
bindings->Vprint_length = Vprint_length;
@@ -2885,6 +2888,7 @@
print_depth = 0;
print_readably = debug_print_readably != -1 ? debug_print_readably : 0;
print_unbuffered++;
+ print_circle = 1;
in_debug_print = 1;
gc_currently_forbidden = 1;
if (debug_print_length > 0)
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[AC 21.5] Drop texinfo info files
10 years, 10 months
Jerry James
APPROVE COMMIT 21.5
On Tue, May 6, 2014 at 6:07 PM, Vin Shelton <acs(a)alumni.princeton.edu> wrote:
> +1
Thanks for the comments, everyone. I have committed this patch. Our
texinfo 4.13a users should now be able to build the info pages again.
Next up: finally committing the texinfo 5 changes to the packages...
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: Jerry James: Do not build or ship the texinfo info files.
10 years, 10 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/2d20d57d4e7b/
Changeset: 2d20d57d4e7b
User: Jerry James
Date: 2014-05-07 21:33:50
Summary: Do not build or ship the texinfo info files.
They are available from the texinfo distribution, and break the build for
some versions of makeinfo. See xemacs-patches message with ID
<CAHCOHQ=EERhpe14cMzWjp286TzNHuw8ez-L-uy6kjoRPZE3b3A(a)mail.gmail.com>.
Affected #: 5 files
diff -r cf0201de66dfcbf2372fae706bff132bd4f0aef6 -r 2d20d57d4e7b7a80564de5fb065779557994edb2 man/ChangeLog
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-28 Jerry James <james(a)xemacs.org>
+
+ * Makefile.in: Do not build texinfo files.
+ * texinfo/fdl.texi:
+ * texinfo/texinfo.texi:
+ * texinfo/version.texi:
+ Remove files belonging to an external project.
+
2014-03-28 Jerry James <james(a)xemacs.org>
* lispref/loading.texi:
diff -r cf0201de66dfcbf2372fae706bff132bd4f0aef6 -r 2d20d57d4e7b7a80564de5fb065779557994edb2 man/Makefile.in
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -56,7 +56,6 @@
$(DIR)new-users-guide.texi \
$(DIR)standards.texi \
$(DIR)termcap.texi \
- $(DIR)texinfo.texi \
$(DIR)widget.texi \
$(DIR)xemacs.texi \
$(DIR)xemacs-faq.texi
@@ -203,11 +202,6 @@
new-users-guide/search.texi \
new-users-guide/xmenu.texi
-texinfo-srcs = \
- texinfo/fdl.texi \
- texinfo/texinfo.texi \
- texinfo/version.texi
-
$(INFODIR)/beta.info : beta.texi
$(MAKEINFO) -o $(INFODIR)/beta.info beta.texi
@@ -254,16 +248,12 @@
$(INFODIR)/new-users-guide.info : $(new-users-guide-srcs)
$(MAKEINFO) -P new-users-guide -o $(INFODIR)/new-users-guide.info new-users-guide/new-users-guide.texi
-$(INFODIR)/texinfo.info: $(texinfo-srcs)
- $(MAKEINFO) -P texinfo -o $(INFODIR)/texinfo.info texinfo/texinfo.texi
-
xemacs : $(INFODIR)/xemacs.info
lispref : $(INFODIR)/lispref.info
internals : $(INFODIR)/internals.info
new-users-guide.info : $(INFODIR)/new-users-guide.info
-texinfo: $(INFODIR)/texinfo.info
-.PHONY: xemacs lispref internals new-users-guide texinfo info dvi pdf
+.PHONY: xemacs lispref internals new-users-guide info dvi pdf
info : $(info_files)
html : $(html_files)
@@ -286,9 +276,6 @@
new-users-guide.dvi : $(new-users-guide-srcs)
$(TEXI2DVI) -I new-users-guide new-users-guide/new-users-guide.texi
-texinfo.dvi: $(texinfo-srcs)
- $(TEXI2DVI) -I texinfo texinfo/texinfo.texi
-
dvi : $(dvi_files)
xemacs.pdf: $(xemacs-srcs)
@@ -303,9 +290,6 @@
new-users-guide.pdf: $(new-users-guide-srcs)
$(TEXI2DVI) --pdf -I new-users-guide new-users-guide/new-users-guide.texi
-texinfo.pdf: $(texinfo-srcs)
- $(TEXI2DVI) --pdf -I texinfo texinfo/texinfo.texi
-
pdf: $(pdf_files)
.PHONY: mostlyclean clean distclean realclean extraclean
@@ -381,13 +365,9 @@
$(HTMLDIR)/new-users-guide.html : $(new-users-guide-srcs)
$(TEXI2HTML_SPLIT) new-users-guide/new-users-guide.texi
-$(HTMLDIR)/texinfo.html: $(texinfo-srcs)
- $(TEXI2HTML_SPLIT) texinfo/texinfo.texi
-
xemacs : $(HTMLDIR)/xemacs.html
lispref : $(HTMLDIR)/lispref.html
internals : $(HTMLDIR)/internals.html
new-users-guide.html : $(HTMLDIR)/new-users-guide.html
-texinfo: $(HTMLDIR)/texinfo.html
html : $(html_files)
diff -r cf0201de66dfcbf2372fae706bff132bd4f0aef6 -r 2d20d57d4e7b7a80564de5fb065779557994edb2 man/texinfo/fdl.texi
--- a/man/texinfo/fdl.texi
+++ /dev/null
@@ -1,508 +0,0 @@
-@c The GNU Free Documentation License.
-@center Version 1.3, 3 November 2008
-
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
-
-@c Synced up with: GFDL v1.3 of November 2008.
-@c Synced by: Jerry James, 11 Feb 2014.
-
-@display
-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-@uref{http://fsf.org/}
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@enumerate 0
-@item
-PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document @dfn{free} in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of ``copyleft'', which means that derivative
-works of the document must themselves be free in the same sense. It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does. But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book. We recommend this License
-principally for works whose purpose is instruction or reference.
-
-@item
-APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License. Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein. The ``Document'', below,
-refers to any such manual or work. Any member of the public is a
-licensee, and is addressed as ``you''. You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A ``Modified Version'' of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A ``Secondary Section'' is a named appendix or a front-matter section
-of the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject. (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.) The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The ``Invariant Sections'' are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License. If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant. The Document may contain zero
-Invariant Sections. If the Document does not identify any Invariant
-Sections then there are none.
-
-The ``Cover Texts'' are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License. A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A ``Transparent'' copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters. A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text. A copy that is not ``Transparent'' is called ``Opaque''.
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, La@TeX{} input
-format, SGML or XML using a publicly available
-DTD, and standard-conforming simple HTML,
-PostScript or PDF designed for human modification. Examples
-of transparent image formats include PNG, XCF and
-JPG. Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, SGML or
-XML for which the DTD and/or processing tools are
-not generally available, and the machine-generated HTML,
-PostScript or PDF produced by some word processors for
-output purposes only.
-
-The ``Title Page'' means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page. For works in
-formats which do not have any title page as such, ``Title Page'' means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-The ``publisher'' means any person or entity that distributes copies
-of the Document to the public.
-
-A section ``Entitled XYZ'' means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language. (Here XYZ stands for a
-specific section name mentioned below, such as ``Acknowledgements'',
-``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title''
-of such a section when you modify the Document means that it remains a
-section ``Entitled XYZ'' according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document. These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-@item
-VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License. You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute. However, you may accept
-compensation in exchange for copies. If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-@item
-COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover. Both covers must also clearly and legibly identify
-you as the publisher of these copies. The front cover must present
-the full title with all words of the title equally prominent and
-visible. You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-@item
-MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it. In addition, you must do these things in the Modified Version:
-
-@enumerate A
-@item
-Use in the Title Page (and on the covers, if any) a title distinct
-from that of the Document, and from those of previous versions
-(which should, if there were any, be listed in the History section
-of the Document). You may use the same title as a previous version
-if the original publisher of that version gives permission.
-
-@item
-List on the Title Page, as authors, one or more persons or entities
-responsible for authorship of the modifications in the Modified
-Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has fewer than five),
-unless they release you from this requirement.
-
-@item
-State on the Title page the name of the publisher of the
-Modified Version, as the publisher.
-
-@item
-Preserve all the copyright notices of the Document.
-
-@item
-Add an appropriate copyright notice for your modifications
-adjacent to the other copyright notices.
-
-@item
-Include, immediately after the copyright notices, a license notice
-giving the public permission to use the Modified Version under the
-terms of this License, in the form shown in the Addendum below.
-
-@item
-Preserve in that license notice the full lists of Invariant Sections
-and required Cover Texts given in the Document's license notice.
-
-@item
-Include an unaltered copy of this License.
-
-@item
-Preserve the section Entitled ``History'', Preserve its Title, and add
-to it an item stating at least the title, year, new authors, and
-publisher of the Modified Version as given on the Title Page. If
-there is no section Entitled ``History'' in the Document, create one
-stating the title, year, authors, and publisher of the Document as
-given on its Title Page, then add an item describing the Modified
-Version as stated in the previous sentence.
-
-@item
-Preserve the network location, if any, given in the Document for
-public access to a Transparent copy of the Document, and likewise
-the network locations given in the Document for previous versions
-it was based on. These may be placed in the ``History'' section.
-You may omit a network location for a work that was published at
-least four years before the Document itself, or if the original
-publisher of the version it refers to gives permission.
-
-@item
-For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
-the Title of the section, and preserve in the section all the
-substance and tone of each of the contributor acknowledgements and/or
-dedications given therein.
-
-@item
-Preserve all the Invariant Sections of the Document,
-unaltered in their text and in their titles. Section numbers
-or the equivalent are not considered part of the section titles.
-
-@item
-Delete any section Entitled ``Endorsements''. Such a section
-may not be included in the Modified Version.
-
-@item
-Do not retitle any existing section to be Entitled ``Endorsements'' or
-to conflict in title with any Invariant Section.
-
-@item
-Preserve any Warranty Disclaimers.
-@end enumerate
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant. To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled ``Endorsements'', provided it contains
-nothing but endorsements of your Modified Version by various
-parties---for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version. Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity. If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-@item
-COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy. If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled ``History''
-in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
-and any sections Entitled ``Dedications''. You must delete all
-sections Entitled ``Endorsements.''
-
-@item
-COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-@item
-AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an ``aggregate'' if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-@item
-TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections. You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers. In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-@item
-TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense, or distribute it is void, and
-will automatically terminate your rights under this License.
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, receipt of a copy of some or all of the same material does
-not give you any rights to use it.
-
-@item
-FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns. See
-@uref{http://www.gnu.org/copyleft/}.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation. If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation. If the Document
-specifies that a proxy can decide which future versions of this
-License can be used, that proxy's public statement of acceptance of a
-version permanently authorizes you to choose that version for the
-Document.
-
-@item
-RELICENSING
-
-``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
-World Wide Web server that publishes copyrightable works and also
-provides prominent facilities for anybody to edit those works. A
-public wiki that anybody can edit is an example of such a server. A
-``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
-site means any set of copyrightable works thus published on the MMC
-site.
-
-``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
-license published by Creative Commons Corporation, a not-for-profit
-corporation with a principal place of business in San Francisco,
-California, as well as future copyleft versions of that license
-published by that same organization.
-
-``Incorporate'' means to publish or republish a Document, in whole or
-in part, as part of another Document.
-
-An MMC is ``eligible for relicensing'' if it is licensed under this
-License, and if all works that were first published under this License
-somewhere other than this MMC, and subsequently incorporated in whole
-or in part into the MMC, (1) had no cover texts or invariant sections,
-and (2) were thus incorporated prior to November 1, 2008.
-
-The operator of an MMC Site may republish an MMC contained in the site
-under CC-BY-SA on the same site at any time before August 1, 2009,
-provided the MMC is eligible for relicensing.
-
-@end enumerate
-
-@page
-@heading ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-@smallexample
-@group
- Copyright (C) @var{year} @var{your name}.
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.3
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
- Texts. A copy of the license is included in the section entitled ``GNU
- Free Documentation License''.
-@end group
-@end smallexample
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with(a)dots{}Texts.''@: line with this:
-
-@smallexample
-@group
- with the Invariant Sections being @var{list their titles}, with
- the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
- being @var{list}.
-@end group
-@end smallexample
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-
-@c Local Variables:
-@c ispell-local-pdict: "ispell-dict"
-@c End:
This diff is so big that we needed to truncate the remainder.
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[AC pkgs] Add button.el
10 years, 10 months
Jerry James
APPROVE COMMIT packages
On Tue, May 6, 2014 at 8:04 PM, Stephen J. Turnbull <stephen(a)xemacs.org> wrote:
> Thanks! A quick look seems all good to me. Given our low level of
> activity recently, any contribution is a good one. I hate to say it,
> but ship it, and we'll fix it later if needed.
I have committed this patch. Thanks for taking a look at it.
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/calendar: jamesjer: Remove workarounds for the absence of button.el, which is now in fsf-compat.
10 years, 10 months
Bitbucket
1 new commit in calendar:
https://bitbucket.org/xemacs/calendar/commits/59ec40b5f0a6/
Changeset: 59ec40b5f0a6
User: jamesjer
Date: 2014-05-07 21:27:59
Summary: Remove workarounds for the absence of button.el, which is now in fsf-compat.
See <CAHCOHQ=LEV_eFzV_ZZA9G=d3JqRQDD7a0wP8dVLVH_PL7PRGzw(a)mail.gmail.com> in
xemacs-patches.
Affected #: 4 files
diff -r 7524e4fb9de45d77812090a724fac4ebd7549d6e -r 59ec40b5f0a66a62f20b0ef26ebe065017d04d65 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-06 Jerry James <james(a)xemacs.org>
+
+ * Makefile (REQUIRES): Add fsf-compat for button.el.
+ * cal-compat.el (make-button): Removed, now in button.el.
+ (insert-button): Ditto.
+ * diary-lib: Uncomment define-button-type form.
+ (diary-goto-entry): Revert to upstream use of button functions.
+
2008-09-29 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.38 released.
diff -r 7524e4fb9de45d77812090a724fac4ebd7549d6e -r 59ec40b5f0a66a62f20b0ef26ebe065017d04d65 Makefile
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
MAINTAINER = Jeff Miller <jeff.miller(a)xemacs.org>
PACKAGE = calendar
PKG_TYPE = regular
-REQUIRES = xemacs-base
+REQUIRES = xemacs-base fsf-compat
CATEGORY = standard
include ../../Local.rules.inc
diff -r 7524e4fb9de45d77812090a724fac4ebd7549d6e -r 59ec40b5f0a66a62f20b0ef26ebe065017d04d65 cal-compat.el
--- a/cal-compat.el
+++ b/cal-compat.el
@@ -39,39 +39,6 @@
(unless (fboundp 'line-end-position)
(defalias 'line-end-position 'point-at-eol)))
-;; XEmacs change, mimic button.el from Emacs 22
-;;;###autoload
-(defun make-button (beg end &rest properties)
- "Make a button from BEG to END in the current buffer.
-The remaining arguments form a sequence of PROPERTY VALUE pairs,
-
-This function is included with calendar for compatability with Emacs."
- (let ((extent (make-extent beg end))
- (map (make-sparse-keymap)))
-
- (define-key map [button2] 'diary-goto-entry)
- ;; (define-key map [return] 'diary-goto-entry)
- (set-extent-keymap extent map)
-
- (set-extent-mouse-face extent 'highlight)
- (set-extent-property extent 'button extent)
- (set-extent-face extent 'diary-button)
- ;; set the properties from the calling function
- (set-extent-properties extent properties )
-
- extent ))
-
-;; XEmacs change, mimic button.el from Emacs 22
-;;;###autoload
-(defun insert-button (label &rest properties)
- "Insert a button with the label LABEL.
-The remaining arguments form a sequence of PROPERTY VALUE pairs.
-
-This function is included with calendar for compatability with Emacs."
- (apply #'make-button (prog1 (point) (insert label))
- (point)
- properties))
-
;; XEmacs change, this shows up in XEmacs 21.5
;;;###autoload
(unless (fboundp 'match-string-no-properties)
diff -r 7524e4fb9de45d77812090a724fac4ebd7549d6e -r 59ec40b5f0a66a62f20b0ef26ebe065017d04d65 diary-lib.el
--- a/diary-lib.el
+++ b/diary-lib.el
@@ -643,23 +643,13 @@
;; backward-compatibility alias
(put 'diary-button-face 'face-alias 'diary-button)
-;; XEmacs change. We don't have button.el, it's in Emacs 22
-;(define-button-type 'diary-entry
-; 'action #'diary-goto-entry
-; 'face #'diary-button)
+(define-button-type 'diary-entry
+ 'action #'diary-goto-entry
+ 'face #'diary-button)
-;; XEmacs change. Modified to work with our minimal button implementation.
-;; Is there a better way to get the extent?
(defun diary-goto-entry (event)
(interactive "@e")
- ;; get the extents
- (let* ((select-buffer (event-buffer event))
- (extents (extents-at-event event))
- (locator (cadr (mapcar (lambda (ext)
- (when (extent-property ext 'locator)
- (extent-property ext 'locator) )
- )
- extents)))
+ (let* ((locator (button-get button 'locator))
(marker (car locator))
markbuf file)
;; If marker pointing to diary location is valid, use that.
Repository URL: https://bitbucket.org/xemacs/calendar/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches