X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-compat.el;h=c31baa7a23488318922f76e78e42ae14a54c894e;hp=2cca394dedd0ab21fbd54be802a7b97a3103ab54;hb=b52037f4a9c6bee1ff556c22750e158da1208d4b;hpb=f6234873d0f9a0ee9b26beab123cf4e9d77099c8 diff --git a/lisp/gnus-compat.el b/lisp/gnus-compat.el index 2cca394de..c31baa7a2 100644 --- a/lisp/gnus-compat.el +++ b/lisp/gnus-compat.el @@ -1,6 +1,6 @@ ;;; gnus-compat.el --- Compatability functions for Gnus -;; Copyright (C) 2012 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: compat @@ -33,6 +33,7 @@ (ignore-errors (require 'help-fns)) +;; XEmacs doesn't have this function. (when (and (not (fboundp 'help-function-arglist)) (fboundp 'function-arglist)) (defun help-function-arglist (def &optional preserve-names) @@ -40,6 +41,24 @@ PRESERVE-NAMES is ignored." (cdr (car (read-from-string (downcase (function-arglist def))))))) +;; Modify this function on Emacs 23.1 and earlier to always return the +;; right answer. +(when (and (fboundp 'help-function-arglist) + (eq (help-function-arglist 'car) t)) + (defvar gnus-compat-original-help-function-arglist + (symbol-function 'help-function-arglist)) + (defun help-function-arglist (def &optional preserve-names) + "Return a formal argument list for the function DEF. +PRESERVE-NAMES is ignored." + (let ((orig (funcall gnus-compat-original-help-function-arglist def))) + (if (not (eq orig t)) + orig + ;; Built-in subrs have the arglist hidden in the doc string. + (let ((doc (documentation def))) + (when (and doc + (string-match "\n\n\\((fn\\( .*\\)?)\\)\\'" doc)) + (cdr (car (read-from-string (downcase (match-string 1 doc))))))))))) + (when (= (length (help-function-arglist 'delete-directory)) 1) (defvar gnus-compat-original-delete-directory (symbol-function 'delete-directory)) @@ -57,6 +76,97 @@ TRASH is ignored." (delete-file file)))) (delete-directory directory)))) +;; Emacs 24.0.93 +(require 'url) +(when (= (length (help-function-arglist 'url-retrieve)) 5) + (defvar gnus-compat-original-url-retrieve + (symbol-function 'url-retrieve)) + (defun url-retrieve (url callback &optional cbargs silent inhibit-cookies) + "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished." + (funcall gnus-compat-original-url-retrieve + url callback cbargs silent))) + +;; XEmacs +(when (and (not (fboundp 'timer-set-function)) + (fboundp 'set-itimer-function)) + (defun timer-set-function (timer function &optional args) + "Make TIMER call FUNCTION with optional ARGS when triggering." + (lexical-let ((function function) + (args args)) + (set-itimer-function timer + (lambda (process status) + (apply function process status args)))))) + +;; XEmacs 21.4 +(unless (fboundp 'bound-and-true-p) + (defmacro bound-and-true-p (var) + "Return the value of symbol VAR if it is bound, else nil." + (and (boundp var) + (symbol-value var)))) + + +;; Emacs less than 24.3 +(unless (fboundp 'add-face) + (defun add-face (beg end face) + "Combine FACE BEG and END." + (let ((b beg)) + (while (< b end) + (let ((oldval (get-text-property b 'face))) + (put-text-property + b (setq b (next-single-property-change b 'face nil end)) + 'face (cond ((null oldval) + face) + ((and (consp oldval) + (not (keywordp (car oldval)))) + (cons face oldval)) + (t + (list face oldval))))))))) + +(unless (fboundp 'move-beginning-of-line) + (defun move-beginning-of-line (arg) + (interactive "p") + (unless (= arg 1) + (forward-line arg)) + (beginning-of-line))) + +(unless (fboundp 'delete-dups) + (defun delete-dups (list) + "Destructively remove `equal' duplicates from LIST. +Store the result in LIST and return it. LIST must be a proper list. +Of several `equal' occurrences of an element in LIST, the first +one is kept." + (let ((tail list)) + (while tail + (setcdr tail (delete (car tail) (cdr tail))) + (setq tail (cdr tail)))) + list)) + +(unless (fboundp 'declare-function) + (defmacro declare-function (&rest r))) + +(unless (fboundp 'string-bytes) + (defun string-bytes (string) + (length (if (or (mm-coding-system-p 'utf-8) + (ignore-errors + (let (mucs-ignore-version-incompatibilities) + (require 'un-define)))) + (mm-encode-coding-string string 'utf-8) + string)))) + +(unless (fboundp 'process-live-p) + (defun process-live-p (process) + "Returns non-nil if PROCESS is alive. +A process is considered alive if its status is `run', `open', +`listen', `connect' or `stop'. Value is nil if PROCESS is not a +process." + (and (processp process) + (memq (process-status process) + '(run open listen connect stop))))) + +;; XEmacs doesn't have auto-autoloads for overlay functions. +(when (featurep 'xemacs) + (require 'overlay)) + (provide 'gnus-compat) ;; gnus-compat.el ends here