commit/calendar: jamesjer: Remove workarounds for the absence of button.el, which is now in fsf-compat.

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@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  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* Makefile (VERSION): XEmacs package 1.38 released.

diff -r 7524e4fb9de45d77812090a724fac4ebd7549d6e -r 59ec40b5f0a66a62f20b0ef26ebe065017d04d65 Makefile
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 MAINTAINER = Jeff Miller <[email protected]>
 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.