CVS update by scop packages/xemacs-packages/prog-modes, rpm-spec-mode.el ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/11/01 21:02:38

  Modified:    packages/xemacs-packages/prog-modes ChangeLog
                        rpm-spec-mode.el
Log:
Add rpm-spec-user-mail-address compatibility wrapper function.

Revision  Changes    Path
1.254     +6 -0      XEmacs/packages/xemacs-packages/prog-modes/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/prog-modes/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- ChangeLog	2007/08/28 12:10:39	1.253
+++ ChangeLog	2007/11/01 20:02:33	1.254
@@ -1,3 +1,9 @@
+2007-11-01  Ville Skyttä  <scop at xemacs.org>
+
+	* rpm-spec-mode.el (rpm-spec-user-mail-address): New compatibility
+	wrapper function, takes care eg. of `user-mail-address' not being
+	a function in GNU Emacs.
+
 2007-08-28  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 2.14 released.



1.25      +14 -2     XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el

Index: rpm-spec-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- rpm-spec-mode.el	2007/05/27 09:33:27	1.24
+++ rpm-spec-mode.el	2007/11/01 20:02:33	1.25
@@ -711,7 +711,7 @@ with no args, if that value is non-nil."
   (interactive "sChange log entry: ")
   (save-excursion
     (rpm-goto-section "changelog")
-    (let* ((address (or rpm-spec-user-mail-address (user-mail-address)))
+    (let* ((address (rpm-spec-user-mail-address))
            (fullname (or rpm-spec-user-full-name (user-full-name)))
            (string (concat "* " (substring (current-time-string) 0 11)
                            (substring (current-time-string) -4) " "
@@ -892,7 +892,7 @@ controls whether case is significant."
   (interactive "p")
   (beginning-of-line)
   (insert "Packager: " (or rpm-spec-user-full-name (user-full-name))
-          " <" (or rpm-spec-user-mail-address (user-mail-address)) ">\n"))
+          " <" (rpm-spec-user-mail-address) ">\n"))
 
 (defun rpm-change-packager (&optional arg)
   "Update Packager tag."
@@ -1380,6 +1380,18 @@ if one is present in the file."
 
     (end-of-line 1)
     (rpm-add-change-log-entry "Initial build.")))
+
+;;------------------------------------------------------------
+
+(defun rpm-spec-user-mail-address ()
+  "User mail address helper."
+  (cond
+   (rpm-spec-user-mail-address
+    rpm-spec-user-mail-address)
+   ((fboundp 'user-mail-address)
+    (user-mail-address))
+   (t
+    user-mail-address)))
 
 ;;------------------------------------------------------------