浏览代码

Applied Glenn Morris patches.

* org-publish.el (declare-function): Add compatibility stub.
(org-publish-delete-dups): Declare as function.

* org-mac-message.el Fix commentary.

* org-irc.el (top-level): CL not required when compiling.
(org-irc-visit-erc): Replace runtime CL functions.

See Glenn's messages on emacs-diffs:
<E1JZzkn-0002a9-BB@cvs.savannah.gnu.org>
<E1JZzlJ-0002bN-Ir@cvs.savannah.gnu.org>
<E1JZzmU-0002cw-1x@cvs.savannah.gnu.org>
Bastien Guerry 17 年之前
父节点
当前提交
4adfc68e86
共有 4 个文件被更改,包括 32 次插入20 次删除
  1. 10 0
      ChangeLog
  2. 8 13
      org-irc.el
  3. 8 7
      org-mac-message.el
  4. 6 0
      org-publish.el

+ 10 - 0
ChangeLog

@@ -1,3 +1,13 @@
+2008-03-14  Glenn Morris  <rmg@gnu.org>
+
+	* org-publish.el (declare-function): Add compatibility stub.
+	(org-publish-delete-dups): Declare as function.
+
+	* org-mac-message.el Fix commentary.
+
+	* org-irc.el (top-level): CL not required when compiling.
+	(org-irc-visit-erc): Replace runtime CL functions.
+
 2008-03-14  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-modules-loaded): New variable.

+ 8 - 13
org-irc.el

@@ -22,9 +22,9 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
-;;
+
 ;;; Commentary:
-;;
+
 ;; Link to an IRC session. Only ERC has been implemented at the
 ;; moment.
 ;;
@@ -47,12 +47,8 @@
 ;;
 ;; If, when the resulting link is visited, there is no connection to a
 ;; requested server then one will be created.
-;;
-;;; Code:
 
-
-(eval-when-compile
-  (require 'cl))
+;;; Code:
 
 (require 'org)
 (require 'erc)
@@ -216,10 +212,10 @@ explicit port set then return the erc default."
         (let ((chan-name (pop link)))
           ;; if we got a channel name then switch to it or join it
           (if chan-name
-              (let ((chan-buf (find-if
-                               (lambda (x)
-                                 (string= (buffer-name x) chan-name))
-                               buffer-list)))
+              (let ((chan-buf (catch 'found
+                                (dolist (x buffer-list)
+                                  (if (string= (buffer-name x) chan-name)
+                                      (throw 'found x))))))
                 (if chan-buf
                     (progn
                       (switch-to-buffer chan-buf)
@@ -227,8 +223,7 @@ explicit port set then return the erc default."
                       ;; then start a chat with them
                       (let ((nick (pop link)))
                         (when nick
-                          (if (find nick (erc-get-server-nickname-list)
-                                    :test 'string=)
+                          (if (member nick (erc-get-server-nickname-list))
                               (progn
                                 (goto-char (point-max))
                                 (insert (concat nick ": ")))

+ 8 - 7
org-mac-message.el

@@ -1,13 +1,13 @@
-;;; org-mac-message.el - Support for links to Apple Mail messages by Message-ID
-;; Carstens outline-mode for keeping track of everything.
+;;; org-mac-message.el --- Support for links to Apple Mail messages by Message-ID
+
 ;; Copyright (C) 2008 Free Software Foundation, Inc.
-;;
-;; Author: John Wiegey <johnw@gnu.org>
+
+;; Author: John Wiegley <johnw@gnu.org>
 ;; Version: 1.2
 ;; Keywords: outlines, hypermedia, calendar, wp
-;;
+
 ;; This file is part of GNU Emacs.
-;;
+
 ;; Emacs 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, or (at your option)
@@ -22,7 +22,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; Code:
 
 (require 'org)
 

+ 6 - 0
org-publish.el

@@ -153,6 +153,10 @@
 (eval-when-compile
   (require 'cl))
 
+(eval-and-compile
+  (unless (fboundp 'declare-function)
+    (defmacro declare-function (fn file &optional arglist fileonly))))
+
 (require 'dired-aux)
 
 (defgroup org-publish nil
@@ -371,6 +375,8 @@ This is a compatibility function for Emacsen without `delete-dups'."
 	(setq tail (cdr tail))))
     list))
 
+(declare-function org-publish-delete-dups "org-publish" (list))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Getting project information out of org-publish-project-alist