Allow for different ways of user-mail-address to be defined

ChangeLog

@@ -1,7 +1,13 @@
 2007-02-02  Ryan T. Sammartino <ryan.sammartino@gmail.com>
-	* lisp/doxymacs.el.in 
+	* lisp/doxymacs.el.in:
 	(doxymacs-mode, doxymacs-doxygan-keywords): Bug #1490021: 
 	Allow spaces in @param [in] style documentation.
+	(doxymacs-user-mail-address): Bug #1496399:
+	New function.
+	(doxymacs-JavaDoc-file-comment-template,
+	doxymacs-Qt-file-comment-template,
+	doxymacs-C++-file-comment-template): Use new function to
+	get user's e-mail address.
 
 2006-04-22  Ryan T. Sammartino <ryan.sammartino@gmail.com>
 

lisp/doxymacs.el.in

@@ -28,7 +28,7 @@
 ;;
 ;; Doxymacs homepage: http://doxymacs.sourceforge.net/
 ;;
-;; $Id: doxymacs.el.in,v 1.24 2007/02/02 23:24:03 ryants Exp $
+;; $Id: doxymacs.el.in,v 1.25 2007/02/03 00:19:15 ryants Exp $
 
 ;; Commentary:
 ;;
@@ -115,6 +115,9 @@
 
 ;; Change log:
 ;;
+;; 02/02/2007 - bug #1490021: Allow spaces in @param [in] documentation.
+;;              bug #1496399: Allow for different ways of user-mail-address
+;;              to be defined.
 ;; 22/04/2006 - feature #1338245: Add tokens to filladapt to match 
 ;;              doxygen markup.
 ;;            - version 1.7.0
@@ -1112,15 +1115,22 @@ the completion or nil if canceled by the user."
    ((string= doxymacs-doxygen-style "C++") "@")
    (t "@")))
 
+(defun doxymacs-user-mail-address ()
+  "Return the user's email address"
+  (or
+   (and (and (fboundp 'user-mail-address) (user-mail-address))
+	(list 'l " <" (user-mail-address) ">"))
+   (and (and (boundp 'user-mail-address) user-mail-address)
+	(list 'l " <" user-mail-address ">"))))
+
 (defconst doxymacs-JavaDoc-file-comment-template
  '("/**" > n
    " * " (doxymacs-doxygen-command-char) "file   "
    (if (buffer-file-name)
        (file-name-nondirectory (buffer-file-name))
      "") > n
    " * " (doxymacs-doxygen-command-char) "author " (user-full-name)
-   (if (fboundp 'user-mail-address)
-       (list 'l " <" (user-mail-address) ">"))
+   (doxymacs-user-mail-address)
    > n
    " * " (doxymacs-doxygen-command-char) "date   " (current-time-string) > n
    " * " > n
@@ -1137,8 +1147,7 @@ the completion or nil if canceled by the user."
        (file-name-nondirectory (buffer-file-name))
      "") > n
    " " (doxymacs-doxygen-command-char) "author " (user-full-name)
-   (if (fboundp 'user-mail-address)
-       (list 'l " <" (user-mail-address) ">"))
+   (doxymacs-user-mail-address)
    > n
    " " (doxymacs-doxygen-command-char) "date   " (current-time-string) > n
    " " > n
@@ -1155,8 +1164,7 @@ the completion or nil if canceled by the user."
        (file-name-nondirectory (buffer-file-name))
      "") > n
    "/// " (doxymacs-doxygen-command-char) "author " (user-full-name)
-   (if (fboundp 'user-mail-address)
-       (list 'l " <" (user-mail-address) ">"))
+   (doxymacs-user-mail-address)
    > n
    "/// " (doxymacs-doxygen-command-char) "date   " (current-time-string) > n
    "/// " > n