* lisp/gnus/shr.el (shr-put-image): Use image-multi-frame-p if available.

[gnu-emacs] / lisp / nxml / nxml-enc.el

diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index 350c5c77c7b506217c21a79acc7f5c6c723bf6f3..7bcae56e08e7aac7837be64209304c16d2fbcf01 100644 (file)
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -1,6 +1,6 @@
 ;;; nxml-enc.el --- XML encoding auto-detection
 
-;; Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML