X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2ec4c9665d3766eea7bf2d131cabbc177d049b6b..9b69fd6f8b0783b1ade15bb500ab788dd091e724:/lisp/gnus/gnus-ems.el

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 3a79e67801..d40848fbc1 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -1,7 +1,6 @@
 ;;; gnus-ems.el --- functions for making Gnus work under different Emacsen
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -166,10 +165,10 @@
 
 (defun gnus-image-type-available-p (type)
   (and (fboundp 'image-type-available-p)
-       (image-type-available-p type)
        (if (fboundp 'display-images-p)
 	   (display-images-p)
-	 t)))
+	 t)
+       (image-type-available-p type)))
 
 (defun gnus-create-image (file &optional type data-p &rest props)
   (let ((face (plist-get props :face)))
@@ -181,7 +180,7 @@
 
 (defun gnus-put-image (glyph &optional string category)
   (let ((point (point)))
-    (insert-image glyph (or string "*"))
+    (insert-image glyph (or string " "))
     (put-text-property point (point) 'gnus-image-category category)
     (unless string
       (put-text-property (1- (point)) (point)
@@ -210,6 +209,11 @@
 	  (setq start end
 		end nil))))))
 
+(defmacro gnus-string-mark-left-to-right (string)
+  (if (fboundp 'bidi-string-mark-left-to-right)
+      `(bidi-string-mark-left-to-right ,string)
+    string))
+
 (eval-and-compile
   ;; XEmacs does not have window-inside-pixel-edges
   (defalias 'gnus-window-inside-pixel-edges
@@ -217,8 +221,8 @@
         'window-inside-pixel-edges
       'window-pixel-edges))
 
-  (if (fboundp 'set-process-plist)
-      (progn
+  (if (or (featurep 'emacs) (fboundp 'set-process-plist))
+      (progn				; these exist since Emacs 22.1
 	(defalias 'gnus-set-process-plist 'set-process-plist)
 	(defalias 'gnus-process-plist 'process-plist)
 	(defalias 'gnus-process-get 'process-get)