Rename "system-process-attributes" to "process-attributes".emacs-daemon-0.13

svn path=/emacs-daemon/; revision=1230

2 files changed, 16 insertions, 2 deletions

diff --git a/10emacs-daemon-gentoo.el b/10emacs-daemon-gentoo.el
index ff878f2..732ff97 100644
--- a/10emacs-daemon-gentoo.el
+++ b/10emacs-daemon-gentoo.el
@@ -1,8 +1,14 @@
 
 ;;; emacs-daemon site-lisp configuration
-;; Copyright 2008 Gentoo Foundation
+;; Copyright 2008-2009 Gentoo Foundation
 ;; Distributed under the terms of the GNU General Public License v2 or later
 
+;; Backwards compatibility code, can be removed some time after the
+;; Emacs 23.0.91 snapshot
+(and (not (fboundp 'process-attributes))
+     (fboundp 'system-process-attributes)
+     (defalias 'process-attributes 'system-process-attributes))
+
 (and
  (fboundp 'daemonp)
  (daemonp)
@@ -18,7 +24,7 @@
    (cond
     ((and (integerp pid)
 	  (string-match
-	   "emacs" (or (cdr (assq 'comm (system-process-attributes pid))) ""))
+	   "emacs" (or (cdr (assq 'comm (process-attributes pid))) ""))
 	  (/= pid (emacs-pid)))
      ;; If another Emacs daemon is already running for this user,
      ;; then we would steal its server socket. So we better die.
diff --git a/ChangeLog b/ChangeLog
index 917fe69..32fe44e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-23  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Version 0.13 released.
+
+	* 10emacs-daemon-gentoo.el: Rename "system-process-attributes"
+	to "process-attributes" following Emacs upstream. Add code for
+	backwards compatibility.
+
 2009-02-01  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Version 0.12 released.