Show
Ignore:
Timestamp:
2006年05月27日 10時35分24秒 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/gnus/gmm-utils.el

    r4073 r4091  
    3131;;; Code: 
    3232 
    33 ;; (require 'wid-edit) 
     33(require 'wid-edit) 
    3434 
    3535(defgroup gmm nil 
    …… 
    280280    tool-bar-map)) 
    281281 
    282 ;; WARNING: The following is subject to change.  Don't rely on it yet. 
    283  
    284 ;; From MH-E without modifications: 
    285  
    286 (defmacro gmm-defun-compat (name function arg-list &rest body) 
     282(defmacro defun-gmm (name function arg-list &rest body) 
    287283  "Create function NAME. 
    288284If FUNCTION exists, then NAME becomes an alias for FUNCTION. 
    …… 
    293289      `(defun ,name ,arg-list ,@body)))) 
    294290 
    295 (gmm-defun-compat gmm-image-search-load-path 
     291(defun-gmm gmm-image-search-load-path 
    296292  image-search-load-path (file &optional path) 
    297293  "Emacs 21 and XEmacs don't have `image-search-load-path'. 
    …… 
    299295  nil) 
    300296 
    301 ;; From MH-E with modifications: 
    302  
    303 ;; Don't use `gmm-defun-compat' until API changes in 
    304 ;; `image-load-path-for-library' in Emacs CVS are completed. 
    305  
    306 (defun gmm-image-load-path-for-library (library image &optional path no-error) 
    307   "Return a suitable search path for images relative to LIBRARY. 
    308  
    309 First it searches for IMAGE in `image-load-path' (excluding 
     297;; Cf. `mh-image-load-path-for-library' in `mh-compat.el'. 
     298 
     299(defun-gmm gmm-image-load-path-for-library 
     300  image-load-path-for-library (library image &optional path no-error) 
     301  "Return a suitable search path for images used by LIBRARY. 
     302 
     303It searches for IMAGE in `image-load-path' (excluding 
    310304\"`data-directory'/images\") and `load-path', followed by a path 
    311305suitable for LIBRARY, which includes \"../../etc/images\" and